diff --git a/compiler/builtins/bitcode/build.zig b/compiler/builtins/bitcode/build.zig
index 6522f76bc2..8a194dad50 100644
--- a/compiler/builtins/bitcode/build.zig
+++ b/compiler/builtins/bitcode/build.zig
@@ -33,14 +33,14 @@ pub fn build(b: *Builder) void {
     const wasm32_target = makeWasm32Target();
 
     // LLVM IR
-    generateLlvmIrFile(b, mode, host_target, main_path, "ir", "host");
-    generateLlvmIrFile(b, mode, linux32_target, main_path, "ir-i386", "i386-unknown-linux-musl");
-    generateLlvmIrFile(b, mode, linux64_target, main_path, "ir-x86_64", "x86_64-unknown-linux-musl");
-    generateLlvmIrFile(b, mode, wasm32_target, main_path, "ir-wasm32", "wasm32-unknown-unknown");
+    generateLlvmIrFile(b, mode, host_target, main_path, "ir", "builtins-host");
+    generateLlvmIrFile(b, mode, linux32_target, main_path, "ir-i386", "builtins-i386");
+    generateLlvmIrFile(b, mode, linux64_target, main_path, "ir-x86_64", "builtins-x86_64");
+    generateLlvmIrFile(b, mode, wasm32_target, main_path, "ir-wasm32", "wasm32");
 
     // Generate Object Files
-    generateObjectFile(b, mode, host_target, main_path, "object", "host");
-    generateObjectFile(b, mode, wasm32_target, main_path, "wasm32-object", "wasm32");
+    generateObjectFile(b, mode, host_target, main_path, "object", "builtins-host");
+    generateObjectFile(b, mode, wasm32_target, main_path, "wasm32-object", "builtins-wasm32");
 
     removeInstallSteps(b);
 }
diff --git a/compiler/builtins/build.rs b/compiler/builtins/build.rs
index ff0d260941..ff2a83e609 100644
--- a/compiler/builtins/build.rs
+++ b/compiler/builtins/build.rs
@@ -36,14 +36,14 @@ fn main() {
 
     // LLVM .bc FILES
 
-    generate_bc_file(&bitcode_path, &build_script_dir_path, "ir", "host");
+    generate_bc_file(&bitcode_path, &build_script_dir_path, "ir", "builtins-host");
 
     if !DEBUG {
         generate_bc_file(
             &bitcode_path,
             &build_script_dir_path,
             "ir-wasm32",
-            "wasm32-unknown-unknown",
+            "builtins-wasm32",
         );
     }
 
@@ -51,14 +51,14 @@ fn main() {
         &bitcode_path,
         &build_script_dir_path,
         "ir-i386",
-        "i386-unknown-linux-musl",
+        "builtins-i386",
     );
 
     generate_bc_file(
         &bitcode_path,
         &build_script_dir_path,
         "ir-x86_64",
-        "x86_64-unknown-linux-musl",
+        "builtins-x86_64",
     );
 
     // OBJECT FILES
diff --git a/compiler/gen_llvm/src/llvm/build.rs b/compiler/gen_llvm/src/llvm/build.rs
index d406abecf5..d80b48dfea 100644
--- a/compiler/gen_llvm/src/llvm/build.rs
+++ b/compiler/gen_llvm/src/llvm/build.rs
@@ -411,28 +411,28 @@ pub fn module_from_builtins<'ctx>(
     // In the build script for the builtins module, we compile the builtins into LLVM bitcode
 
     let bitcode_bytes: &[u8] = if target == &target_lexicon::Triple::host() {
-        include_bytes!("../../../builtins/bitcode/host.bc")
+        include_bytes!("../../../builtins/bitcode/builtins-host.bc")
     } else {
         match target {
             Triple {
                 architecture: Architecture::Wasm32,
                 ..
             } => {
-                include_bytes!("../../../builtins/bitcode/wasm32-unknown-unknown.bc")
+                include_bytes!("../../../builtins/bitcode/builtins-wasm32.bc")
             }
             Triple {
                 architecture: Architecture::X86_32(_),
                 operating_system: OperatingSystem::Linux,
                 ..
             } => {
-                include_bytes!("../../../builtins/bitcode/i386-unknown-linux-musl.bc")
+                include_bytes!("../../../builtins/bitcode/builtins-i386.bc")
             }
             Triple {
                 architecture: Architecture::X86_64,
                 operating_system: OperatingSystem::Linux,
                 ..
             } => {
-                include_bytes!("../../../builtins/bitcode/x86_64-unknown-linux-musl.bc")
+                include_bytes!("../../../builtins/bitcode/builtins-x86_64.bc")
             }
             _ => panic!(
                 "The zig builtins are not currently built for this target: {:?}",