diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 8158008cd853e4540812bf89cb9ce3e014e330d0..8c7906ceae9ec060ce0d49d3b96a77c0951dd3f6 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -656,16 +656,16 @@ declare module 'vscode' {
 
 	//#region URLs
 
-	export interface UrlHandler {
-		handleUrl(uri: Uri): void;
+	export interface ExternalUriHandler {
+		handleExternalUri(uri: Uri): void;
 	}
 
 	export namespace window {
 
 		/**
-		 * Registers a URL handler.
+		 * Registers a protocol handler capable of handling system-wide URIs.
 		 */
-		export function registerUrlHandler(handler: UrlHandler): Disposable;
+		export function registerExternalUriHandler(handler: ExternalUriHandler): Disposable;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
index 64d74d4f23edcc76ad7de4301bc7f892f4f1dedb..b84eecd04e81c0a6ea79ccfaf213480fc281d2f1 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
@@ -23,7 +23,7 @@ class ExtensionUrlHandler implements IURLHandler {
 			return TPromise.as(false);
 		}
 
-		return this.proxy.$handleUrl(this.handle, uri).then(() => true);
+		return this.proxy.$handleExternalUri(this.handle, uri).then(() => true);
 	}
 }
 
@@ -41,7 +41,7 @@ export class MainThreadUrls implements MainThreadUrlsShape {
 		this.proxy = context.getProxy(ExtHostContext.ExtHostUrls);
 	}
 
-	$registerUrlHandler(handle: number, extensionId: string): TPromise<void> {
+	$registerExternalUriHandler(handle: number, extensionId: string): TPromise<void> {
 		const handler = new ExtensionUrlHandler(this.proxy, handle, extensionId);
 		const disposable = this.urlService.registerHandler(handler);
 		this.handlers.set(handle, disposable);
@@ -49,7 +49,7 @@ export class MainThreadUrls implements MainThreadUrlsShape {
 		return TPromise.as(null);
 	}
 
-	$unregisterUrlHandler(handle: number): TPromise<void> {
+	$unregisterExternalUriHandler(handle: number): TPromise<void> {
 		const disposable = this.handlers.get(handle);
 
 		if (!disposable) {
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 054977f834def46c064cf7d5945ec72ebb0d1869..688f4f3460fc3bede1668e8b7da2d03332c2d52d 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -434,8 +434,8 @@ export function createApiFactory(
 			registerWebviewPanelSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewPanelSerializer) => {
 				return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer);
 			}),
-			registerUrlHandler: proposedApiFunction(extension, (handler: vscode.UrlHandler) => {
-				return extHostUrls.registerUrlHandler(extension.id, handler);
+			registerExternalUriHandler: proposedApiFunction(extension, (handler: vscode.ExternalUriHandler) => {
+				return extHostUrls.registerExternalUriHandler(extension.id, handler);
 			})
 		};
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 9c1906697da3c395167299eab71752a79cf33812..a31a36c4c7caef8db6a62bf3f0ae40fb7aad651d 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -373,12 +373,12 @@ export interface ExtHostWebviewsShape {
 }
 
 export interface MainThreadUrlsShape extends IDisposable {
-	$registerUrlHandler(handle: number, extensionId: string): TPromise<void>;
-	$unregisterUrlHandler(handle: number): TPromise<void>;
+	$registerExternalUriHandler(handle: number, extensionId: string): TPromise<void>;
+	$unregisterExternalUriHandler(handle: number): TPromise<void>;
 }
 
 export interface ExtHostUrlsShape {
-	$handleUrl(handle: number, uri: UriComponents): TPromise<void>;
+	$handleExternalUri(handle: number, uri: UriComponents): TPromise<void>;
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
diff --git a/src/vs/workbench/api/node/extHostUrls.ts b/src/vs/workbench/api/node/extHostUrls.ts
index a9e946c0c6dfacf17073a3cb6d81d0c5049ee006..c4ba32abf0e9689b9cfb3e4d69ec15bb72e6d141 100644
--- a/src/vs/workbench/api/node/extHostUrls.ts
+++ b/src/vs/workbench/api/node/extHostUrls.ts
@@ -14,7 +14,7 @@ export class ExtHostUrls implements ExtHostUrlsShape {
 	private static HandlePool = 0;
 	private readonly _proxy: MainThreadUrlsShape;
 
-	private handlers = new Map<number, vscode.UrlHandler>();
+	private handlers = new Map<number, vscode.ExternalUriHandler>();
 
 	constructor(
 		mainContext: IMainContext
@@ -22,25 +22,25 @@ export class ExtHostUrls implements ExtHostUrlsShape {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadUrls);
 	}
 
-	registerUrlHandler(extensionId: string, handler: vscode.UrlHandler): vscode.Disposable {
+	registerExternalUriHandler(extensionId: string, handler: vscode.ExternalUriHandler): vscode.Disposable {
 		const handle = ExtHostUrls.HandlePool++;
 		this.handlers.set(handle, handler);
-		this._proxy.$registerUrlHandler(handle, extensionId);
+		this._proxy.$registerExternalUriHandler(handle, extensionId);
 
 		return toDisposable(() => {
 			this.handlers.delete(handle);
-			this._proxy.$unregisterUrlHandler(handle);
+			this._proxy.$unregisterExternalUriHandler(handle);
 		});
 	}
 
-	$handleUrl(handle: number, uri: UriComponents): TPromise<void> {
+	$handleExternalUri(handle: number, uri: UriComponents): TPromise<void> {
 		const handler = this.handlers.get(handle);
 
 		if (!handler) {
 			return TPromise.as(null);
 		}
 
-		handler.handleUrl(URI.revive(uri));
+		handler.handleExternalUri(URI.revive(uri));
 		return TPromise.as(null);
 	}
 }
\ No newline at end of file