diff --git a/src/vs/base/common/flags.ts b/src/vs/base/common/flags.ts
index 609b60c585e..16d77055ff3 100644
--- a/src/vs/base/common/flags.ts
+++ b/src/vs/base/common/flags.ts
@@ -14,8 +14,8 @@ export const standaloneEditorTelemetryEndpoint: string = environment('telemetryE
 export const getCrossOriginWorkerScriptUrl: (workerId: string, label: string) => string = environment('getWorkerUrl', null);
 
 function environment(name: string, fallback: any = false): any {
-	if (globals.MonacoEnvironment && globals.MonacoEnvironment.hasOwnProperty(name)) {
-		return globals.MonacoEnvironment[name];
+	if (globals.GlobalEnvironment && globals.GlobalEnvironment.hasOwnProperty(name)) {
+		return globals.GlobalEnvironment[name];
 	}
 
 	return fallback;
diff --git a/src/vs/base/common/worker/workerClient.ts b/src/vs/base/common/worker/workerClient.ts
index 27c6c3e7077..450c95c452e 100644
--- a/src/vs/base/common/worker/workerClient.ts
+++ b/src/vs/base/common/worker/workerClient.ts
@@ -72,13 +72,13 @@ export class WorkerClient {
 			loaderConfiguration = (<any>window).requirejs.s.contexts._.config;
 		}
 
-		let MonacoEnvironment = (<any>window).MonacoEnvironment || null;
+		let GlobalEnvironment = (<any>window).GlobalEnvironment || null;
 
 		this.onModuleLoaded = this._sendMessage(workerProtocol.MessageType.INITIALIZE, {
 			id: this._worker.getId(),
 			moduleId: moduleId,
 			loaderConfiguration: loaderConfiguration,
-			MonacoEnvironment: MonacoEnvironment
+			GlobalEnvironment: GlobalEnvironment
 		});
 		this.onModuleLoaded.then(null, (e) => this._onError('Worker failed to load ' + moduleId, e));
 
diff --git a/src/vs/base/common/worker/workerServer.ts b/src/vs/base/common/worker/workerServer.ts
index 3e83acec4d7..749a7494fdf 100644
--- a/src/vs/base/common/worker/workerServer.ts
+++ b/src/vs/base/common/worker/workerServer.ts
@@ -184,9 +184,9 @@ export class WorkerServer {
 					(<any>self).require.config(loaderConfig);
 				}
 
-				var MonacoEnvironment = msg.payload.MonacoEnvironment;
-				if (MonacoEnvironment) {
-					(<any>self).MonacoEnvironment = MonacoEnvironment;
+				var GlobalEnvironment = msg.payload.GlobalEnvironment;
+				if (GlobalEnvironment) {
+					(<any>self).GlobalEnvironment = GlobalEnvironment;
 				}
 
 				this.loadModule(msg.payload.moduleId, (handlerModule:any) => {
diff --git a/src/vs/base/worker/workerMain.ts b/src/vs/base/worker/workerMain.ts
index 1af314dece9..933b8781534 100644
--- a/src/vs/base/worker/workerMain.ts
+++ b/src/vs/base/worker/workerMain.ts
@@ -6,8 +6,8 @@
 (function () {
 	'use strict';
 
-	var MonacoEnvironment = (<any>self).MonacoEnvironment;
-	var monacoBaseUrl = MonacoEnvironment && MonacoEnvironment.baseUrl ? MonacoEnvironment.baseUrl : '../../../';
+	var GlobalEnvironment = (<any>self).GlobalEnvironment;
+	var monacoBaseUrl = GlobalEnvironment && GlobalEnvironment.baseUrl ? GlobalEnvironment.baseUrl : '../../../';
 
 	importScripts(monacoBaseUrl + 'vs/loader.js');
 
diff --git a/src/vs/workbench/electron-browser/index.html b/src/vs/workbench/electron-browser/index.html
index 797fcdf3599..0863286ed10 100644
--- a/src/vs/workbench/electron-browser/index.html
+++ b/src/vs/workbench/electron-browser/index.html
@@ -172,8 +172,8 @@
 					});
 				}
 
-				window.MonacoEnvironment = {};
-				var timers = window.MonacoEnvironment.timers = {
+				window.GlobalEnvironment = {};
+				var timers = window.GlobalEnvironment.timers = {
 					start: new Date()
 				};
 
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index c72a070c29b..911df6477e5 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -28,7 +28,7 @@ import fs = require('fs');
 import gracefulFs = require('graceful-fs');
 gracefulFs.gracefulify(fs);
 
-const timers = (<any>window).MonacoEnvironment.timers;
+const timers = (<any>window).GlobalEnvironment.timers;
 const domContentLoaded: Function = (<any>winjs).Utilities.ready;
 
 export interface IPath {
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 4d3bee1af4e..6cc6f55a27e 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -348,7 +348,7 @@ export class WorkbenchShell {
 	}
 
 	private writeTimers(): void {
-		let timers = (<any>window).MonacoEnvironment.timers;
+		let timers = (<any>window).GlobalEnvironment.timers;
 		if (timers) {
 			let events: timer.IExistingTimerEvent[] = [];