diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d34a253a5..a2b5bfc469 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -651,9 +651,9 @@ set(ZIG_STD_FILES
     "rb.zig"
     "segmented_list.zig"
     "sort.zig"
-    "special/bootstrap.zig"
-    "special/bootstrap_lib.zig"
-    "special/bootstrap_windows_tls.zig"
+    "special/start.zig"
+    "special/start_lib.zig"
+    "special/start_windows_tls.zig"
     "special/build_runner.zig"
     "special/c.zig"
     "special/compiler_rt.zig"
diff --git a/src/all_types.hpp b/src/all_types.hpp
index bb5bef04bb..0dc86c4f55 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -1759,7 +1759,7 @@ struct CodeGen {
     ZigPackage *compile_var_package;
     ZigType *compile_var_import;
     ZigType *root_import;
-    ZigType *bootstrap_import;
+    ZigType *start_import;
     ZigType *test_runner_import;
 
     struct {
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 6ad779fd24..72ba3c6c99 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -8524,8 +8524,8 @@ static ZigType *add_special_code(CodeGen *g, ZigPackage *package, const char *ba
     return add_source_file(g, package, resolved_path, import_code, SourceKindPkgMain);
 }
 
-static ZigPackage *create_bootstrap_pkg(CodeGen *g, ZigPackage *pkg_with_main) {
-    ZigPackage *package = codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "bootstrap.zig", "std.special");
+static ZigPackage *create_start_pkg(CodeGen *g, ZigPackage *pkg_with_main) {
+    ZigPackage *package = codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "start.zig", "std.special");
     package->package_table.put(buf_create_from_str("root"), pkg_with_main);
     return package;
 }
@@ -8651,12 +8651,12 @@ static void gen_root_source(CodeGen *g) {
         !g->have_c_main && !g->have_winmain && !g->have_winmain_crt_startup &&
         ((g->have_pub_main && g->out_type == OutTypeObj) || g->out_type == OutTypeExe))
     {
-        g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g, g->root_package), "bootstrap.zig");
+        g->start_import = add_special_code(g, create_start_pkg(g, g->root_package), "start.zig");
     }
     if (g->zig_target->os == OsWindows && !g->have_dllmain_crt_startup &&
             g->out_type == OutTypeLib && g->is_dynamic)
     {
-        g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g, g->root_package), "bootstrap_lib.zig");
+        g->start_import = add_special_code(g, create_start_pkg(g, g->root_package), "start_lib.zig");
     }
 
     if (!g->error_during_imports) {
@@ -8664,7 +8664,7 @@ static void gen_root_source(CodeGen *g) {
     }
     if (g->is_test_build) {
         create_test_compile_var_and_add_test_runner(g);
-        g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g, g->test_runner_package), "bootstrap.zig");
+        g->start_import = add_special_code(g, create_start_pkg(g, g->test_runner_package), "start.zig");
 
         if (!g->error_during_imports) {
             semantic_analyze(g);
diff --git a/std/special/bootstrap.zig b/std/special/start.zig
similarity index 98%
rename from std/special/bootstrap.zig
rename to std/special/start.zig
index 7177f58b8a..45348feab0 100644
--- a/std/special/bootstrap.zig
+++ b/std/special/start.zig
@@ -59,7 +59,7 @@ nakedcc fn _start() noreturn {
 extern fn WinMainCRTStartup() noreturn {
     @setAlignStack(16);
     if (!builtin.single_threaded) {
-        _ = @import("bootstrap_windows_tls.zig");
+        _ = @import("start_windows_tls.zig");
     }
     std.os.windows.kernel32.ExitProcess(callMain());
 }
diff --git a/std/special/bootstrap_lib.zig b/std/special/start_lib.zig
similarity index 100%
rename from std/special/bootstrap_lib.zig
rename to std/special/start_lib.zig
diff --git a/std/special/bootstrap_windows_tls.zig b/std/special/start_windows_tls.zig
similarity index 100%
rename from std/special/bootstrap_windows_tls.zig
rename to std/special/start_windows_tls.zig