diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 336c56a3..895a674b 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -66,11 +66,11 @@ const routes: Routes = [
       { path: '', redirectTo: 'controllers', pathMatch: 'full' },
       { path: 'controllers', component: ControllersComponent },
       { path: 'bundled', component: BundledServerFinderComponent },
-      { path: 'controller/:server_id/login', component: LoginComponent },
-      { path: 'controller/:server_id/loggeduser', component: LoggedUserComponent },
-      {path : 'controller/:server_id/image-manager', component: ImageManagerComponent},
+      { path: 'controller/:controller_id/login', component: LoginComponent },
+      { path: 'controller/:controller_id/loggeduser', component: LoggedUserComponent },
+      {path : 'controller/:controller_id/image-manager', component: ImageManagerComponent},
       {
-        path: 'controller/:server_id/projects',
+        path: 'controller/:controller_id/projects',
         component: ProjectsComponent,
         canActivate: [LoginGuard],
         resolve: { server: ServerResolve },
@@ -79,134 +79,134 @@ const routes: Routes = [
       { path: 'settings', component: SettingsComponent },
       { path: 'settings/console', component: ConsoleComponent },
       { path: 'installed-software', component: InstalledSoftwareComponent },
-      { path: 'controller/:server_id/systemstatus', component: SystemStatusComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/systemstatus', component: SystemStatusComponent, canActivate: [LoginGuard] },
 
       { path: 'controller/:server_ip/:server_port/project/:project_id', component: DirectLinkComponent, canActivate: [LoginGuard] },
       {
-        path: 'controller/:server_id/project/:project_id/snapshots',
+        path: 'controller/:controller_id/project/:project_id/snapshots',
         component: ListOfSnapshotsComponent,
         canActivate: [LoginGuard],
         resolve: { server: ServerResolve },
       },
-      { path: 'controller/:server_id/preferences', component: PreferencesComponent, canActivate: [LoginGuard] },
-      // { path: 'controller/:server_id/preferences/general', component: GeneralPreferencesComponent },
-      { path: 'controller/:server_id/preferences/builtin', component: BuiltInPreferencesComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences', component: PreferencesComponent, canActivate: [LoginGuard] },
+      // { path: 'controller/:controller_id/preferences/general', component: GeneralPreferencesComponent },
+      { path: 'controller/:controller_id/preferences/builtin', component: BuiltInPreferencesComponent, canActivate: [LoginGuard] },
 
-      { path: 'controller/:server_id/preferences/builtin/ethernet-hubs', component: EthernetHubsTemplatesComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/builtin/ethernet-hubs', component: EthernetHubsTemplatesComponent, canActivate: [LoginGuard] },
       {
-        path: 'controller/:server_id/preferences/builtin/ethernet-hubs/addtemplate',
+        path: 'controller/:controller_id/preferences/builtin/ethernet-hubs/addtemplate',
         component: EthernetHubsAddTemplateComponent,
         canActivate: [LoginGuard]
       },
       {
-        path: 'controller/:server_id/preferences/builtin/ethernet-hubs/:template_id',
+        path: 'controller/:controller_id/preferences/builtin/ethernet-hubs/:template_id',
         component: EthernetHubsTemplateDetailsComponent,
         canActivate: [LoginGuard]
       },
 
       {
-        path: 'controller/:server_id/preferences/builtin/ethernet-switches',
+        path: 'controller/:controller_id/preferences/builtin/ethernet-switches',
         component: EthernetSwitchesTemplatesComponent,
         canActivate: [LoginGuard]
       },
       {
-        path: 'controller/:server_id/preferences/builtin/ethernet-switches/addtemplate',
+        path: 'controller/:controller_id/preferences/builtin/ethernet-switches/addtemplate',
         component: EthernetSwitchesAddTemplateComponent,
         canActivate: [LoginGuard]
       },
       {
-        path: 'controller/:server_id/preferences/builtin/ethernet-switches/:template_id',
+        path: 'controller/:controller_id/preferences/builtin/ethernet-switches/:template_id',
         component: EthernetSwitchesTemplateDetailsComponent,
         canActivate: [LoginGuard]
       },
 
-      { path: 'controller/:server_id/preferences/builtin/cloud-nodes', component: CloudNodesTemplatesComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/builtin/cloud-nodes', component: CloudNodesTemplatesComponent, canActivate: [LoginGuard] },
       {
-        path: 'controller/:server_id/preferences/builtin/cloud-nodes/addtemplate',
+        path: 'controller/:controller_id/preferences/builtin/cloud-nodes/addtemplate',
         component: CloudNodesAddTemplateComponent,
         canActivate: [LoginGuard]
       },
       {
-        path: 'controller/:server_id/preferences/builtin/cloud-nodes/:template_id',
+        path: 'controller/:controller_id/preferences/builtin/cloud-nodes/:template_id',
         component: CloudNodesTemplateDetailsComponent,
         canActivate: [LoginGuard]
       },
 
-      //{ path: 'controller/:server_id/preferences/dynamips', component: DynamipsPreferencesComponent },
-      { path: 'controller/:server_id/preferences/dynamips/templates', component: IosTemplatesComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:server_id/preferences/dynamips/templates/addtemplate', component: AddIosTemplateComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:server_id/preferences/dynamips/templates/:template_id', component: IosTemplateDetailsComponent, canActivate: [LoginGuard] },
+      //{ path: 'controller/:controller_id/preferences/dynamips', component: DynamipsPreferencesComponent },
+      { path: 'controller/:controller_id/preferences/dynamips/templates', component: IosTemplatesComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/dynamips/templates/addtemplate', component: AddIosTemplateComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/dynamips/templates/:template_id', component: IosTemplateDetailsComponent, canActivate: [LoginGuard] },
       {
-        path: 'controller/:server_id/preferences/dynamips/templates/:template_id/copy',
+        path: 'controller/:controller_id/preferences/dynamips/templates/:template_id/copy',
         component: CopyIosTemplateComponent,
         canActivate: [LoginGuard]
       },
 
-      // { path: 'controller/:server_id/preferences/qemu', component: QemuPreferencesComponent },
-      { path: 'controller/:server_id/preferences/qemu/templates', component: QemuVmTemplatesComponent, canActivate: [LoginGuard] },
+      // { path: 'controller/:controller_id/preferences/qemu', component: QemuPreferencesComponent },
+      { path: 'controller/:controller_id/preferences/qemu/templates', component: QemuVmTemplatesComponent, canActivate: [LoginGuard] },
       {
-        path: 'controller/:server_id/preferences/qemu/templates/:template_id/copy',
+        path: 'controller/:controller_id/preferences/qemu/templates/:template_id/copy',
         component: CopyQemuVmTemplateComponent,
         canActivate: [LoginGuard]
       },
-      { path: 'controller/:server_id/preferences/qemu/templates/:template_id', component: QemuVmTemplateDetailsComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:server_id/preferences/qemu/addtemplate', component: AddQemuVmTemplateComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/qemu/templates/:template_id', component: QemuVmTemplateDetailsComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/qemu/addtemplate', component: AddQemuVmTemplateComponent, canActivate: [LoginGuard] },
 
-      // { path: 'controller/:server_id/preferences/vpcs', component: VpcsPreferencesComponent },
-      { path: 'controller/:server_id/preferences/vpcs/templates', component: VpcsTemplatesComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:server_id/preferences/vpcs/templates/:template_id', component: VpcsTemplateDetailsComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:server_id/preferences/vpcs/addtemplate', component: AddVpcsTemplateComponent, canActivate: [LoginGuard] },
+      // { path: 'controller/:controller_id/preferences/vpcs', component: VpcsPreferencesComponent },
+      { path: 'controller/:controller_id/preferences/vpcs/templates', component: VpcsTemplatesComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/vpcs/templates/:template_id', component: VpcsTemplateDetailsComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/vpcs/addtemplate', component: AddVpcsTemplateComponent, canActivate: [LoginGuard] },
 
-      // { path: 'controller/:server_id/preferences/virtualbox', component: VirtualBoxPreferencesComponent },
-      { path: 'controller/:server_id/preferences/virtualbox/templates', component: VirtualBoxTemplatesComponent, canActivate: [LoginGuard] },
+      // { path: 'controller/:controller_id/preferences/virtualbox', component: VirtualBoxPreferencesComponent },
+      { path: 'controller/:controller_id/preferences/virtualbox/templates', component: VirtualBoxTemplatesComponent, canActivate: [LoginGuard] },
       {
-        path: 'controller/:server_id/preferences/virtualbox/templates/:template_id',
+        path: 'controller/:controller_id/preferences/virtualbox/templates/:template_id',
         component: VirtualBoxTemplateDetailsComponent,
         canActivate: [LoginGuard]
       },
-      { path: 'controller/:server_id/preferences/virtualbox/addtemplate', component: AddVirtualBoxTemplateComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/virtualbox/addtemplate', component: AddVirtualBoxTemplateComponent, canActivate: [LoginGuard] },
 
-      // { path: 'controller/:server_id/preferences/vmware', component: VmwarePreferencesComponent },
-      { path: 'controller/:server_id/preferences/vmware/templates', component: VmwareTemplatesComponent, canActivate: [LoginGuard] },
+      // { path: 'controller/:controller_id/preferences/vmware', component: VmwarePreferencesComponent },
+      { path: 'controller/:controller_id/preferences/vmware/templates', component: VmwareTemplatesComponent, canActivate: [LoginGuard] },
       {
-        path: 'controller/:server_id/preferences/vmware/templates/:template_id',
+        path: 'controller/:controller_id/preferences/vmware/templates/:template_id',
         component: VmwareTemplateDetailsComponent,
         canActivate: [LoginGuard]
       },
-      { path: 'controller/:server_id/preferences/vmware/addtemplate', component: AddVmwareTemplateComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/vmware/addtemplate', component: AddVmwareTemplateComponent, canActivate: [LoginGuard] },
 
-      { path: 'controller/:server_id/preferences/docker/templates', component: DockerTemplatesComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/docker/templates', component: DockerTemplatesComponent, canActivate: [LoginGuard] },
       {
-        path: 'controller/:server_id/preferences/docker/templates/:template_id',
+        path: 'controller/:controller_id/preferences/docker/templates/:template_id',
         component: DockerTemplateDetailsComponent,
         canActivate: [LoginGuard]
       },
       {
-        path: 'controller/:server_id/preferences/docker/templates/:template_id/copy',
+        path: 'controller/:controller_id/preferences/docker/templates/:template_id/copy',
         component: CopyDockerTemplateComponent,
         canActivate: [LoginGuard]
       },
-      { path: 'controller/:server_id/preferences/docker/addtemplate', component: AddDockerTemplateComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/docker/addtemplate', component: AddDockerTemplateComponent, canActivate: [LoginGuard] },
 
-      { path: 'controller/:server_id/preferences/iou/templates', component: IouTemplatesComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:server_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:server_id/preferences/iou/templates/:template_id/copy', component: CopyIouTemplateComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/iou/templates', component: IouTemplatesComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/iou/templates/:template_id/copy', component: CopyIouTemplateComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/iou/addtemplate', component: AddIouTemplateComponent, canActivate: [LoginGuard] },
     ],
   },
   {
-    path: 'controller/:server_id/project/:project_id',
+    path: 'controller/:controller_id/project/:project_id',
     component: ProjectMapComponent,
     canActivate: [LoginGuard],
     canDeactivate: [ConsoleGuard],
   },
   {
-    path: 'controller/:server_id/project/:project_id/nodes/:node_id',
+    path: 'controller/:controller_id/project/:project_id/nodes/:node_id',
     component: WebConsoleFullWindowComponent,
     canActivate: [LoginGuard]
   },
   {
-    path: 'static/web-ui/controller/:server_id/project/:project_id/nodes/:node_id',
+    path: 'static/web-ui/controller/:controller_id/project/:project_id/nodes/:node_id',
     component: WebConsoleFullWindowComponent,
     canActivate: [LoginGuard]
   },
diff --git a/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.html b/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.html
index 85916267..970b470f 100644
--- a/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.html
+++ b/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.html
@@ -1,4 +1,4 @@
-<h1 mat-dialog-title>Add server</h1>
+<h1 mat-dialog-title>Add controller</h1>
 <form [formGroup]="serverForm">
   <div mat-dialog-content>
     <mat-form-field>
@@ -6,19 +6,19 @@
       <mat-error *ngIf="serverForm.get('name').hasError('required')">You must enter a value</mat-error>
     </mat-form-field>
 
-    <mat-form-field>
+    <!-- <mat-form-field>
       <mat-select placeholder="Location" formControlName="location">
         <mat-option *ngFor="let location of locations" [value]="location.key"> {{ location.name }} </mat-option>
       </mat-select>
-    </mat-form-field>
+    </mat-form-field> -->
 
-    <mat-form-field *ngIf="serverForm.get('location').value === 'local'">
+    <!-- <mat-form-field *ngIf="serverForm.get('location').value === 'local'">
       <input matInput tabindex="1" formControlName="path" placeholder="Local server path" />
     </mat-form-field>
 
     <mat-form-field *ngIf="serverForm.get('location').value === 'local'">
       <input matInput tabindex="1" formControlName="ubridge_path" placeholder="Ubridge path" />
-    </mat-form-field>
+    </mat-form-field> -->
 
     <mat-form-field>
       <input matInput tabindex="1" formControlName="host" placeholder="Host" />
diff --git a/src/app/components/controllers/controllers.component.html b/src/app/components/controllers/controllers.component.html
index 8d3e9b87..33502172 100644
--- a/src/app/components/controllers/controllers.component.html
+++ b/src/app/components/controllers/controllers.component.html
@@ -82,7 +82,7 @@
               matTooltipClass="custom-tooltip"
               (click)="deleteServer(row)"
             >
-              <mat-icon aria-label="Remove server">delete</mat-icon>
+              <mat-icon aria-label="Remove controller">delete</mat-icon>
             </button>
           </mat-cell>
         </ng-container>
diff --git a/src/app/components/image-manager/image-manager.component.ts b/src/app/components/image-manager/image-manager.component.ts
index 5a3c09eb..233538eb 100644
--- a/src/app/components/image-manager/image-manager.component.ts
+++ b/src/app/components/image-manager/image-manager.component.ts
@@ -40,8 +40,8 @@ export class ImageManagerComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    let server_id = parseInt(this.route.snapshot.paramMap.get('server_id'));
-    this.serverService.get(server_id).then((server: Server) => {
+    let controller_id = parseInt(this.route.snapshot.paramMap.get('controller_id'));
+    this.serverService.get(controller_id).then((server: Server) => {
       this.server = server;
       if (server.authToken) {
         this.getImages()
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index 6dd8a16f..8abc9833 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -43,9 +43,9 @@ export class LoginComponent implements OnInit, DoCheck {
   ) {}
 
   async ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/';
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       if (server.authToken) {
diff --git a/src/app/components/preferences/built-in/built-in-preferences.component.ts b/src/app/components/preferences/built-in/built-in-preferences.component.ts
index 7749d54f..a622c9e8 100644
--- a/src/app/components/preferences/built-in/built-in-preferences.component.ts
+++ b/src/app/components/preferences/built-in/built-in-preferences.component.ts
@@ -12,6 +12,6 @@ export class BuiltInPreferencesComponent implements OnInit {
   constructor(private route: ActivatedRoute) {}
 
   ngOnInit() {
-    this.serverId = this.route.snapshot.paramMap.get('server_id');
+    this.serverId = this.route.snapshot.paramMap.get('controller_id');
   }
 }
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts
index bde9968f..81e080e7 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts
@@ -38,8 +38,8 @@ export class CloudNodesAddTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
     });
   }
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts
index 494c82c6..1e996c7f 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts
@@ -47,9 +47,9 @@ export class CloudNodesTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts
index b6e03e13..72a37263 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts
@@ -23,8 +23,8 @@ export class CloudNodesTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts
index f96cb926..dfd6377e 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts
@@ -39,8 +39,8 @@ export class EthernetHubsAddTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
     });
   }
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts
index 647c03f1..187141c9 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts
@@ -39,9 +39,9 @@ export class EthernetHubsTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.categories = this.builtInTemplatesConfigurationService.getCategoriesForEthernetHubs();
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts
index 98eda9c0..11ee6b10 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts
@@ -23,8 +23,8 @@ export class EthernetHubsTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts
index cc476e1f..4da02e24 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts
@@ -39,8 +39,8 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
     });
   }
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts
index ec58a70a..aee84276 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts
@@ -40,9 +40,9 @@ export class EthernetSwitchesTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts
index 2c9fa941..87c520c7 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts
@@ -23,8 +23,8 @@ export class EthernetSwitchesTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts
index 02edc357..63b13c7d 100644
--- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts
+++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts
@@ -59,8 +59,8 @@ export class AddDockerTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.consoleTypes = this.configurationService.getConsoleTypes();
diff --git a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts
index dcea306a..4f460bd0 100644
--- a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts
+++ b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts
@@ -33,9 +33,9 @@ export class CopyDockerTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.dockerService.getTemplate(this.server, template_id).subscribe((dockerTemplate: DockerTemplate) => {
diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts
index fd0f01b0..f4b2203f 100644
--- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts
+++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts
@@ -46,9 +46,9 @@ export class DockerTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
index 660fc2fa..44130423 100644
--- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
+++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
@@ -24,8 +24,8 @@ export class DockerTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
index c8a496f7..2f0b5d9f 100644
--- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
+++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
@@ -112,8 +112,8 @@ export class AddIosTemplateComponent implements OnInit, OnDestroy {
 
     })
 
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getImages();
diff --git a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts
index 31f3905a..cff618a2 100644
--- a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts
+++ b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts
@@ -33,9 +33,9 @@ export class CopyIosTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.iosService.getTemplate(this.server, template_id).subscribe((iosTemplate: IosTemplate) => {
diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts
index a8126286..6775616f 100644
--- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts
+++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts
@@ -20,8 +20,8 @@ export class DynamipsPreferencesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
     });
   }
diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts
index 15b02133..df11fb52 100644
--- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts
+++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts
@@ -69,9 +69,9 @@ export class IosTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
index 844d3fec..3c56beda 100644
--- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
+++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
@@ -25,8 +25,8 @@ export class IosTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/general/general-preferences.component.ts b/src/app/components/preferences/general/general-preferences.component.ts
index e9f24013..6ff6f54f 100644
--- a/src/app/components/preferences/general/general-preferences.component.ts
+++ b/src/app/components/preferences/general/general-preferences.component.ts
@@ -12,6 +12,6 @@ export class GeneralPreferencesComponent implements OnInit {
   constructor(private route: ActivatedRoute) {}
 
   ngOnInit() {
-    this.serverId = this.route.snapshot.paramMap.get('server_id');
+    this.serverId = this.route.snapshot.paramMap.get('controller_id');
   }
 }
diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
index dbcef414..a910f753 100644
--- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
+++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
@@ -84,8 +84,8 @@ export class AddIouTemplateComponent implements OnInit, OnDestroy {
       this.toasterService.success('Image uploaded');
     };
 
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getImages();
       this.templateMocksService.getIouTemplate().subscribe((iouTemplate: IouTemplate) => {
diff --git a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts
index 1062124e..355de585 100644
--- a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts
+++ b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts
@@ -33,9 +33,9 @@ export class CopyIouTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.qemuService.getTemplate(this.server, template_id).subscribe((iouTemplate: IouTemplate) => {
diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts
index c26b8559..18a186c6 100644
--- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts
+++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts
@@ -51,9 +51,9 @@ export class IouTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
index 097dca6b..61cf62dc 100644
--- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
+++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
@@ -24,8 +24,8 @@ export class IouTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/preferences.component.ts b/src/app/components/preferences/preferences.component.ts
index 42de52ba..230476c9 100644
--- a/src/app/components/preferences/preferences.component.ts
+++ b/src/app/components/preferences/preferences.component.ts
@@ -12,6 +12,6 @@ export class PreferencesComponent implements OnInit {
   constructor(private route: ActivatedRoute) {}
 
   ngOnInit() {
-    this.serverId = this.route.snapshot.paramMap.get('server_id');
+    this.serverId = this.route.snapshot.paramMap.get('controller_id');
   }
 }
diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
index ce5a10b8..d1b15a44 100644
--- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
+++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
@@ -100,8 +100,8 @@ export class AddQemuVmTemplateComponent implements OnInit {
 
     };
 
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.templateMocksService.getQemuTemplate().subscribe((qemuTemplate: QemuTemplate) => {
diff --git a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts
index 293f61e4..b2dfb5d0 100644
--- a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts
+++ b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts
@@ -35,9 +35,9 @@ export class CopyQemuVmTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.qemuService.getTemplate(this.server, template_id).subscribe((qemuTemplate: QemuTemplate) => {
diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts
index 8f3b6307..e04dd123 100644
--- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts
+++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts
@@ -23,8 +23,8 @@ export class QemuPreferencesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.serverSettingsService.getSettingsForQemu(this.server).subscribe((settings: QemuSettings) => {
diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
index 4ee36b33..7e280d7a 100644
--- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
+++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
@@ -53,9 +53,9 @@ export class QemuVmTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
index f235698a..840a50e5 100644
--- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
+++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
@@ -24,8 +24,8 @@ export class QemuVmTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts
index 098b0498..6a365f2b 100644
--- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts
+++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts
@@ -37,8 +37,8 @@ export class AddVirtualBoxTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.virtualBoxService.getVirtualMachines(this.server).subscribe((virtualMachines: VirtualBoxVm[]) => {
diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts
index 3041f9f4..93460644 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts
@@ -15,8 +15,8 @@ export class VirtualBoxPreferencesComponent implements OnInit {
   constructor(private route: ActivatedRoute, private serverService: ServerService) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
     });
   }
diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
index 3a13d547..ab3036f2 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
@@ -55,9 +55,9 @@ export class VirtualBoxTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts
index 93ddbee7..17187578 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts
@@ -24,8 +24,8 @@ export class VirtualBoxTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts
index 1a641957..2b4756b8 100644
--- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts
+++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts
@@ -37,8 +37,8 @@ export class AddVmwareTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.vmwareService.getVirtualMachines(this.server).subscribe((virtualMachines: VmwareVm[]) => {
diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts
index d8b16b60..1b437423 100644
--- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts
+++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts
@@ -15,9 +15,9 @@ export class VmwarePreferencesComponent implements OnInit {
   constructor(private route: ActivatedRoute, private serverService: ServerService) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
 
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
     });
   }
diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
index 38f55ec3..043a0044 100644
--- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
+++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
@@ -47,9 +47,9 @@ export class VmwareTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts
index 8700c3b6..f1094b0a 100644
--- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts
+++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts
@@ -23,8 +23,8 @@ export class VmwareTemplatesComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts
index 5d478bdd..60b2ddf5 100644
--- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts
+++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts
@@ -38,8 +38,8 @@ export class AddVpcsTemplateComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
     });
   }
diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts
index 9d5fa383..95bbf04d 100644
--- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts
+++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts
@@ -15,9 +15,9 @@ export class VpcsPreferencesComponent implements OnInit {
   constructor(private route: ActivatedRoute, private serverService: ServerService) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
 
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
     });
   }
diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts
index 5888e2d6..7ce3df0a 100644
--- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts
+++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts
@@ -39,9 +39,9 @@ export class VpcsTemplateDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
     const template_id = this.route.snapshot.paramMap.get('template_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
 
       this.getConfiguration();
diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts
index f012409d..4874d883 100644
--- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts
+++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts
@@ -19,8 +19,8 @@ export class VpcsTemplatesComponent implements OnInit {
   constructor(private route: ActivatedRoute, private serverService: ServerService, private vpcsService: VpcsService) {}
 
   ngOnInit() {
-    const server_id = this.route.snapshot.paramMap.get('server_id');
-    this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    const controller_id = this.route.snapshot.paramMap.get('controller_id');
+    this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       this.server = server;
       this.getTemplates();
     });
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts
index a67a8438..61cee01a 100644
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@@ -329,9 +329,9 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
 
   getData() {
     const routeSub = this.route.paramMap.subscribe((paramMap: ParamMap) => {
-      const server_id = parseInt(paramMap.get('server_id'), 10);
+      const controller_id = parseInt(paramMap.get('controller_id'), 10);
 
-      from(this.serverService.get(server_id))
+      from(this.serverService.get(controller_id))
         .pipe(
           mergeMap((server: Server) => {
             if (!server) this.router.navigate(['/controllers']);
diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts
index 2efd009b..139317ff 100644
--- a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts
+++ b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts
@@ -80,7 +80,7 @@ describe('ListOfSnapshotsComponent', () => {
         NoopAnimationsModule,
         RouterTestingModule.withRoutes([
           {
-            path: 'controller/:server_id/project/:project_id/snapshots',
+            path: 'controller/:controller_id/project/:project_id/snapshots',
             component: ListOfSnapshotsComponent,
             resolve: { server: ServerResolve },
           },
diff --git a/src/app/components/system-status/status-info/status-info.component.ts b/src/app/components/system-status/status-info/status-info.component.ts
index 04d0fc64..f704520d 100644
--- a/src/app/components/system-status/status-info/status-info.component.ts
+++ b/src/app/components/system-status/status-info/status-info.component.ts
@@ -24,7 +24,7 @@ export class StatusInfoComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.serverId = this.route.snapshot.paramMap.get('server_id');
+    this.serverId = this.route.snapshot.paramMap.get('controller_id');
     this.getStatistics();
   }
 
diff --git a/src/app/components/system-status/system-status.component.ts b/src/app/components/system-status/system-status.component.ts
index 0b476298..2eb65771 100644
--- a/src/app/components/system-status/system-status.component.ts
+++ b/src/app/components/system-status/system-status.component.ts
@@ -12,6 +12,6 @@ export class SystemStatusComponent implements OnInit {
   constructor(private route: ActivatedRoute) {}
 
   ngOnInit() {
-    this.serverId = this.route.snapshot.paramMap.get('server_id');
+    this.serverId = this.route.snapshot.paramMap.get('controller_id');
   }
 }
diff --git a/src/app/components/users/logged-user/logged-user.component.ts b/src/app/components/users/logged-user/logged-user.component.ts
index e8b79ab4..0c02ad43 100644
--- a/src/app/components/users/logged-user/logged-user.component.ts
+++ b/src/app/components/users/logged-user/logged-user.component.ts
@@ -23,7 +23,7 @@ export class LoggedUserComponent implements OnInit {
     ) {}
 
     ngOnInit() {
-        let serverId = this.route.snapshot.paramMap.get('server_id');
+        let serverId = this.route.snapshot.paramMap.get('controller_id');
         this.serverService.get(+serverId).then((server: Server) => {
             this.server = server;
             this.userService.getInformationAboutLoggedUser(server).subscribe((response: any) => {
diff --git a/src/app/components/web-console-full-window/web-console-full-window.component.ts b/src/app/components/web-console-full-window/web-console-full-window.component.ts
index 47479203..554b3aa5 100644
--- a/src/app/components/web-console-full-window/web-console-full-window.component.ts
+++ b/src/app/components/web-console-full-window/web-console-full-window.component.ts
@@ -51,7 +51,7 @@ export class WebConsoleFullWindowComponent implements OnInit {
   }
 
   getData() {
-    this.serverId = this.route.snapshot.paramMap.get('server_id');
+    this.serverId = this.route.snapshot.paramMap.get('controller_id');
     this.projectId = this.route.snapshot.paramMap.get('project_id');
     this.nodeId = this.route.snapshot.paramMap.get('node_id');
 
diff --git a/src/app/guards/login-guard.ts b/src/app/guards/login-guard.ts
index 3532ae7c..e1d56d27 100644
--- a/src/app/guards/login-guard.ts
+++ b/src/app/guards/login-guard.ts
@@ -9,13 +9,13 @@ export class LoginGuard implements CanActivate {
   constructor(private serverService: ServerService, private loginService: LoginService, private router: Router) {}
 
   async canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
-    const server_id = next.paramMap.get('server_id');
-    this.loginService.server_id = server_id;
-    let server = await this.serverService.get(parseInt(server_id, 10));
+    const controller_id = next.paramMap.get('controller_id');
+    this.loginService.controller_id = controller_id;
+    let server = await this.serverService.get(parseInt(controller_id, 10));
     try {
       await this.loginService.getLoggedUser(server);
     } catch (e) {}
-    return this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
+    return this.serverService.get(parseInt(controller_id, 10)).then((server: Server) => {
       if (server.authToken && !server.tokenExpired) {
         return true;
       }
diff --git a/src/app/interceptors/http.interceptor.ts b/src/app/interceptors/http.interceptor.ts
index 0b1ea7b5..649e8625 100644
--- a/src/app/interceptors/http.interceptor.ts
+++ b/src/app/interceptors/http.interceptor.ts
@@ -22,8 +22,8 @@ export class HttpRequestsInterceptor implements HttpInterceptor {
 
   async call() {
     let getCurrentUser = JSON.parse(localStorage.getItem(`isRememberMe`)) ?? null;
-    const server_id = this.loginService.server_id;
-    let server = await this.serverService.get(parseInt(server_id, 10));
+    const controller_id = this.loginService.controller_id;
+    let server = await this.serverService.get(parseInt(controller_id, 10));
     server.tokenExpired = true;
     await this.serverService.update(server);
     try {
diff --git a/src/app/resolvers/server-resolve.ts b/src/app/resolvers/server-resolve.ts
index 1532baed..142e6545 100644
--- a/src/app/resolvers/server-resolve.ts
+++ b/src/app/resolvers/server-resolve.ts
@@ -8,6 +8,6 @@ export class ServerResolve implements Resolve<Server> {
   constructor(private serverService: ServerService) {}
 
   resolve(route: ActivatedRouteSnapshot) {
-    return this.serverService.get(parseInt(route.params['server_id']));
+    return this.serverService.get(parseInt(route.params['controller_id']));
   }
 }
diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts
index a5ff85b7..c9a006f3 100644
--- a/src/app/services/login.service.ts
+++ b/src/app/services/login.service.ts
@@ -7,7 +7,7 @@ import { AuthResponse } from '../models/authResponse';
 
 @Injectable()
 export class LoginService {
-  server_id:string =''
+  controller_id:string =''
   constructor(private httpServer: HttpServer) {}
 
   login(server: Server, username: string, password: string) {
diff --git a/src/app/services/server.service.spec.ts b/src/app/services/server.service.spec.ts
index 9b4e4f10..1e21b3d1 100644
--- a/src/app/services/server.service.spec.ts
+++ b/src/app/services/server.service.spec.ts
@@ -10,9 +10,9 @@ export class MockedServerService {
     });
   }
 
-  public get(server_id: number) {
+  public get(controller_id: number) {
     const server = new Server();
-    server.id = server_id;
+    server.id = controller_id;
     return Promise.resolve(server);
   }
 
diff --git a/src/app/services/server.service.ts b/src/app/services/server.service.ts
index f40f57a3..90e5a3bf 100644
--- a/src/app/services/server.service.ts
+++ b/src/app/services/server.service.ts
@@ -5,18 +5,18 @@ import { HttpServer } from './http-server.service';
 
 @Injectable()
 export class ServerService {
-  private serverIds: string[] = [];
+  private controllerIds: string[] = [];
   public serviceInitialized: Subject<boolean> = new Subject<boolean>();
   public isServiceInitialized: boolean;
 
   constructor(private httpServer: HttpServer) {
-    this.serverIds = this.getServerIds();
+    this.controllerIds = this.getServerIds();
     this.isServiceInitialized = true;
     this.serviceInitialized.next(this.isServiceInitialized);
   }
 
   getServerIds() : string[]{
-    let str = localStorage.getItem("serverIds");
+    let str = localStorage.getItem("controllerIds");
     if (str?.length > 0) {
       return str.split(",");
     }
@@ -24,12 +24,12 @@ export class ServerService {
   }
 
   updateServerIds() {
-    localStorage.removeItem("serverIds");
-    localStorage.setItem("serverIds", this.serverIds.toString());
+    localStorage.removeItem("controllerIds");
+    localStorage.setItem("controllerIds", this.controllerIds.toString());
   }
 
   public get(id: number): Promise<Server> {
-    let server: Server = JSON.parse(localStorage.getItem(`server-${id}`));
+    let server: Server = JSON.parse(localStorage.getItem(`controller-${id}`));
     let promise = new Promise<Server>((resolve) => {
       resolve(server);
     });
@@ -37,10 +37,10 @@ export class ServerService {
   }
 
   public create(server: Server) {
-    server.id = this.serverIds.length + 1;
-    localStorage.setItem(`server-${server.id}`, JSON.stringify(server));
+    server.id = this.controllerIds.length + 1;
+    localStorage.setItem(`controller-${server.id}`, JSON.stringify(server));
 
-    this.serverIds.push(`server-${server.id}`);
+    this.controllerIds.push(`controller-${server.id}`);
     this.updateServerIds();
 
     let promise = new Promise<Server>((resolve) => {
@@ -50,8 +50,8 @@ export class ServerService {
   }
 
   public update(server: Server) {
-    localStorage.removeItem(`server-${server.id}`);
-    localStorage.setItem(`server-${server.id}`, JSON.stringify(server));
+    localStorage.removeItem(`controller-${server.id}`);
+    localStorage.setItem(`controller-${server.id}`, JSON.stringify(server));
 
     let promise = new Promise<Server>((resolve) => {
       resolve(server);
@@ -62,7 +62,7 @@ export class ServerService {
   public findAll() {
     let promise = new Promise<Server[]>((resolve) => {
       let servers: Server[] = [];
-      this.serverIds.forEach((n) => {
+      this.controllerIds.forEach((n) => {
         let server: Server = JSON.parse(localStorage.getItem(n));
         servers.push(server);
       });
@@ -72,8 +72,8 @@ export class ServerService {
   }
 
   public delete(server: Server) {
-    localStorage.removeItem(`server-${server.id}`);
-    this.serverIds = this.serverIds.filter((n) => n !== `server-${server.id}`);
+    localStorage.removeItem(`controller-${server.id}`);
+    this.controllerIds = this.controllerIds.filter((n) => n !== `controller-${server.id}`);
     this.updateServerIds();
 
     let promise = new Promise((resolve) => {