diff --git a/appveyor.yml b/appveyor.yml
index 75a06cf7baceac74d085005ad95bd4fbb3aebf79..c9ad4c7064bee2dfd6038519c917178255166111 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
+  ELECTRON_RUN_AS_NODE: 1
 
 install:
   - ps: Install-Product node 4.1.1 x64
diff --git a/extensions/typescript/src/utils/electron.ts b/extensions/typescript/src/utils/electron.ts
index 385357242185bcdc5a9d3891f05886ee689b8d8a..9f456bb27d97e63e0b12567669bebad74e503458 100644
--- a/extensions/typescript/src/utils/electron.ts
+++ b/extensions/typescript/src/utils/electron.ts
@@ -47,7 +47,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
 
 	newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
 	newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
-	newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
+	newEnv['ELECTRON_RUN_AS_NODE'] = '1';
 
 	return newEnv;
 }
diff --git a/extensions/typescript/src/utils/electronForkStart.ts b/extensions/typescript/src/utils/electronForkStart.ts
index 34025e99ec4da6ad6c2f992260f97d9089594662..fe349fa856b56ad2b228e6acd7658e64f35c41ce 100644
--- a/extensions/typescript/src/utils/electronForkStart.ts
+++ b/extensions/typescript/src/utils/electronForkStart.ts
@@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
 
 log('STDIN_PIPE_NAME: ' + stdInPipeName);
 log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
-log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']);
+log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
 
 // stdout redirection to named pipe
 (function() {
@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
 		// Unset the custom environmental variables that should not get inherited
 		delete process.env['STDIN_PIPE_NAME'];
 		delete process.env['STDOUT_PIPE_NAME'];
-		delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
+		delete process.env['ELECTRON_RUN_AS_NODE'];
 
 		require(program);
 
diff --git a/resources/common/bin/code.sh b/resources/common/bin/code.sh
index cad3b197491fcf84772fda161d3bb66f8ac98ef4..b0841e098621d87a1ae1af754418291009e7c436 100755
--- a/resources/common/bin/code.sh
+++ b/resources/common/bin/code.sh
@@ -15,6 +15,6 @@ fi
 
 VSCODE_LAUNCHER="$VSCODE_DIR/resources/app/out/cli.js"
 
-ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 VSCODE_PATH="$VSCODE_DIR/$ELECTRON_FILE" \
+ELECTRON_RUN_AS_NODE=1 VSCODE_PATH="$VSCODE_DIR/$ELECTRON_FILE" \
 	"$VSCODE_DIR/$ELECTRON_FILE" $VSCODE_LAUNCHER "$@"
 exit $?
diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd
index 4fe8b88f9d58eb606dc75572b7748ad8a03bc3c8..020e96ee01ba75b5c868f78cb13d6dadba414af7 100644
--- a/resources/win32/bin/code.cmd
+++ b/resources/win32/bin/code.cmd
@@ -1,6 +1,6 @@
 @echo off
 setlocal
 set VSCODE_DEV=
-set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
+set ELECTRON_RUN_AS_NODE=1
 "%~dp0..\\Code.exe" "%~dp0code.js" %*
 endlocal
\ No newline at end of file
diff --git a/resources/win32/bin/code.js b/resources/win32/bin/code.js
index 6dbd04f3e4ea92577bbed1b9ab655b8ff4447096..ce02dda2755f46d0cbd3f5a24b5a00c5957e330f 100644
--- a/resources/win32/bin/code.js
+++ b/resources/win32/bin/code.js
@@ -1,3 +1,3 @@
-delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
+delete process.env['ELECTRON_RUN_AS_NODE'];
 require('child_process').spawn(require('path').resolve(__dirname, '..', 'Code.exe'), process.argv.slice(2), { detached: true, stdio: 'ignore' });
 process.exit(0);
\ No newline at end of file
diff --git a/scripts/test.bat b/scripts/test.bat
index 25318c2248ea0115b1948b68ad2a9e4b8125523a..76f56d53cae0794e0457580954494b484f948946 100644
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -1,6 +1,6 @@
 @echo off
 
-set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
+set ELECTRON_RUN_AS_NODE=1
 
 pushd %~dp0\..
 .\.build\electron\electron.exe .\node_modules\mocha\bin\_mocha %*
diff --git a/scripts/test.sh b/scripts/test.sh
index bbad6e94060ef840aded50edf0b87658a797ac7e..a9778d98cb8efde6c67a681dbcb66ab7230235c3 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -10,11 +10,11 @@ fi
 
 # Unit Tests
 if [[ "$OSTYPE" == "darwin"* ]]; then
-	cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+	cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
 		./.build/electron/Electron.app/Contents/MacOS/Electron \
 		node_modules/mocha/bin/_mocha $*
 else
-	cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+	cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
 		./.build/electron/electron \
 		node_modules/mocha/bin/_mocha $*
 fi
diff --git a/src/vs/base/node/stdFork.ts b/src/vs/base/node/stdFork.ts
index cb5a510491a652ac7e4283edfd9e51eac7ab2663..01f96d3849659577250858a7ba45ebda60783ddd 100644
--- a/src/vs/base/node/stdFork.ts
+++ b/src/vs/base/node/stdFork.ts
@@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
 
 	newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
 	newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
-	newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
+	newEnv['ELECTRON_RUN_AS_NODE'] = '1';
 
 	return newEnv;
 }
diff --git a/src/vs/base/node/stdForkStart.js b/src/vs/base/node/stdForkStart.js
index bb58479fcd86da95ba73847090a7b0d700657579..0d7bc82f81c4d1e36f8cf13b53022bbbdf39cf8e 100644
--- a/src/vs/base/node/stdForkStart.js
+++ b/src/vs/base/node/stdForkStart.js
@@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
 
 log('STDIN_PIPE_NAME: ' + stdInPipeName);
 log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
-log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']);
+log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
 
 // stdout redirection to named pipe
 (function() {
@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
 		// Unset the custom environmental variables that should not get inherited
 		delete process.env['STDIN_PIPE_NAME'];
 		delete process.env['STDOUT_PIPE_NAME'];
-		delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
+		delete process.env['ELECTRON_RUN_AS_NODE'];
 
 		require(program);
 
diff --git a/src/vs/workbench/electron-main/cli.ts b/src/vs/workbench/electron-main/cli.ts
index fe380a5cad972d631de8d2f1a03e1b53e5b33a92..e066aae50aff363c6347397d7cb6751b29a381e8 100644
--- a/src/vs/workbench/electron-main/cli.ts
+++ b/src/vs/workbench/electron-main/cli.ts
@@ -45,7 +45,7 @@ export function main(argv: string[]) {
 	} else if (argParser.hasFlag('version', 'v')) {
 		console.log(packageJson.version);
 	} else {
-		delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
+		delete process.env['ELECTRON_RUN_AS_NODE'];
 		spawn(process.env['VSCODE_PATH'], process.argv.slice(2), { detached: true, stdio: 'ignore' });
 	}
 
diff --git a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts
index b93eaa7385bae63ad763c6caa5038747bb80538d..a57fb13acfc82c3cb3659c75caa87b589a24a8a5 100644
--- a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts
+++ b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts
@@ -117,7 +117,7 @@ export function createNativeRawGitService(workspaceRoot: string, gitPath: string
 				timeout: 1000 * 60,
 				args: [gitPath, workspaceRoot, defaultEncoding, remote.process.execPath],
 				env: {
-					ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
+					ELECTRON_RUN_AS_NODE: 1,
 					AMD_ENTRYPOINT: 'vs/workbench/parts/git/electron-browser/gitApp'
 				}
 			}