diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 9cfa01b1..683f4f88 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -6,7 +6,7 @@ import { ServersComponent } from './components/servers/servers.component';
 import { ProjectsComponent } from './components/projects/projects.component';
 import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component';
 import { SettingsComponent } from './components/settings/settings.component';
-import { BundledServerFinderComponent } from './components/local-server/bundled-server-finder.component';
+import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component';
 import { PreferencesComponent } from './components/preferences/preferences.component';
 import { QemuPreferencesComponent } from './components/preferences/qemu/qemu-preferences/qemu-preferences.component';
 import { QemuVmTemplatesComponent } from './components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 206afa43..eab5be9e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -58,7 +58,7 @@ import { ProjectMapShortcutsComponent } from './components/project-map/project-m
 import { SettingsComponent } from './components/settings/settings.component';
 import { SettingsService } from './services/settings.service';
 
-import { BundledServerFinderComponent } from './components/local-server/bundled-server-finder.component';
+import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component';
 import { ProgressComponent } from './common/progress/progress.component';
 import { ProgressService } from './common/progress/progress.service';
 import { version } from './version';
diff --git a/src/app/components/local-server/bundled-server-finder.component.html b/src/app/components/bundled-server-finder/bundled-server-finder.component.html
similarity index 100%
rename from src/app/components/local-server/bundled-server-finder.component.html
rename to src/app/components/bundled-server-finder/bundled-server-finder.component.html
diff --git a/src/app/components/local-server/bundled-server-finder.component.scss b/src/app/components/bundled-server-finder/bundled-server-finder.component.scss
similarity index 100%
rename from src/app/components/local-server/bundled-server-finder.component.scss
rename to src/app/components/bundled-server-finder/bundled-server-finder.component.scss
diff --git a/src/app/components/local-server/bundled-server-finder.component.spec.ts b/src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts
similarity index 100%
rename from src/app/components/local-server/bundled-server-finder.component.spec.ts
rename to src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts
diff --git a/src/app/components/local-server/bundled-server-finder.component.ts b/src/app/components/bundled-server-finder/bundled-server-finder.component.ts
similarity index 100%
rename from src/app/components/local-server/bundled-server-finder.component.ts
rename to src/app/components/bundled-server-finder/bundled-server-finder.component.ts
diff --git a/src/app/components/project-map/context-menu/context-menu.component.html b/src/app/components/project-map/context-menu/context-menu.component.html
index 950cd570..8d778210 100644
--- a/src/app/components/project-map/context-menu/context-menu.component.html
+++ b/src/app/components/project-map/context-menu/context-menu.component.html
@@ -27,13 +27,13 @@
       [drawings]="drawings"
     ></app-move-layer-down-action>
     <app-start-capture-action
-      *ngIf="!projectService.isReadOnly(project) && isLocalServer 
+      *ngIf="!projectService.isReadOnly(project) && isBundledServer 
       && drawings.length===0 && nodes.length===0 && links.length===1"
       [server]="server"
       [link]="links[0]"
     ></app-start-capture-action>
     <app-stop-capture-action
-      *ngIf="!projectService.isReadOnly(project) && isLocalServer 
+      *ngIf="!projectService.isReadOnly(project) && isBundledServer 
       && drawings.length===0 && nodes.length===0 && links.length===1"
       [server]="server"
       [link]="links[0]"
diff --git a/src/app/components/project-map/context-menu/context-menu.component.ts b/src/app/components/project-map/context-menu/context-menu.component.ts
index 35cc6ad4..ef4e30b8 100644
--- a/src/app/components/project-map/context-menu/context-menu.component.ts
+++ b/src/app/components/project-map/context-menu/context-menu.component.ts
@@ -31,7 +31,7 @@ export class ContextMenuComponent implements OnInit {
   links: Link[] = [];
 
   hasTextCapabilities: boolean = false;
-  isLocalServer: boolean = false;
+  isBundledServer: boolean = false;
 
   constructor(
     private sanitizer: DomSanitizer,
@@ -41,7 +41,7 @@ export class ContextMenuComponent implements OnInit {
 
   ngOnInit() {
     this.setPosition(0, 0);
-    this.isLocalServer = this.server.location === 'local';
+    this.isBundledServer = this.server.location === 'bundled';
   }
 
   public setPosition(top: number, left: number) {