diff --git a/src/vs/base/browser/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts
index c72296fd7001f..1aa7383511443 100644
--- a/src/vs/base/browser/defaultWorkerFactory.ts
+++ b/src/vs/base/browser/defaultWorkerFactory.ts
@@ -119,7 +119,7 @@ class WebWorker extends Disposable implements IWorker {
 	private readonly label: string;
 	private worker: Promise<Worker> | null;
 
-	constructor(esmWorkerLocation: URI | undefined, amdModuleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) {
+	constructor(esmWorkerLocation: URI | undefined, moduleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) {
 		super();
 		this.id = id;
 		this.label = label;
@@ -129,7 +129,7 @@ class WebWorker extends Disposable implements IWorker {
 		} else {
 			this.worker = Promise.resolve(workerOrPromise);
 		}
-		this.postMessage(amdModuleId, []);
+		this.postMessage(moduleId, []);
 		this.worker.then((w) => {
 			w.onmessage = function (ev) {
 				onMessageCallback(ev.data);
@@ -171,10 +171,10 @@ export class WorkerDescriptor implements IWorkerDescriptor {
 	public readonly esmModuleLocation: URI | undefined;
 
 	constructor(
-		public readonly amdModuleId: string,
+		public readonly moduleId: string,
 		readonly label: string | undefined,
 	) {
-		this.esmModuleLocation = FileAccess.asBrowserUri(`${amdModuleId}.esm.js` as AppResourcePath);
+		this.esmModuleLocation = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath);
 	}
 }
 
@@ -194,7 +194,7 @@ class DefaultWorkerFactory implements IWorkerFactory {
 			throw this._webWorkerFailedBeforeError;
 		}
 
-		return new WebWorker(desc.esmModuleLocation, desc.amdModuleId, workerId, desc.label || 'anonymous' + workerId, onMessageCallback, (err) => {
+		return new WebWorker(desc.esmModuleLocation, desc.moduleId, workerId, desc.label || 'anonymous' + workerId, onMessageCallback, (err) => {
 			logOnceWebWorkerWarning(err);
 			this._webWorkerFailedBeforeError = err;
 			onErrorCallback(err);
@@ -202,7 +202,7 @@ class DefaultWorkerFactory implements IWorkerFactory {
 	}
 }
 
-export function createWebWorker<T extends object>(amdModuleId: string, label: string | undefined): IWorkerClient<T>;
+export function createWebWorker<T extends object>(moduleId: string, label: string | undefined): IWorkerClient<T>;
 export function createWebWorker<T extends object>(workerDescriptor: IWorkerDescriptor): IWorkerClient<T>;
 export function createWebWorker<T extends object>(arg0: string | IWorkerDescriptor, arg1?: string | undefined): IWorkerClient<T> {
 	const workerDescriptor = (typeof arg0 === 'string' ? new WorkerDescriptor(arg0, arg1) : arg0);
diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts
index 6b55d53d1e169..70a328db53f22 100644
--- a/src/vs/base/common/worker/simpleWorker.ts
+++ b/src/vs/base/common/worker/simpleWorker.ts
@@ -29,7 +29,7 @@ export interface IWorkerFactory {
 }
 
 export interface IWorkerDescriptor {
-	readonly amdModuleId: string;
+	readonly moduleId: string;
 	readonly esmModuleLocation: URI | undefined;
 	readonly label: string | undefined;
 }
@@ -332,7 +332,7 @@ export class SimpleWorkerClient<W extends object> extends Disposable implements
 
 		this._worker = this._register(workerFactory.create(
 			{
-				amdModuleId: 'vs/base/common/worker/simpleWorker',
+				moduleId: 'vs/base/common/worker/simpleWorker',
 				esmModuleLocation: workerDescriptor.esmModuleLocation,
 				label: workerDescriptor.label
 			},
@@ -375,12 +375,12 @@ export class SimpleWorkerClient<W extends object> extends Disposable implements
 		this._onModuleLoaded = this._protocol.sendMessage(DEFAULT_CHANNEL, INITIALIZE, [
 			this._worker.getId(),
 			JSON.parse(JSON.stringify(loaderConfiguration)),
-			workerDescriptor.amdModuleId,
+			workerDescriptor.moduleId,
 		]);
 
 		this.proxy = this._protocol.createProxyToRemoteChannel(DEFAULT_CHANNEL, async () => { await this._onModuleLoaded; });
 		this._onModuleLoaded.catch((e) => {
-			this._onError('Worker failed to load ' + workerDescriptor.amdModuleId, e);
+			this._onError('Worker failed to load ' + workerDescriptor.moduleId, e);
 		});
 	}
 
diff --git a/src/vs/editor/standalone/browser/standaloneWebWorker.ts b/src/vs/editor/standalone/browser/standaloneWebWorker.ts
index 22d073a4850aa..5f1d0947c9409 100644
--- a/src/vs/editor/standalone/browser/standaloneWebWorker.ts
+++ b/src/vs/editor/standalone/browser/standaloneWebWorker.ts
@@ -71,7 +71,7 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 
 	constructor(modelService: IModelService, opts: IWebWorkerOptions) {
 		const workerDescriptor: IWorkerDescriptor = {
-			amdModuleId: standaloneEditorWorkerDescriptor.amdModuleId,
+			moduleId: standaloneEditorWorkerDescriptor.moduleId,
 			esmModuleLocation: standaloneEditorWorkerDescriptor.esmModuleLocation,
 			label: opts.label,
 		};