9 files changed, 13 insertions, 12 deletions
diff --git a/test/es-module/test-esm-loader-modulemap.js b/test/es-module/test-esm-loader-modulemap.js
index bf02bfcf66..946d54ffaa 100644
--- a/test/es-module/test-esm-loader-modulemap.js
+++ b/test/es-module/test-esm-loader-modulemap.js
@@ -7,10 +7,11 @@
 const common = require('../common');
 
 const { URL } = require('url');
-const Loader = require('internal/modules/esm/Loader');
-const ModuleMap = require('internal/modules/esm/ModuleMap');
-const ModuleJob = require('internal/modules/esm/ModuleJob');
-const createDynamicModule = require('internal/modules/esm/CreateDynamicModule');
+const Loader = require('internal/modules/esm/loader');
+const ModuleMap = require('internal/modules/esm/module_map');
+const ModuleJob = require('internal/modules/esm/module_job');
+const createDynamicModule = require(
+  'internal/modules/esm/create_dynamic_module');
 
 const stubModuleUrl = new URL('file://tmp/test');
 const stubModule = createDynamicModule(['default'], stubModuleUrl);
diff --git a/test/es-module/test-esm-loader-search.js b/test/es-module/test-esm-loader-search.js
index 0f4591a4e3..0ca8990cb7 100644
--- a/test/es-module/test-esm-loader-search.js
+++ b/test/es-module/test-esm-loader-search.js
@@ -5,7 +5,7 @@
 
 const common = require('../common');
 
-const { search } = require('internal/modules/esm/DefaultResolve');
+const { search } = require('internal/modules/esm/default_resolve');
 
 common.expectsError(
   () => search('target', undefined),
diff --git a/test/message/esm_display_syntax_error.out b/test/message/esm_display_syntax_error.out
index 4564fe06d5..ed2e928eb1 100644
--- a/test/message/esm_display_syntax_error.out
+++ b/test/message/esm_display_syntax_error.out
@@ -3,4 +3,4 @@ file:///*/test/message/esm_display_syntax_error.mjs:3
 await async () => 0;
 ^^^^^
 SyntaxError: Unexpected reserved word
-    at translators.set (internal/modules/esm/Translators.js:*:*)
+    at translators.set (internal/modules/esm/translators.js:*:*)
diff --git a/test/message/esm_display_syntax_error_import.out b/test/message/esm_display_syntax_error_import.out
index 02050d361e..31ee2b6f4b 100644
--- a/test/message/esm_display_syntax_error_import.out
+++ b/test/message/esm_display_syntax_error_import.out
@@ -3,4 +3,4 @@ file:///*/test/message/esm_display_syntax_error_import.mjs:6
   notfound
   ^^^^^^^^
 SyntaxError: The requested module '../fixtures/es-module-loaders/module-named-exports' does not provide an export named 'notfound'
-    at ModuleJob._instantiate (internal/modules/esm/ModuleJob.js:*:*)
+    at ModuleJob._instantiate (internal/modules/esm/module_job.js:*:*)
diff --git a/test/message/esm_display_syntax_error_import_module.out b/test/message/esm_display_syntax_error_import_module.out
index ae0bf331de..b067a77942 100644
--- a/test/message/esm_display_syntax_error_import_module.out
+++ b/test/message/esm_display_syntax_error_import_module.out
@@ -3,4 +3,4 @@ file:///*/test/fixtures/es-module-loaders/syntax-error-import.mjs:1
 import { foo, notfound } from './module-named-exports';
               ^^^^^^^^
 SyntaxError: The requested module './module-named-exports' does not provide an export named 'notfound'
-    at ModuleJob._instantiate (internal/modules/esm/ModuleJob.js:*:*)
+    at ModuleJob._instantiate (internal/modules/esm/module_job.js:*:*)
diff --git a/test/message/esm_display_syntax_error_module.out b/test/message/esm_display_syntax_error_module.out
index fc0581c225..e636abad9e 100644
--- a/test/message/esm_display_syntax_error_module.out
+++ b/test/message/esm_display_syntax_error_module.out
@@ -3,4 +3,4 @@ file:///*/test/fixtures/es-module-loaders/syntax-error.mjs:2
 await async () => 0;
 ^^^^^
 SyntaxError: Unexpected reserved word
-    at translators.set (internal/modules/esm/Translators.js:*:*)
+    at translators.set (internal/modules/esm/translators.js:*:*)
diff --git a/test/parallel/test-internal-module-map-asserts.js b/test/parallel/test-internal-module-map-asserts.js
index 330f04cfd9..4563fc605e 100644
--- a/test/parallel/test-internal-module-map-asserts.js
+++ b/test/parallel/test-internal-module-map-asserts.js
@@ -3,7 +3,7 @@
 
 const common = require('../common');
 const assert = require('assert');
-const ModuleMap = require('internal/modules/esm/ModuleMap');
+const ModuleMap = require('internal/modules/esm/module_map');
 
 // ModuleMap.get, ModuleMap.has and ModuleMap.set should only accept string
 // values as url argument.
diff --git a/test/parallel/test-stream-buffer-list.js b/test/parallel/test-stream-buffer-list.js
index c151154afa..ef9b1fef6d 100644
--- a/test/parallel/test-stream-buffer-list.js
+++ b/test/parallel/test-stream-buffer-list.js
@@ -2,7 +2,7 @@
 'use strict';
 require('../common');
 const assert = require('assert');
-const BufferList = require('internal/streams/BufferList');
+const BufferList = require('internal/streams/buffer_list');
 const util = require('util');
 
 // Test empty buffer list.
diff --git a/test/parallel/test-stream2-readable-from-list.js b/test/parallel/test-stream2-readable-from-list.js
index 965f962638..f812f75e7c 100644
--- a/test/parallel/test-stream2-readable-from-list.js
+++ b/test/parallel/test-stream2-readable-from-list.js
@@ -24,7 +24,7 @@
 require('../common');
 const assert = require('assert');
 const fromList = require('_stream_readable')._fromList;
-const BufferList = require('internal/streams/BufferList');
+const BufferList = require('internal/streams/buffer_list');
 
 function bufferListFromArray(arr) {
   const bl = new BufferList();