diff --git a/src/plus/webviews/focus/registration.ts b/src/plus/webviews/focus/registration.ts
index da0306b..9363035 100644
--- a/src/plus/webviews/focus/registration.ts
+++ b/src/plus/webviews/focus/registration.ts
@@ -15,7 +15,7 @@ export function registerFocusWebviewPanel(controller: WebviewsController) {
 			trackingFeature: 'focusWebview',
 			plusFeature: true,
 			column: ViewColumn.Active,
-			panelOptions: {
+			webviewPanelOptions: {
 				retainContextWhenHidden: true,
 				enableFindWidget: true,
 			},
diff --git a/src/plus/webviews/graph/registration.ts b/src/plus/webviews/graph/registration.ts
index 4c2ec6d..109637a 100644
--- a/src/plus/webviews/graph/registration.ts
+++ b/src/plus/webviews/graph/registration.ts
@@ -24,7 +24,7 @@ export function registerGraphWebviewPanel(controller: WebviewsController) {
 			trackingFeature: 'graphWebview',
 			plusFeature: true,
 			column: ViewColumn.Active,
-			panelOptions: {
+			webviewPanelOptions: {
 				retainContextWhenHidden: true,
 				enableFindWidget: false,
 			},
diff --git a/src/plus/webviews/timeline/registration.ts b/src/plus/webviews/timeline/registration.ts
index 5e2f425..d5d1cf2 100644
--- a/src/plus/webviews/timeline/registration.ts
+++ b/src/plus/webviews/timeline/registration.ts
@@ -15,7 +15,7 @@ export function registerTimelineWebviewPanel(controller: WebviewsController) {
 			trackingFeature: 'timelineWebview',
 			plusFeature: true,
 			column: ViewColumn.Active,
-			panelOptions: {
+			webviewPanelOptions: {
 				retainContextWhenHidden: true,
 				enableFindWidget: false,
 			},
diff --git a/src/webviews/settings/registration.ts b/src/webviews/settings/registration.ts
index 801d5ba..d4d48ac 100644
--- a/src/webviews/settings/registration.ts
+++ b/src/webviews/settings/registration.ts
@@ -16,7 +16,7 @@ export function registerSettingsWebviewPanel(controller: WebviewsController) {
 			trackingFeature: 'settingsWebview',
 			plusFeature: false,
 			column: ViewColumn.Beside,
-			panelOptions: {
+			webviewPanelOptions: {
 				retainContextWhenHidden: false,
 				enableFindWidget: true,
 			},
diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts
index f414a94..6fd2ce2 100644
--- a/src/webviews/webviewController.ts
+++ b/src/webviews/webviewController.ts
@@ -147,7 +147,7 @@ export class WebviewController<
 		public readonly parent: GetParentType<Descriptor>,
 		resolveProvider: (
 			container: Container,
-			host: WebviewController<State, SerializedState>,
+			controller: WebviewController<State, SerializedState>,
 		) => Promise<WebviewProvider<State, SerializedState>>,
 	) {
 		this.id = descriptor.id;
diff --git a/src/webviews/webviewsController.ts b/src/webviews/webviewsController.ts
index 994ebc8..5796fde 100644
--- a/src/webviews/webviewsController.ts
+++ b/src/webviews/webviewsController.ts
@@ -23,8 +23,8 @@ export interface WebviewPanelDescriptor {
 	readonly trackingFeature: TrackedUsageFeatures;
 	readonly plusFeature: boolean;
 	readonly column?: ViewColumn;
-	readonly options?: WebviewOptions;
-	readonly panelOptions?: WebviewPanelOptions;
+	readonly webviewOptions?: WebviewOptions;
+	readonly webviewPanelOptions?: WebviewPanelOptions;
 }
 
 interface WebviewPanelRegistration<State, SerializedState = State> {
@@ -48,7 +48,7 @@ export interface WebviewViewDescriptor {
 	readonly contextKeyPrefix: `gitlens:webviewView:${WebviewViewIds}`;
 	readonly trackingFeature: TrackedUsageFeatures;
 	readonly plusFeature: boolean;
-	readonly options?: WebviewOptions;
+	readonly webviewOptions?: WebviewOptions;
 	readonly webviewViewOptions?: {
 		readonly retainContextWhenHidden?: boolean;
 	};
@@ -83,7 +83,7 @@ export class WebviewsController implements Disposable {
 		descriptor: WebviewViewDescriptor,
 		resolveProvider: (
 			container: Container,
-			host: WebviewController<State, SerializedState>,
+			controller: WebviewController<State, SerializedState>,
 		) => Promise<WebviewProvider<State, SerializedState>>,
 		canResolveProvider?: () => boolean | Promise<boolean>,
 	): WebviewViewProxy {
@@ -113,7 +113,7 @@ export class WebviewsController implements Disposable {
 							enableCommandUris: true,
 							enableScripts: true,
 							localResourceRoots: [Uri.file(this.container.context.extensionPath)],
-							...descriptor.options,
+							...descriptor.webviewOptions,
 						};
 
 						webviewView.title = descriptor.title;
@@ -175,7 +175,7 @@ export class WebviewsController implements Disposable {
 		descriptor: WebviewPanelDescriptor,
 		resolveProvider: (
 			container: Container,
-			host: WebviewController<State, SerializedState>,
+			controller: WebviewController<State, SerializedState>,
 		) => Promise<WebviewProvider<State, SerializedState>>,
 		canResolveProvider?: () => boolean | Promise<boolean>,
 	): WebviewPanelProxy {
@@ -218,8 +218,8 @@ export class WebviewsController implements Disposable {
 							enableScripts: true,
 							localResourceRoots: [Uri.file(container.context.extensionPath)],
 						},
-						...descriptor.options,
-						...descriptor.panelOptions,
+						...descriptor.webviewOptions,
+						...descriptor.webviewPanelOptions,
 					},
 				);
 				panel.iconPath = Uri.file(container.context.asAbsolutePath(descriptor.iconPath));
diff --git a/src/webviews/welcome/registration.ts b/src/webviews/welcome/registration.ts
index b4895c8..d8005d0 100644
--- a/src/webviews/welcome/registration.ts
+++ b/src/webviews/welcome/registration.ts
@@ -15,7 +15,7 @@ export function registerWelcomeWebviewPanel(controller: WebviewsController) {
 			trackingFeature: 'welcomeWebview',
 			plusFeature: false,
 			column: ViewColumn.Beside,
-			panelOptions: {
+			webviewPanelOptions: {
 				retainContextWhenHidden: false,
 				enableFindWidget: true,
 			},