diff --git a/appveyor.yml b/appveyor.yml
index 5978e14c13d1f04f414add6cfa7b1a60d538ef98..459e550af38399a907dbb9e76902023811098491 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  ELECTRON_RUN_AS_NODE: 1
+  ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
 
 install:
   - ps: Install-Product node 5.10.1 x64
diff --git a/extensions/typescript/src/utils/electron.ts b/extensions/typescript/src/utils/electron.ts
index c0bda301689c868018250456714b2944875b1d91..a4e08453f9fc1360e077d95478a3ef3e1f9f5089 100644
--- a/extensions/typescript/src/utils/electron.ts
+++ b/extensions/typescript/src/utils/electron.ts
@@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
 	newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
 	newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
 	newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
-	newEnv['ELECTRON_RUN_AS_NODE'] = '1';
+	newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
 
 	return newEnv;
 }
diff --git a/extensions/typescript/src/utils/electronForkStart.ts b/extensions/typescript/src/utils/electronForkStart.ts
index 83f757240023b86c15f59ceef15956153943208b..46a125060415e04ee6d861629201b9f2635d1f4b 100644
--- a/extensions/typescript/src/utils/electronForkStart.ts
+++ b/extensions/typescript/src/utils/electronForkStart.ts
@@ -31,7 +31,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
 log('STDIN_PIPE_NAME: ' + stdInPipeName);
 log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
 log('STDERR_PIPE_NAME: ' + stdErrPipeName);
