diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index 5f42b7941f4..1debc54911a 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -32,7 +32,7 @@ import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
@@ -177,7 +177,7 @@ export class ExtensionEditor extends BaseEditor {
 	private contentDisposables: IDisposable[] = [];
 	private transientDisposables: IDisposable[] = [];
 	private disposables: IDisposable[];
-	private activeWebview: Webview;
+	private activeWebview: WebviewElement;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -425,7 +425,7 @@ export class ExtensionEditor extends BaseEditor {
 			.then<void>(body => {
 				const allowedBadgeProviders = this.extensionsWorkbenchService.allowedBadgeProviders;
 				const webViewOptions = allowedBadgeProviders.length > 0 ? { allowScripts: false, allowSvgs: false, svgWhiteList: allowedBadgeProviders } : {};
-				this.activeWebview = new Webview(this.partService.getContainer(Parts.EDITOR_PART), this.themeService, this.environmentService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions);
+				this.activeWebview = new WebviewElement(this.partService.getContainer(Parts.EDITOR_PART), this.themeService, this.environmentService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions);
 				this.activeWebview.mountTo(this.content);
 				const removeLayoutParticipant = arrays.insert(this.layoutParticipants, this.activeWebview);
 				this.contentDisposables.push(toDisposable(removeLayoutParticipant));
diff --git a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts b/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
index d32bae9298d..e7e6b36abb2 100644
--- a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
+++ b/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
@@ -8,7 +8,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 import { IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
-import { Webview } from './webview';
+import { WebviewElement } from './webview';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { Dimension } from 'vs/base/browser/dom';
 
@@ -25,7 +25,7 @@ export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE = new RawContextKey<
  */
 export abstract class BaseWebviewEditor extends BaseEditor {
 
-	protected _webview: Webview | undefined;
+	protected _webview: WebviewElement | undefined;
 	protected contextKey: IContextKey<boolean>;
 	protected findWidgetVisible: IContextKey<boolean>;
 	protected findInputFocusContextKey: IContextKey<boolean>;
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index a4fa6c015c1..8b996f0ae43 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -20,7 +20,7 @@ import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/r
 import { Parts, IPartService } from 'vs/workbench/services/part/common/partService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Webview, WebviewOptions } from './webview';
+import { WebviewElement, WebviewOptions } from './webview';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { BaseWebviewEditor } from './baseWebviewEditor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -84,14 +84,14 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		parent.appendChild(this._content);
 	}
 
-	private get webview(): Webview {
+	private get webview(): WebviewElement {
 		if (!this._webview) {
 			let webviewOptions: WebviewOptions = {};
 			if (this.input && this.input instanceof HtmlInput) {
 				webviewOptions = this.input.options;
 			}
 
-			this._webview = new Webview(
+			this._webview = new WebviewElement(
 				this._partService.getContainer(Parts.EDITOR_PART),
 				this.themeService,
 				this._environmentService,
diff --git a/src/vs/workbench/parts/html/electron-browser/webview.ts b/src/vs/workbench/parts/html/electron-browser/webview.ts
index d33a1c750f8..0ea8ed3965e 100644
--- a/src/vs/workbench/parts/html/electron-browser/webview.ts
+++ b/src/vs/workbench/parts/html/electron-browser/webview.ts
@@ -25,7 +25,7 @@ export interface WebviewOptions {
 	readonly localResourceRoots?: URI[];
 }
 
-export class Webview {
+export class WebviewElement {
 	private readonly _webview: Electron.WebviewTag;
 	private _ready: Promise<this>;
 	private _disposables: IDisposable[] = [];
diff --git a/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts b/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
index f304d2f56eb..46bd1c33785 100644
--- a/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
+++ b/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
@@ -5,13 +5,13 @@
 
 import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { Webview } from './webview';
+import { WebviewElement } from './webview';
 
 export class WebviewFindWidget extends SimpleFindWidget {
 
 	constructor(
 		@IContextViewService contextViewService: IContextViewService,
-		private readonly webview: Webview
+		private readonly webview: WebviewElement
 	) {
 		super(contextViewService);
 	}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index 96b53745e4c..a07a1355d56 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -8,7 +8,7 @@ import { IDisposable, } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
 import { BaseWebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from 'vs/workbench/parts/html/electron-browser/baseWebviewEditor';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -179,7 +179,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 		return rootPaths;
 	}
 
-	private getWebview(input: WebviewEditorInput): Webview {
+	private getWebview(input: WebviewEditorInput): WebviewElement {
 		if (this._webview) {
 			return this._webview;
 		}
@@ -203,7 +203,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 			this.findWidgetVisible = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
 		}
 
-		this._webview = new Webview(
+		this._webview = new WebviewElement(
 			this._partService.getContainer(Parts.EDITOR_PART),
 			this.themeService,
 			this._environmentService,
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
index 6ad462ffcfe..0044f61808f 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
@@ -10,7 +10,7 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorInput, IEditorModel, Position } from 'vs/platform/editor/common/editor';
 import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewEditorService';
 
@@ -26,7 +26,7 @@ export class WebviewEditorInput extends EditorInput {
 	private _currentWebviewHtml: string = '';
 	public _events: WebviewEvents | undefined;
 	private _container: HTMLElement;
-	private _webview: Webview | undefined;
+	private _webview: WebviewElement | undefined;
 	private _webviewOwner: any;
 	private _webviewDisposables: IDisposable[] = [];
 	private _position?: Position;
@@ -163,11 +163,11 @@ export class WebviewEditorInput extends EditorInput {
 		return this._container;
 	}
 
-	public get webview(): Webview | undefined {
+	public get webview(): WebviewElement | undefined {
 		return this._webview;
 	}
 
-	public set webview(value: Webview) {
+	public set webview(value: WebviewElement) {
 		this._webviewDisposables = dispose(this._webviewDisposables);
 
 		this._webview = value;