diff --git a/src/vs/base/common/uriIpc.ts b/src/vs/base/common/uriIpc.ts
index 10e24307da0dc289c98c5046ce518777ec0f621a..4cee99c11f704d9a3304de0d59ff1a0932f2b9c0 100644
--- a/src/vs/base/common/uriIpc.ts
+++ b/src/vs/base/common/uriIpc.ts
@@ -8,8 +8,8 @@ import { MarshalledObject } from 'vs/base/common/marshalling';
 
 export interface IURITransformer {
 	transformIncoming(uri: UriComponents): UriComponents;
-	transformOutgoing(uri: URI): URI;
 	transformOutgoing(uri: UriComponents): UriComponents;
+	transformOutgoingURI(uri: URI): URI;
 }
 
 export const DefaultURITransformer: IURITransformer = new class {
@@ -17,9 +17,11 @@ export const DefaultURITransformer: IURITransformer = new class {
 		return uri;
 	}
 
-	transformOutgoing(uri: URI): URI;
-	transformOutgoing(uri: UriComponents): UriComponents;
-	transformOutgoing(uri: URI | UriComponents): URI | UriComponents {
+	transformOutgoing(uri: UriComponents): UriComponents {
+		return uri;
+	}
+
+	transformOutgoingURI(uri: URI): URI {
 		return uri;
 	}
 };
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 2bc020d9a2802c802cbddb1642d4348bd269199a..50b202a6a641115a255d09f64ee2994406f8e6fa 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -63,7 +63,7 @@ export function getIdAndVersion(id: string): [string, string | undefined] {
 }
 
 
-class Main {
+export class Main {
 
 	constructor(
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
diff --git a/src/vs/platform/download/node/downloadIpc.ts b/src/vs/platform/download/node/downloadIpc.ts
index 03369f885caf8bc7ac57ba460878469bb86b28f9..10210cfb5b0a406b2fe19f8edef5519f32967e0c 100644
--- a/src/vs/platform/download/node/downloadIpc.ts
+++ b/src/vs/platform/download/node/downloadIpc.ts
@@ -47,7 +47,7 @@ export class DownloadServiceChannelClient implements IDownloadService {
 	constructor(private channel: IChannel, private getUriTransformer: () => IURITransformer) { }
 
 	download(from: URI, to: string): Promise<void> {
-		from = this.getUriTransformer().transformOutgoing(from);
+		from = this.getUriTransformer().transformOutgoingURI(from);
 		const dirName = path.dirname(to);
 		let out: fs.WriteStream;
 		return new Promise((c, e) => {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts
index 56e64302099ccfb1c338867dd5761182f34c256e..e7fafc49e9272c7551aea971736384c5631dde3d 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementIpc.ts
@@ -16,7 +16,7 @@ function transformIncomingURI(uri: UriComponents, transformer: IURITransformer |
 }
 
 function transformOutgoingURI(uri: URI, transformer: IURITransformer | null): URI {
-	return transformer ? transformer.transformOutgoing(uri) : uri;
+	return transformer ? transformer.transformOutgoingURI(uri) : uri;
 }
 
 function transformIncomingExtension(extension: ILocalExtension, transformer: IURITransformer | null): ILocalExtension {
@@ -27,7 +27,7 @@ function transformIncomingExtension(extension: ILocalExtension, transformer: IUR
 }
 
 function transformOutgoingExtension(extension: ILocalExtension, transformer: IURITransformer | null): ILocalExtension {
-	return transformer ? cloneAndChange(extension, value => value instanceof URI ? transformer.transformOutgoing(value) : undefined) : extension;
+	return transformer ? cloneAndChange(extension, value => value instanceof URI ? transformer.transformOutgoingURI(value) : undefined) : extension;
 }
 
 export class ExtensionManagementChannel implements IServerChannel {