diff --git a/scripts/bundle.js b/scripts/bundle.js
index 443da8bb..ce2e35b4 100644
--- a/scripts/bundle.js
+++ b/scripts/bundle.js
@@ -22,8 +22,8 @@ const BUNDLED_FILE_HEADER = [
 
 bundleOne('monaco.contribution');
 bundleOne('lib/typescriptServices');
-bundleOne('mode', ['vs/language/typescript/lib/typescriptServices']);
-bundleOne('worker', ['vs/language/typescript/lib/typescriptServices']);
+bundleOne('tsMode', ['vs/language/typescript/lib/typescriptServices']);
+bundleOne('tsWorker', ['vs/language/typescript/lib/typescriptServices']);
 
 function bundleOne(moduleId, exclude) {
 	requirejs.optimize({
diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index 7b534b81..df0a7668 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -6,7 +6,7 @@
 
 import { LanguageServiceDefaultsImpl } from './monaco.contribution';
 import * as ts from './lib/typescriptServices';
-import { TypeScriptWorker } from './worker';
+import { TypeScriptWorker } from './tsWorker';
 
 import Uri = monaco.Uri;
 import Position = monaco.Position;
diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts
index 25e45562..8a7c9f39 100644
--- a/src/monaco.contribution.ts
+++ b/src/monaco.contribution.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as mode from './mode';
+import * as mode from './tsMode';
 
 import Emitter = monaco.Emitter;
 import IEvent = monaco.IEvent;
@@ -184,7 +184,7 @@ monaco.languages.typescript = createAPI();
 // --- Registration to monaco editor ---
 
 function getMode(): monaco.Promise<typeof mode> {
-	return monaco.Promise.wrap(import('./mode'))
+	return monaco.Promise.wrap(import('./tsMode'))
 }
 
 monaco.languages.register({
diff --git a/src/mode.ts b/src/tsMode.ts
similarity index 96%
rename from src/mode.ts
rename to src/tsMode.ts
index ffcdbf24..b465f6b5 100644
--- a/src/mode.ts
+++ b/src/tsMode.ts
@@ -6,7 +6,7 @@
 
 import {Language, createTokenizationSupport} from './tokenization';
 import {WorkerManager} from './workerManager';
-import {TypeScriptWorker} from './worker';
+import {TypeScriptWorker} from './tsWorker';
 import {LanguageServiceDefaultsImpl} from './monaco.contribution';
 import * as languageFeatures from './languageFeatures';
 
diff --git a/src/worker.ts b/src/tsWorker.ts
similarity index 100%
rename from src/worker.ts
rename to src/tsWorker.ts
diff --git a/src/tsconfig.esm.json b/src/tsconfig.esm.json
index ad4ad051..bdcb3251 100644
--- a/src/tsconfig.esm.json
+++ b/src/tsconfig.esm.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "module": "es6",
+    "module": "esnext",
     "outDir": "../release/esm",
     "target": "es5",
     "lib": [
diff --git a/src/workerManager.ts b/src/workerManager.ts
index 4a564829..4a46b7f8 100644
--- a/src/workerManager.ts
+++ b/src/workerManager.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { LanguageServiceDefaultsImpl } from './monaco.contribution';
-import { TypeScriptWorker } from './worker';
+import { TypeScriptWorker } from './tsWorker';
 
 import Promise = monaco.Promise;
 import IDisposable = monaco.IDisposable;
@@ -63,7 +63,7 @@ export class WorkerManager {
 			this._worker = monaco.editor.createWebWorker<TypeScriptWorker>({
 
 				// module that exports the create() method and returns a `TypeScriptWorker` instance
-				moduleId: 'vs/language/typescript/worker',
+				moduleId: 'vs/language/typescript/tsWorker',
 
 				label: this._modeId,