diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index cce97a14..177fc748 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -126,12 +126,12 @@ import ErrorTelemetry from '../../platform/telemetry/electron-main/errorTelemetr
 // in theory this is not allowed
 // ignore the eslint errors below
 import { IMetricsService } from '../../workbench/contrib/orcide/common/metricsService.js';
-import { IOrcideUpdateService } from '../../workbench/contrib/orcide/common/voidUpdateService.js';
+import { IOrcideUpdateService } from '../../workbench/contrib/orcide/common/orcideUpdateService.js';
 import { MetricsMainService } from '../../workbench/contrib/orcide/electron-main/metricsMainService.js';
-import { VoidMainUpdateService } from '../../workbench/contrib/orcide/electron-main/voidUpdateMainService.js';
+import { OrcideMainUpdateService } from '../../workbench/contrib/orcide/electron-main/orcideUpdateMainService.js';
 import { LLMMessageChannel } from '../../workbench/contrib/orcide/electron-main/sendLLMMessageChannel.js';
-import { VoidSCMService } from '../../workbench/contrib/orcide/electron-main/voidSCMMainService.js';
-import { IOrcideSCMService } from '../../workbench/contrib/orcide/common/voidSCMTypes.js';
+import { OrcideSCMService } from '../../workbench/contrib/orcide/electron-main/orcideSCMMainService.js';
+import { IOrcideSCMService } from '../../workbench/contrib/orcide/common/orcideSCMTypes.js';
 import { MCPChannel } from '../../workbench/contrib/orcide/electron-main/mcpChannel.js';
 /**
  * The main VS Code application. There will only ever be one instance,
@@ -1103,8 +1103,8 @@ export class CodeApplication extends Disposable {
 
 		// Void main process services (required for services with a channel for comm between browser and electron-main (node))
 		services.set(IMetricsService, new SyncDescriptor(MetricsMainService, undefined, false));
-		services.set(IOrcideUpdateService, new SyncDescriptor(VoidMainUpdateService, undefined, false));
-		services.set(IOrcideSCMService, new SyncDescriptor(VoidSCMService, undefined, false));
+		services.set(IOrcideUpdateService, new SyncDescriptor(OrcideMainUpdateService, undefined, false));
+		services.set(IOrcideSCMService, new SyncDescriptor(OrcideSCMService, undefined, false));
 
 		// Default Extensions Profile Init
 		services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService, undefined, true));
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
index 7caf8f51..3f29ee88 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
@@ -25,7 +25,7 @@ import { splitRecentLabel } from '../../../../base/common/labels.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 
 /* eslint-disable */ // Void
-import { VOID_CTRL_K_ACTION_ID, VOID_CTRL_L_ACTION_ID } from '../../../contrib/orcide/browser/actionIDs.js';
+import { ORCIDE_CTRL_K_ACTION_ID, ORCIDE_CTRL_L_ACTION_ID } from '../../../contrib/orcide/browser/actionIDs.js';
 import { VIEWLET_ID as REMOTE_EXPLORER_VIEWLET_ID } from '../../../contrib/remote/browser/remoteExplorer.js';
 /* eslint-enable */
 
@@ -284,7 +284,7 @@ export class EditorGroupWatermark extends Disposable {
 			else {
 
 				// show them Void keybindings
-				const keys = this.keybindingService.lookupKeybinding(VOID_CTRL_L_ACTION_ID);
+				const keys = this.keybindingService.lookupKeybinding(ORCIDE_CTRL_L_ACTION_ID);
 				const dl = append(voidIconBox, $('dl'));
 				const dt = append(dl, $('dt'));
 				dt.textContent = 'Chat'
@@ -295,7 +295,7 @@ export class EditorGroupWatermark extends Disposable {
 				this.currentDisposables.add(label);
 
 
-				const keys2 = this.keybindingService.lookupKeybinding(VOID_CTRL_K_ACTION_ID);
+				const keys2 = this.keybindingService.lookupKeybinding(ORCIDE_CTRL_K_ACTION_ID);
 				const dl2 = append(voidIconBox, $('dl'));
 				const dt2 = append(dl2, $('dt'));
 				dt2.textContent = 'Quick Edit'
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
index 38a342c5..6235af85 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
@@ -27,7 +27,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IExplorerService } from './files.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { VOID_OPEN_SETTINGS_ACTION_ID } from '../../void/browser/voidSettingsPane.js';
+import { ORCIDE_OPEN_SETTINGS_ACTION_ID } from '../../orcide/browser/orcideSettingsPane.js';
 
 // Contribute Global Actions
 
@@ -681,7 +681,7 @@ for (const menuId of [MenuId.EmptyEditorGroupContext, MenuId.EditorTabsBarContex
 MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
 	group: '0_void',
 	command: {
-		id: VOID_OPEN_SETTINGS_ACTION_ID,
+		id: ORCIDE_OPEN_SETTINGS_ACTION_ID,
 		title: nls.localize({ key: 'openVoid', comment: ['&& denotes a mnemonic'] }, "&&Open Void Settings"),
 	},
 	order: 1
diff --git a/src/vs/workbench/contrib/orcide/browser/orcideSelectionHelperWidget.ts b/src/vs/workbench/contrib/orcide/browser/orcideSelectionHelperWidget.ts
index 9e14ea01..2c5b7779 100644
--- a/src/vs/workbench/contrib/orcide/browser/orcideSelectionHelperWidget.ts
+++ b/src/vs/workbench/contrib/orcide/browser/orcideSelectionHelperWidget.ts
@@ -69,7 +69,7 @@ export class SelectionHelperContribution extends Disposable implements IEditorCo
 			this._reactComponentDisposable = res;
 			this._rerender = res.rerender;
 
-			this._register(this._reactComponentDisposable);
+			this._register(res);
 
 
 		});