src: put bootstrappers in lib/internal/bootstrap/

Create `lib/internal/bootstrap/` and put bootstrappers there:

Before:

```
lib/internal
├── ...
├── bootstrap_loaders.js
└── bootstrap_node.js
```

After:

```
lib/internal
├── ...
└── bootstrap
    ├── loaders.js
    └── node.js
```

PR-URL: https://github.com/nodejs/node/pull/19177
Refs: https://github.com/nodejs/node/pull/19112
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>

32 files changed, 84 insertions, 81 deletions

diff --git a/lib/assert.js b/lib/assert.js
index b0d0d9ab4c..797252afc0 100644
--- a/lib/assert.js
+++ b/lib/assert.js
@@ -36,7 +36,7 @@ const { openSync, closeSync, readSync } = require('fs');
 const { parseExpressionAt } = require('internal/deps/acorn/dist/acorn');
 const { inspect } = require('util');
 const { EOL } = require('os');
-const { NativeModule } = require('internal/bootstrap_loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 
 // Escape control characters but not \n and \t to keep the line breaks and
 // indentation intact.
diff --git a/lib/buffer.js b/lib/buffer.js
index 7703d2a129..b369d27a1e 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -41,7 +41,7 @@ const {
 // that test/parallel/test-buffer-bindingobj-no-zerofill.js is written.
 let isAnyArrayBuffer;
 try {
-  const { internalBinding } = require('internal/bootstrap_loaders');
+  const { internalBinding } = require('internal/bootstrap/loaders');
   isAnyArrayBuffer = internalBinding('types').isAnyArrayBuffer;
 } catch (e) {
   isAnyArrayBuffer = require('util').types.isAnyArrayBuffer;
diff --git a/lib/domain.js b/lib/domain.js
index e2cc38a1f9..170f291727 100644
--- a/lib/domain.js
+++ b/lib/domain.js
@@ -34,7 +34,7 @@ const {
   ERR_UNHANDLED_ERROR
 } = require('internal/errors').codes;
 const { createHook } = require('async_hooks');
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 
 // overwrite process.domain with a getter/setter that will allow for more
 // effective optimizations
diff --git a/lib/internal/bootstrap_loaders.js b/lib/internal/bootstrap/loaders.js
index e409438dfc..601c54a0cd 100644
--- a/lib/internal/bootstrap_loaders.js
+++ b/lib/internal/bootstrap/loaders.js
@@ -2,7 +2,7 @@
 // modules. In contrast, user land modules are loaded using
 // lib/module.js (CommonJS Modules) or lib/internal/loader/* (ES Modules).
 //
-// This file is compiled and run by node.cc before bootstrap_node.js
+// This file is compiled and run by node.cc before bootstrap/node.js
 // was called, therefore the loaders are bootstraped before we start to
 // actually bootstrap Node.js. It creates the following objects:
 //
@@ -29,7 +29,7 @@
 //   so they can be loaded faster without the cost of I/O. This class makes the
 //   lib/internal/*, deps/internal/* modules and internalBinding() available by
 //   default to core modules, and lets the core modules require itself via
-//   require('internal/bootstrap_loaders') even when this file is not written in
+//   require('internal/bootstrap/loaders') even when this file is not written in
 //   CommonJS style.
 //
 // Other objects:
@@ -111,7 +111,7 @@
   // Think of this as module.exports in this file even though it is not
   // written in CommonJS style.
   const loaderExports = { internalBinding, NativeModule };
-  const loaderId = 'internal/bootstrap_loaders';
+  const loaderId = 'internal/bootstrap/loaders';
   NativeModule.require = function(id) {
     if (id === loaderId) {
       return loaderExports;
@@ -224,6 +224,6 @@
   };
 
   // This will be passed to the bootstrapNodeJSCore function in
-  // bootstrap_node.js.
+  // bootstrap/node.js.
   return loaderExports;
 });
diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap/node.js
index 6cdbebc0c1..67ec63eb01 100644
--- a/lib/internal/bootstrap_node.js
+++ b/lib/internal/bootstrap/node.js
@@ -5,7 +5,7 @@
 // to the performance of the startup process, many dependencies are invoked
 // lazily.
 //
-// Before this file is run, lib/internal/bootstrap_loaders.js gets run first
+// Before this file is run, lib/internal/bootstrap/loaders.js gets run first
 // to bootstrap the internal binding and module loaders, including
 // process.binding(), process._linkedBinding(), internalBinding() and
 // NativeModule. And then { internalBinding, NativeModule } will be passed
diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
index 1846fc5527..9cd47f861f 100644
--- a/lib/internal/encoding.js
+++ b/lib/internal/encoding.js
@@ -23,7 +23,7 @@ const {
 
 const { isArrayBufferView } = require('internal/util/types');
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   isArrayBuffer
 } = internalBinding('types');
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 7137e527df..9315474364 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -4,7 +4,7 @@
 
 require('internal/util').assertCrypto();
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const { async_id_symbol } = require('internal/async_hooks').symbols;
 const { UV_EOF } = process.binding('uv');
 const http = require('http');
diff --git a/lib/internal/loader/CreateDynamicModule.js b/lib/internal/loader/CreateDynamicModule.js
index 8c28917138..7e9777af51 100644
--- a/lib/internal/loader/CreateDynamicModule.js
+++ b/lib/internal/loader/CreateDynamicModule.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const debug = require('util').debuglog('esm');
 const ArrayJoin = Function.call.bind(Array.prototype.join);
diff --git a/lib/internal/loader/DefaultResolve.js b/lib/internal/loader/DefaultResolve.js
index f99e0c98b9..a012314d2a 100644
--- a/lib/internal/loader/DefaultResolve.js
+++ b/lib/internal/loader/DefaultResolve.js
@@ -3,7 +3,7 @@
 const { URL } = require('url');
 const CJSmodule = require('module');
 const internalFS = require('internal/fs');
-const { NativeModule, internalBinding } = require('internal/bootstrap_loaders');
+const { NativeModule, internalBinding } = require('internal/bootstrap/loaders');
 const { extname } = require('path');
 const { realpathSync } = require('fs');
 const preserveSymlinks = !!process.binding('config').preserveSymlinks;
diff --git a/lib/internal/loader/ModuleJob.js b/lib/internal/loader/ModuleJob.js
index 162b0504d3..d948252829 100644
--- a/lib/internal/loader/ModuleJob.js
+++ b/lib/internal/loader/ModuleJob.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const { SafeSet, SafePromise } = require('internal/safe_globals');
 const { decorateErrorStack } = require('internal/util');
diff --git a/lib/internal/loader/Translators.js b/lib/internal/loader/Translators.js
index 74dd435827..8796b4ddfd 100644
--- a/lib/internal/loader/Translators.js
+++ b/lib/internal/loader/Translators.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { NativeModule, internalBinding } = require('internal/bootstrap_loaders');
+const { NativeModule, internalBinding } = require('internal/bootstrap/loaders');
 const { ModuleWrap } = internalBinding('module_wrap');
 const internalCJSModule = require('internal/module');
 const CJSModule = require('module');
diff --git a/lib/internal/process/modules.js b/lib/internal/process/modules.js
index 1592761f54..ca2a9dde5d 100644
--- a/lib/internal/process/modules.js
+++ b/lib/internal/process/modules.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   setImportModuleDynamicallyCallback,
   setInitializeImportMetaObjectCallback
diff --git a/lib/internal/test/binding.js b/lib/internal/test/binding.js
index aae89ce7a0..f9f018a782 100644
--- a/lib/internal/test/binding.js
+++ b/lib/internal/test/binding.js
@@ -8,7 +8,7 @@ process.emitWarning(
 // These exports should be scoped as specifically as possible
 // to avoid exposing APIs because even with that warning and
 // this file being internal people will still try to abuse it.
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 module.exports = {
   ModuleWrap: internalBinding('module_wrap').ModuleWrap,
 };
diff --git a/lib/internal/util/comparisons.js b/lib/internal/util/comparisons.js
index c1c4d7a712..119fb66611 100644
--- a/lib/internal/util/comparisons.js
+++ b/lib/internal/util/comparisons.js
@@ -2,7 +2,7 @@
 
 const { compare } = process.binding('buffer');
 const { isArrayBufferView } = require('internal/util/types');
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const { isDate, isMap, isRegExp, isSet } = internalBinding('types');
 
 function objectToString(o) {
diff --git a/lib/internal/vm/Module.js b/lib/internal/vm/Module.js
index 6d8f7f76d8..feb4bb190f 100644
--- a/lib/internal/vm/Module.js
+++ b/lib/internal/vm/Module.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const { emitExperimentalWarning } = require('internal/util');
 const { URL } = require('internal/url');
 const { kParsingContext, isContext } = process.binding('contextify');
diff --git a/lib/module.js b/lib/module.js
index 6d4e3dbfcf..0b94cb84c6 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const { NativeModule } = require('internal/bootstrap_loaders');
+const { NativeModule } = require('internal/bootstrap/loaders');
 const util = require('util');
 const { decorateErrorStack } = require('internal/util');
 const { getURLFromFilePath } = require('internal/url');
diff --git a/lib/string_decoder.js b/lib/string_decoder.js
index 4cb50ca97b..a6ae64c062 100644
--- a/lib/string_decoder.js
+++ b/lib/string_decoder.js
@@ -22,7 +22,7 @@
 'use strict';
 
 const { Buffer } = require('buffer');
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const {
   kIncompleteCharactersStart,
   kIncompleteCharactersEnd,
diff --git a/lib/util.js b/lib/util.js
index 95bf17519b..b64d103cb3 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -39,7 +39,7 @@ const {
   kRejected,
 } = process.binding('util');
 
-const { internalBinding } = require('internal/bootstrap_loaders');
+const { internalBinding } = require('internal/bootstrap/loaders');
 const types = internalBinding('types');
 Object.assign(types, require('internal/util/types'));
 const {
diff --git a/node.gyp b/node.gyp
index 1b047fe9ac..06f0a3b57c 100644
--- a/node.gyp
+++ b/node.gyp
@@ -24,8 +24,8 @@
     'node_lib_target_name%': 'node_lib',
     'node_intermediate_lib_type%': 'static_library',
     'library_files': [
-      'lib/internal/bootstrap_loaders.js',
-      'lib/internal/bootstrap_node.js',
+      'lib/internal/bootstrap/loaders.js',
+      'lib/internal/bootstrap/node.js',
       'lib/async_hooks.js',
       'lib/assert.js',
       'lib/buffer.js',
diff --git a/src/node.cc b/src/node.cc
index ede8314924..33065cd504 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -246,7 +246,7 @@ bool config_experimental_vm_modules = false;
 
 // Set in node.cc by ParseArgs when --loader is used.
 // Used in node_config.cc to set a constant on process.binding('config')
-// that is used by lib/internal/bootstrap_node.js
+// that is used by lib/internal/bootstrap/node.js
 std::string config_userland_loader;  // NOLINT(runtime/string)
 
 // Set by ParseArgs when --pending-deprecation or NODE_PENDING_DEPRECATION
@@ -259,7 +259,7 @@ std::string config_warning_file;  // NOLINT(runtime/string)
 // Set in node.cc by ParseArgs when --expose-internals or --expose_internals is
 // used.
 // Used in node_config.cc to set a constant on process.binding('config')
-// that is used by lib/internal/bootstrap_node.js
+// that is used by lib/internal/bootstrap/node.js
 bool config_expose_internals = false;
 
 bool v8_initialized = false;
@@ -3319,23 +3319,23 @@ static Local<Function> GetBootstrapper(Environment* env, Local<String> source,
   // are not safe to ignore.
   try_catch.SetVerbose(false);
 
-  // Execute the factory javascript file
-  Local<Value> factory_v = ExecuteString(env, source, script_name);
+  // Execute the bootstrapper javascript file
+  Local<Value> bootstrapper_v = ExecuteString(env, source, script_name);
   if (try_catch.HasCaught())  {
     ReportException(env, try_catch);
     exit(10);
   }
 
-  CHECK(factory_v->IsFunction());
-  Local<Function> factory = Local<Function>::Cast(factory_v);
+  CHECK(bootstrapper_v->IsFunction());
+  Local<Function> bootstrapper = Local<Function>::Cast(bootstrapper_v);
 
-  return scope.Escape(factory);
+  return scope.Escape(bootstrapper);
 }
 
-static bool ExecuteBootstrapper(Environment* env, Local<Function> factory,
+static bool ExecuteBootstrapper(Environment* env, Local<Function> bootstrapper,
                                 int argc, Local<Value> argv[],
                                 Local<Value>* out) {
-  bool ret = factory->Call(
+  bool ret = bootstrapper->Call(
       env->context(), Null(env->isolate()), argc, argv).ToLocal(out);
 
   // If there was an error during bootstrap then it was either handled by the
@@ -3362,16 +3362,18 @@ void LoadEnvironment(Environment* env) {
   // are not safe to ignore.
   try_catch.SetVerbose(false);
 
-  // The factory scripts are lib/internal/bootstrap_loaders.js and
-  // lib/internal/bootstrap_node.js, each included as a static C string
+  // The bootstrapper scripts are lib/internal/bootstrap/loaders.js and
+  // lib/internal/bootstrap/node.js, each included as a static C string
   // defined in node_javascript.h, generated in node_javascript.cc by
   // node_js2c.
+  Local<String> loaders_name =
+      FIXED_ONE_BYTE_STRING(env->isolate(), "internal/bootstrap/loaders.js");
   Local<Function> loaders_bootstrapper =
-      GetBootstrapper(env, LoadersBootstrapperSource(env),
-                 FIXED_ONE_BYTE_STRING(env->isolate(), "bootstrap_loaders.js"));
+      GetBootstrapper(env, LoadersBootstrapperSource(env), loaders_name);
+  Local<String> node_name =
+      FIXED_ONE_BYTE_STRING(env->isolate(), "internal/bootstrap/node.js");
   Local<Function> node_bootstrapper =
-      GetBootstrapper(env, NodeBootstrapperSource(env),
-                 FIXED_ONE_BYTE_STRING(env->isolate(), "bootstrap_node.js"));
+      GetBootstrapper(env, NodeBootstrapperSource(env), node_name);
 
   // Add a reference to the global object
   Local<Object> global = env->context()->Global();
@@ -4285,7 +4287,7 @@ void Init(int* argc,
 #endif
 
   // Needed for access to V8 intrinsics.  Disabled again during bootstrapping,
-  // see lib/internal/bootstrap_node.js.
+  // see lib/internal/bootstrap/node.js.
   const char allow_natives_syntax[] = "--allow_natives_syntax";
   V8::SetFlagsFromString(allow_natives_syntax,
                          sizeof(allow_natives_syntax) - 1);
diff --git a/src/node_internals.h b/src/node_internals.h
index 79c2ce5532..909d5e1790 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -183,13 +183,13 @@ extern bool config_experimental_vm_modules;
 
 // Set in node.cc by ParseArgs when --loader is used.
 // Used in node_config.cc to set a constant on process.binding('config')
-// that is used by lib/internal/bootstrap_node.js
+// that is used by lib/internal/bootstrap/node.js
 extern std::string config_userland_loader;
 
 // Set in node.cc by ParseArgs when --expose-internals or --expose_internals is
 // used.
 // Used in node_config.cc to set a constant on process.binding('config')
-// that is used by lib/internal/bootstrap_node.js
+// that is used by lib/internal/bootstrap/node.js
 extern bool config_expose_internals;
 
 // Set in node.cc by ParseArgs when --redirect-warnings= is used.
diff --git a/src/node_url.cc b/src/node_url.cc
index cac2831af6..6b56628d75 100644
--- a/src/node_url.cc
+++ b/src/node_url.cc
@@ -2275,7 +2275,7 @@ const Local<Value> URL::ToObject(Environment* env) const {
     // The SetURLConstructor method must have been called already to
     // set the constructor function used below. SetURLConstructor is
     // called automatically when the internal/url.js module is loaded
-    // during the internal/bootstrap_node.js processing.
+    // during the internal/bootstrap/node.js processing.
     ret = env->url_constructor_function()
         ->Call(env->context(), undef, arraysize(argv), argv);
   }
diff --git a/test/message/core_line_numbers.out b/test/message/core_line_numbers.out
index 1049fdc3e9..5658a5a59e 100644
--- a/test/message/core_line_numbers.out
+++ b/test/message/core_line_numbers.out
@@ -12,4 +12,4 @@ RangeError: Invalid input
     at tryModuleLoad (module.js:*:*)
     at Function.Module._load (module.js:*:*)
     at Function.Module.runMain (module.js:*:*)
-    at startup (bootstrap_node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
diff --git a/test/message/error_exit.out b/test/message/error_exit.out
index eab43959b6..2cbc4ad4fd 100644
--- a/test/message/error_exit.out
+++ b/test/message/error_exit.out
@@ -11,5 +11,5 @@ AssertionError [ERR_ASSERTION]: 1 strictEqual 2
     at tryModuleLoad (module.js:*:*)
     at Function.Module._load (module.js:*:*)
     at Function.Module.runMain (module.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
diff --git a/test/message/eval_messages.out b/test/message/eval_messages.out
index 7dbf9e950c..84772ffa48 100644
--- a/test/message/eval_messages.out
+++ b/test/message/eval_messages.out
@@ -8,9 +8,9 @@ SyntaxError: Strict mode code may not include a with statement
     at Object.runInThisContext (vm.js:*:*)
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at evalScript (bootstrap_node.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at evalScript (internal/bootstrap/node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
 42
 42
 [eval]:1
@@ -23,9 +23,9 @@ Error: hello
     at Object.runInThisContext (vm.js:*:*)
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at evalScript (bootstrap_node.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at evalScript (internal/bootstrap/node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
 
 [eval]:1
 throw new Error("hello")
@@ -37,9 +37,9 @@ Error: hello
     at Object.runInThisContext (vm.js:*:*)
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at evalScript (bootstrap_node.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at evalScript (internal/bootstrap/node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
 100
 [eval]:1
 var x = 100; y = x;
@@ -51,9 +51,9 @@ ReferenceError: y is not defined
     at Object.runInThisContext (vm.js:*:*)
     at Object.<anonymous> ([eval]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at evalScript (bootstrap_node.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at evalScript (internal/bootstrap/node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
 
 [eval]:1
 var ______________________________________________; throw 10
diff --git a/test/message/events_unhandled_error_common_trace.out b/test/message/events_unhandled_error_common_trace.out
index 1535573470..003446edaa 100644
--- a/test/message/events_unhandled_error_common_trace.out
+++ b/test/message/events_unhandled_error_common_trace.out
@@ -12,11 +12,11 @@ Error: foo:bar
     at tryModuleLoad (module.js:*:*)
     at Function.Module._load (module.js:*:*)
     at Function.Module.runMain (module.js:*:*)
-    at startup (bootstrap_node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
 Emitted 'error' event at:
     at quux (*events_unhandled_error_common_trace.js:*:*)
     at Object.<anonymous> (*events_unhandled_error_common_trace.js:*:*)
     at Module._compile (module.js:*:*)
     [... lines matching original stack trace ...]
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
diff --git a/test/message/events_unhandled_error_nexttick.out b/test/message/events_unhandled_error_nexttick.out
index c578f55f90..5912f9fd38 100644
--- a/test/message/events_unhandled_error_nexttick.out
+++ b/test/message/events_unhandled_error_nexttick.out
@@ -10,11 +10,11 @@ Error
     at tryModuleLoad (module.js:*:*)
     at Function.Module._load (module.js:*:*)
     at Function.Module.runMain (module.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
 Emitted 'error' event at:
     at process.nextTick (*events_unhandled_error_nexttick.js:*:*)
     at process._tickCallback (internal/process/next_tick.js:*:*)
     at Function.Module.runMain (module.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
diff --git a/test/message/events_unhandled_error_sameline.out b/test/message/events_unhandled_error_sameline.out
index d8441c44d4..dcbb45afbd 100644
--- a/test/message/events_unhandled_error_sameline.out
+++ b/test/message/events_unhandled_error_sameline.out
@@ -10,10 +10,10 @@ Error
     at tryModuleLoad (module.js:*:*)
     at Function.Module._load (module.js:*:*)
     at Function.Module.runMain (module.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
 Emitted 'error' event at:
     at Object.<anonymous> (*events_unhandled_error_sameline.js:*:*)
     at Module._compile (module.js:*:*)
     [... lines matching original stack trace ...]
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
diff --git a/test/message/nexttick_throw.out b/test/message/nexttick_throw.out
index 41412b95f6..798b208d7d 100644
--- a/test/message/nexttick_throw.out
+++ b/test/message/nexttick_throw.out
@@ -6,5 +6,5 @@ ReferenceError: undefined_reference_error_maker is not defined
     at *test*message*nexttick_throw.js:*:*
     at process._tickCallback (internal/process/next_tick.js:*:*)
     at Function.Module.runMain (module.js:*:*)
-    at startup (bootstrap_node.js:*:*)
-    at bootstrapNodeJSCore (bootstrap_node.js:*:*)
+    at startup (internal/bootstrap/node.js:*:*)
+    at bootstrapNodeJSCore (internal/bootstrap/node.js:*:*)
diff --git a/test/message/stdin_messages.out b/test/message/stdin_messages.out
index d2192050dd..c6c37a5be4 100644
--- a/test/message/stdin_messages.out
+++ b/test/message/stdin_messages.out
@@ -8,8 +8,8 @@ SyntaxError: Strict mode code may not include a with statement
     at Object.runInThisContext (vm.js:*)
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at evalScript (bootstrap_node.js:*:*)
-    at Socket.<anonymous> (bootstrap_node.js:*:*)
+    at evalScript (internal/bootstrap/node.js:*:*)
+    at Socket.<anonymous> (internal/bootstrap/node.js:*:*)
     at Socket.emit (events.js:*:*)
     at endReadableNT (_stream_readable.js:*:*)
     at process._tickCallback (internal/process/next_tick.js:*:*)
@@ -25,8 +25,8 @@ Error: hello
     at Object.runInThisContext (vm.js:*)
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at evalScript (bootstrap_node.js:*:*)
-    at Socket.<anonymous> (bootstrap_node.js:*:*)
+    at evalScript (internal/bootstrap/node.js:*:*)
+    at Socket.<anonymous> (internal/bootstrap/node.js:*:*)
     at Socket.emit (events.js:*:*)
     at endReadableNT (_stream_readable.js:*:*)
     at process._tickCallback (internal/process/next_tick.js:*:*)
@@ -40,8 +40,8 @@ Error: hello
     at Object.runInThisContext (vm.js:*)
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at evalScript (bootstrap_node.js:*:*)
-    at Socket.<anonymous> (bootstrap_node.js:*:*)
+    at evalScript (internal/bootstrap/node.js:*:*)
+    at Socket.<anonymous> (internal/bootstrap/node.js:*:*)
     at Socket.emit (events.js:*:*)
     at endReadableNT (_stream_readable.js:*:*)
     at process._tickCallback (internal/process/next_tick.js:*:*)
@@ -56,8 +56,8 @@ ReferenceError: y is not defined
     at Object.runInThisContext (vm.js:*)
     at Object.<anonymous> ([stdin]-wrapper:*:*)
     at Module._compile (module.js:*:*)
-    at evalScript (bootstrap_node.js:*:*)
-    at Socket.<anonymous> (bootstrap_node.js:*:*)
+    at evalScript (internal/bootstrap/node.js:*:*)
+    at Socket.<anonymous> (internal/bootstrap/node.js:*:*)
     at Socket.emit (events.js:*:*)
     at endReadableNT (_stream_readable.js:*:*)
     at process._tickCallback (internal/process/next_tick.js:*:*)
diff --git a/test/parallel/test-loaders-hidden-from-users.js b/test/parallel/test-loaders-hidden-from-users.js
index b3e6622c8c..0d752f5718 100644
--- a/test/parallel/test-loaders-hidden-from-users.js
+++ b/test/parallel/test-loaders-hidden-from-users.js
@@ -6,16 +6,16 @@ const common = require('../common');
 
 common.expectsError(
   () => {
-    require('internal/bootstrap_loaders');
+    require('internal/bootstrap/loaders');
   }, {
     code: 'MODULE_NOT_FOUND',
-    message: 'Cannot find module \'internal/bootstrap_loaders\''
+    message: 'Cannot find module \'internal/bootstrap/loaders\''
   }
 );
 
 common.expectsError(
   () => {
-    const source = 'module.exports = require("internal/bootstrap_loaders")';
+    const source = 'module.exports = require("internal/bootstrap/loaders")';
     process.binding('natives').owo = source;
     require('owo');
   }, {
diff --git a/test/sequential/test-inspector-overwrite-config.js b/test/sequential/test-inspector-overwrite-config.js
index 2a00b1e079..8b641a0048 100644
--- a/test/sequential/test-inspector-overwrite-config.js
+++ b/test/sequential/test-inspector-overwrite-config.js
@@ -2,7 +2,8 @@
 'use strict';
 
 // This test ensures that overwriting a process configuration
-// value does not affect code in bootstrap_node.js. Specifically this tests
+// value does not affect code in lib/internal/bootstrap/node.js.
+// Specifically this tests
 // that the inspector console functions are bound even though
 // overwrite-config-preload-module.js overwrote the process.config variable.