diff --git a/e2e/helpers/controller.po.ts b/e2e/helpers/controller.po.ts
index fa620b69..90b6e6dc 100644
--- a/e2e/helpers/controller.po.ts
+++ b/e2e/helpers/controller.po.ts
@@ -28,7 +28,7 @@ export class ControllersPage {
     return browser.driver.findElements(by.css('mat-cell'));
   }
 
-  async navigateToServerProjects() {
+  async navigateToControllerProjects() {
     this.helper.sleep(2000);
     let hyperlinks = await browser.driver.findElements(by.css('a.table-link'));
     let controllerLink;
diff --git a/e2e/project-map.e2e-spec.ts b/e2e/project-map.e2e-spec.ts
index 80106796..faa7a5ac 100644
--- a/e2e/project-map.e2e-spec.ts
+++ b/e2e/project-map.e2e-spec.ts
@@ -18,7 +18,7 @@ describe('Project map page', () => {
     controllersPage.maximizeWindow();
     await controllersPage.navigateToControllersPage();
     await controllersPage.clickAddController();
-    await controllersPage.navigateToServerProjects();
+    await controllersPage.navigateToControllerProjects();
     await projectsPage.openAddProjectDialog();
     helper.sleep(2000);
     await projectsPage.createProject();
diff --git a/e2e/projects.e2e-spec.ts b/e2e/projects.e2e-spec.ts
index f7d87baf..6c022045 100644
--- a/e2e/projects.e2e-spec.ts
+++ b/e2e/projects.e2e-spec.ts
@@ -1,6 +1,6 @@
 import { TestHelper } from './helpers/common.po';
 import { ProjectsPage } from './helpers/project.po';
-import { ControllersPage } from './helpers/server.po';
+import { ControllersPage } from './helpers/controller.po';
 
 describe('Projects page', () => {
   let controllersPage: ControllersPage;
@@ -18,7 +18,7 @@ describe('Projects page', () => {
     controllersPage.maximizeWindow();
     await controllersPage.navigateToControllersPage();
     await controllersPage.clickAddController();
-    await controllersPage.navigateToServerProjects();
+    await controllersPage.navigateToControllerProjects();
     helper.sleep(2000);
 
     //act
diff --git a/e2e/servers.e2e-spec.ts b/e2e/servers.e2e-spec.ts
index de798a72..ff046a80 100644
--- a/e2e/servers.e2e-spec.ts
+++ b/e2e/servers.e2e-spec.ts
@@ -1,7 +1,7 @@
 import { TestHelper } from './helpers/common.po';
-import { ControllersPage } from './helpers/server.po';
+import { ControllersPage } from './helpers/controller.po';
 
-describe('Servers page', () => {
+describe('Controllers page', () => {
   let page: ControllersPage;
   let helper: TestHelper;
 
@@ -30,14 +30,14 @@ describe('Servers page', () => {
     helper.sleep(1000);
 
     // act
-    let firstRowOfServersTable = await page.checkControllersTable();
-    let serverData = [];
-    await helper.asyncForEach(firstRowOfServersTable, async (element) => {
-      serverData.push(await element.getText());
+    let firstRowOfControllersTable = await page.checkControllersTable();
+    let controllerData = [];
+    await helper.asyncForEach(firstRowOfControllersTable, async (element) => {
+      controllerData.push(await element.getText());
     });
 
     // assert
-    expect(serverData).toContain('127.0.0.1');
-    expect(serverData).toContain('3080');
+    expect(controllerData).toContain('127.0.0.1');
+    expect(controllerData).toContain('3080');
   });
 });
diff --git a/local-server.js b/local-server.js
index 79e7de03..b71fc71e 100644
--- a/local-server.js
+++ b/local-server.js
@@ -26,7 +26,7 @@ exports.startLocalController = async (controller) => {
   });
 }
 
-exports.stopLocalServer = async (controller) => {
+exports.stopLocalController = async (controller) => {
   return await stop(controller.name);
 }
 
@@ -129,10 +129,10 @@ async function stopAll() {
 async function stop(controllerName) {
   let pid = undefined;
 
-  const runningServer = runningControllers[controllerName];
+  const runningController = runningControllers[controllerName];
 
-  if(runningServer !== undefined && runningServer.process) {
-    pid = runningServer.process.pid;
+  if(runningController !== undefined && runningController.process) {
+    pid = runningController.process.pid;
   }
 
   console.log(`Stopping '${controllerName}' with PID='${pid}'`);
diff --git a/src/app/components/controllers/controllers.component.html b/src/app/components/controllers/controllers.component.html
index 0bf017ae..74225210 100644
--- a/src/app/components/controllers/controllers.component.html
+++ b/src/app/components/controllers/controllers.component.html
@@ -93,7 +93,7 @@
     </div>
 
     <div class="buttons-bar">
-      <button *ngIf="isElectronApp" mat-raised-button class="button" (click)="startLocalServer()">
+      <button *ngIf="isElectronApp" mat-raised-button class="button" (click)="startLocalController()">
         Start local controller
       </button>
       <button mat-raised-button class="button" color="primary" (click)="createModal()">Add Controller</button>
diff --git a/src/app/components/controllers/controllers.component.ts b/src/app/components/controllers/controllers.component.ts
index 31975539..6d9c039f 100644
--- a/src/app/components/controllers/controllers.component.ts
+++ b/src/app/components/controllers/controllers.component.ts
@@ -104,7 +104,7 @@ export class ControllersComponent implements OnInit, OnDestroy {
     this.serverStatusSubscription.unsubscribe();
   }
 
-  startLocalServer() {
+  startLocalController() {
     const controller = this.serverDatabase.data.find((n) => n.location === 'bundled' || 'local');
     this.startServer(controller);
   }
diff --git a/src/app/services/controller-management.service.spec.ts b/src/app/services/controller-management.service.spec.ts
index c87d1997..1784beea 100644
--- a/src/app/services/controller-management.service.spec.ts
+++ b/src/app/services/controller-management.service.spec.ts
@@ -29,10 +29,10 @@ describe('ControllerManagementService', () => {
       remote: {
         require: (file) => {
           return {
-            startLocalServer: (serv) => {
+            startLocalController: (serv) => {
               controller = serv;
             },
-            stopLocalServer: (serv) => {
+            stopLocalController: (serv) => {
               controller = serv;
             },
           };
diff --git a/src/app/services/controller-management.service.ts b/src/app/services/controller-management.service.ts
index 78749beb..0450dcf4 100644
--- a/src/app/services/controller-management.service.ts
+++ b/src/app/services/controller-management.service.ts
@@ -32,11 +32,11 @@ export class ControllerManagementService implements OnDestroy {
       message: '',
     };
     this.controllerStatusChanged.next(startingEvent);
-    return await this.electronService.remote.require('./local-server.js').startLocalServer(controller);
+    return await this.electronService.remote.require('./local-server.js').startLocalController(controller);
   }
 
   async stop(controller:Controller ) {
-    return await this.electronService.remote.require('./local-server.js').stopLocalServer(controller);
+    return await this.electronService.remote.require('./local-server.js').stopLocalController(controller);
   }
 
   async stopAll() {
diff --git a/src/app/services/virtual-box-configuration.service.ts b/src/app/services/virtual-box-configuration.service.ts
index 9aa8d58d..1f47cd5f 100644
--- a/src/app/services/virtual-box-configuration.service.ts
+++ b/src/app/services/virtual-box-configuration.service.ts
@@ -33,8 +33,8 @@ export class VirtualBoxConfigurationService {
       'PCnet-PCI II (Am79C970A)',
       'PCNet-FAST III (Am79C973)',
       'Intel PRO/1000 MT Desktop (82540EM)',
-      'Intel PRO/1000 TController  (82543GC)',
-      'Intel PRO/1000 MTController  (82545EM)',
+      'Intel PRO/1000 T Server  (82543GC)',
+      'Intel PRO/1000 MT Server  (82545EM)',
       'Paravirtualized Network (virtio-net)',
     ];