-log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
+log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']);
 
 // stdout redirection to named pipe
 (function() {
@@ -147,7 +147,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
 		delete process.env['STDIN_PIPE_NAME'];
 		delete process.env['STDOUT_PIPE_NAME'];
 		delete process.env['STDERR_PIPE_NAME'];
-		delete process.env['ELECTRON_RUN_AS_NODE'];
+		delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
 
 		require(program);
 
diff --git a/resources/darwin/bin/code.sh b/resources/darwin/bin/code.sh
index 9dba3f8e37807aa5d033996f8766288caae16c7b..ac4988100008c9f5f6ece72347cbf01b7e22f960 100755
--- a/resources/darwin/bin/code.sh
+++ b/resources/darwin/bin/code.sh
@@ -7,5 +7,5 @@ function realpath() { /usr/bin/python -c "import os,sys; print os.path.realpath(
 CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
 ELECTRON="$CONTENTS/MacOS/Electron"
 CLI="$CONTENTS/Resources/app/out/cli.js"
-ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
 exit $?
\ No newline at end of file
diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
index f0877aa4c9fa0741dd73efd391045aad16c5c63f..77fa49722f70c7b8370cbaf03a7f88f6828007f9 100755
--- a/resources/linux/bin/code.sh
+++ b/resources/linux/bin/code.sh
@@ -33,5 +33,5 @@ fi
 
 ELECTRON="$VSCODE_PATH/@@NAME@@"
 CLI="$VSCODE_PATH/resources/app/out/cli.js"
-ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
 exit $?
\ No newline at end of file
diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd
index 54f206831a9e07715801aa13098cf40a440ab878..a975610eb3195c00386b32674da41bd2362afe40 100644
--- a/resources/win32/bin/code.cmd
+++ b/resources/win32/bin/code.cmd
@@ -1,6 +1,6 @@
 @echo off
 setlocal
 set VSCODE_DEV=
-set ELECTRON_RUN_AS_NODE=1
+set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
 call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\\app\\out\\cli.js" %*
 endlocal
\ No newline at end of file
diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh
index a9bab00a6d2d91446f929a6607a5f25a558b948e..fd9f4bd0ffce2c7d8c6eb2b7ccc11d0979f79ae6 100644
--- a/resources/win32/bin/code.sh
+++ b/resources/win32/bin/code.sh
@@ -7,5 +7,5 @@ NAME="@@NAME@@"
 VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
 ELECTRON="$VSCODE_PATH/$NAME.exe"
 CLI="$VSCODE_PATH/resources/app/out/cli.js"
-ELECTRON_NO_ATTACH_CONSOLE=1 ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ELECTRON_NO_ATTACH_CONSOLE=1 ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
 exit $?
diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh
index eb1ed814f5a0a01b892cd8e6c24493c88b13a8ee..2719ec4d4b7ba639d9dcaf820be307aee0cc2629 100755
--- a/scripts/code-cli.sh
+++ b/scripts/code-cli.sh
@@ -26,7 +26,7 @@ function code() {
 
 	CLI="$ROOT/out/cli.js"
 
-	ELECTRON_RUN_AS_NODE=1 \
+	ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
 	NODE_ENV=development \
 	VSCODE_DEV=1 \
 	ELECTRON_ENABLE_LOGGING=1 \
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index fddb23d1dffb246fa0ec6662ebec17d78602decc..87dec89d1a1e593fb2f14c789ac88f84941ccabf 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -4,7 +4,7 @@ setlocal
 rem APPVEYOR Builds
 if not "%APPVEYOR%" == "" (
 	set ELECTRON_NO_ATTACH_CONSOLE=1
-	set ELECTRON_RUN_AS_NODE=
+	set ATOM_SHELL_INTERNAL_RUN_AS_NODE=
 )
 
 :: Integration Tests
diff --git a/scripts/test.bat b/scripts/test.bat
index 15a4aaea84a367731539b6253a93eacea602c2a4..d62f7aba5eb80c4621de8e852559adfabcf13d5c 100644
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -1,7 +1,7 @@
 @echo off
 setlocal
 
-set ELECTRON_RUN_AS_NODE=1
+set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
 
 rem TFS Builds
 if not "%BUILD_BUILDID%" == "" (
diff --git a/scripts/test.sh b/scripts/test.sh
index 9910abbeb57617333191ca4e3fb3e7ed34c9dbe2..6df7101b848a8bde80f1d3939552cb63d1e82850 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -21,11 +21,11 @@ test -d out || ./node_modules/.bin/gulp compile
 
 # Unit Tests
 if [[ "$OSTYPE" == "darwin"* ]]; then
-	cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
+	cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
 		./.build/electron/Electron.app/Contents/MacOS/Electron \
 		node_modules/mocha/bin/_mocha $*
 else
-	cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
+	cd $ROOT ; ATOM_SHELL_INTERNAL_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 4bb749129ff6c68dbdc0212168b0c94818da44b5..4751a8fa83b957e676cf7d690f45a5c1d4899c42 100644
--- a/src/vs/base/node/stdFork.ts
+++ b/src/vs/base/node/stdFork.ts
@@ -49,7 +49,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
 	newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
 	newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
 	newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
-	newEnv['ELECTRON_RUN_AS_NODE'] = '1';
+	newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
 
 	return newEnv;
 }
diff --git a/src/vs/base/node/stdForkStart.js b/src/vs/base/node/stdForkStart.js
index 92024acf6b851e761ad1dc4704e87b172086b495..0b1e7382fe5bd668f76eb41bac13bc38e984f699 100644
--- a/src/vs/base/node/stdForkStart.js
+++ b/src/vs/base/node/stdForkStart.js
@@ -33,7 +33,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
 log('STDIN_PIPE_NAME: ' + stdInPipeName);
 log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
 log('STDERR_PIPE_NAME: ' + stdErrPipeName);
-log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
+log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']);
 
 // stdout redirection to named pipe
 (function() {
@@ -149,7 +149,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
 		delete process.env['STDIN_PIPE_NAME'];
 		delete process.env['STDOUT_PIPE_NAME'];
 		delete process.env['STDERR_PIPE_NAME'];
-		delete process.env['ELECTRON_RUN_AS_NODE'];
+		delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
 
 		require(program);
 
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 25041c383e59b1fc91febf87bcef6a4906283ad3..9f4fcab157c796a28b3cfd9ad6a75976916ec971 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -285,11 +285,11 @@ interface IEnv {
 
 function getUnixUserEnvironment(): TPromise<IEnv> {
 	const promise = new TPromise((c, e) => {
-		const runAsNode = process.env['ELECTRON_RUN_AS_NODE'];
+		const runAsNode = process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
 		const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE'];
 
 		const env = assign({}, process.env, {
-			ELECTRON_RUN_AS_NODE: '1',
+			ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1',
 			ELECTRON_NO_ATTACH_CONSOLE: '1'
 		});
 
@@ -321,9 +321,9 @@ function getUnixUserEnvironment(): TPromise<IEnv> {
 				const env = JSON.parse(raw);
 
 				if (runAsNode) {
-					env['ELECTRON_RUN_AS_NODE'] = runAsNode;
+					env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = runAsNode;
 				} else {
-					delete env['ELECTRON_RUN_AS_NODE'];
+					delete env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
 				}
 
 				if (noAttach) {
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index ee5beb41a03e0738fd575b11c4969685eae02cb2..6dcfb032797ebd8f9d1dcfac80fb92957fdfd8ab 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -33,7 +33,7 @@ export function main(args: string[]): TPromise<void> {
 			'VSCODE_CLI': '1',
 			'ELECTRON_NO_ATTACH_CONSOLE': '1'
 		});
-		delete env['ELECTRON_RUN_AS_NODE'];
+		delete env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
 
 		let options = {
 			detached: true,
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 95804eaf5f8ffe73d518422ca51f02dc71f3bdda..de1537c1f1acfe2d6f5685a7b2daf66056fc7c80 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -593,7 +593,7 @@ export class DebugService implements debug.IDebugService {
 						timeout: 1000 * 60 * 5,
 						args: [`${ publisher }.${ type }`, JSON.stringify(data), aiKey],
 						env: {
-							ELECTRON_RUN_AS_NODE: 1,
+							ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
 							PIPE_LOGGING: 'true',
 							AMD_ENTRYPOINT: 'vs/workbench/parts/debug/node/telemetryApp'
 						}
diff --git a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts
index 2e2d28d17b2908352baf947402dcdc2d1562670d..18c83311cb92433258240bae6911ad4481defc0a 100644
--- a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts
+++ b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts
@@ -157,7 +157,7 @@ function createRemoteRawGitService(gitPath: string, workspaceRoot: string, encod
 					timeout: 1000 * 60,
 					args: [path, workspaceRoot, encoding, remote.process.execPath, version],
 					env: {
-						ELECTRON_RUN_AS_NODE: 1,
+						ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
 						PIPE_LOGGING: 'true',
 						AMD_ENTRYPOINT: 'vs/workbench/parts/git/node/gitApp',
 						VERBOSE_LOGGING: String(verbose)
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js b/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js
index 138b671def31e0c911fd301ec79aafeebdae2e9c..21c47a2687898fb9b5efc5648f65027fe337413a 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js
@@ -63,7 +63,7 @@ function getArgs() {
 
 function cleanEnv() {
 	var keys = [
-		'ELECTRON_RUN_AS_NODE',
+		'ATOM_SHELL_INTERNAL_RUN_AS_NODE',
 		'PTYCWD',
 		'PTYPID',
 		'PTYSHELL'