diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index c860ab01cbd..4c94d595adc 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -39,7 +39,7 @@ var baseModules = [
 // Build
 
 var builtInExtensions = {
-	'jrieken.vscode-omnisharp': '0.3.2',
+	'ms-vscode.omnisharp': '0.3.2',
 };
 
 var vscodeEntryPoints = _.flatten([
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTips.json b/src/vs/workbench/parts/extensions/electron-browser/extensionTips.json
index dbbb8e72ac3..d8024144784 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTips.json
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTips.json
@@ -1,5 +1,5 @@
 {
-	"jrieken.vscode-omnisharp": "{**/*.cs,**/project.json,**/global.json,**/*.csproj,**/*.sln}",
+	"ms-vscode.omnisharp": "{**/*.cs,**/project.json,**/global.json,**/*.csproj,**/*.sln}",
 	"msjsdiag.debugger-for-chrome": "{**/*.ts,**/*.tsx**/*.js,**/*.jsx,**/*.es6}",
 	"lukehoban.Go": "**/*.go",
 	"ms-vscode.PowerShell": "{**/*.ps,**/*.ps1}",
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsAssistant.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsAssistant.ts
index d9f1cfc78c0..2f3e41accf1 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsAssistant.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsAssistant.ts
@@ -54,7 +54,7 @@ function monoDebugChecker(accessor, callback) {
 }
 
 const extensionChecker: { [id: string]: LegacyExtensionChecker } = Object.create(null);
-extensionChecker['jrieken.vscode-omnisharp'] = omnisharpChecker;
+extensionChecker['ms-vscode.omnisharp'] = omnisharpChecker;
 extensionChecker['andreweinand.mono-debug'] = monoDebugChecker;
 
 export function checkForLegacyExtensionNeeds(accessor: ServicesAccessor): void {