diff --git a/lib/std/os/linux.zig b/lib/std/os/linux.zig
index aaf08395fa..58e13a9b12 100644
--- a/lib/std/os/linux.zig
+++ b/lib/std/os/linux.zig
@@ -37,8 +37,8 @@ const syscall_bits = switch (native_arch) {
 const arch_bits = switch (native_arch) {
     .x86 => @import("linux/x86.zig"),
     .x86_64 => @import("linux/x86_64.zig"),
-    .aarch64, .aarch64_be => @import("linux/arm64.zig"),
-    .arm, .armeb, .thumb, .thumbeb => @import("linux/arm-eabi.zig"),
+    .aarch64, .aarch64_be => @import("linux/aarch64.zig"),
+    .arm, .armeb, .thumb, .thumbeb => @import("linux/arm.zig"),
     .riscv32 => @import("linux/riscv32.zig"),
     .riscv64 => @import("linux/riscv64.zig"),
     .sparc64 => @import("linux/sparc64.zig"),
@@ -116,7 +116,7 @@ pub const user_desc = arch_bits.user_desc;
 pub const getcontext = arch_bits.getcontext;
 
 pub const tls = @import("linux/tls.zig");
-pub const pie = @import("linux/start_pie.zig");
+pub const pie = @import("linux/pie.zig");
 pub const BPF = @import("linux/bpf.zig");
 pub const IOCTL = @import("linux/ioctl.zig");
 pub const SECCOMP = @import("linux/seccomp.zig");
diff --git a/lib/std/os/linux/arm64.zig b/lib/std/os/linux/aarch64.zig
similarity index 100%
rename from lib/std/os/linux/arm64.zig
rename to lib/std/os/linux/aarch64.zig
diff --git a/lib/std/os/linux/arm-eabi.zig b/lib/std/os/linux/arm.zig
similarity index 100%
rename from lib/std/os/linux/arm-eabi.zig
rename to lib/std/os/linux/arm.zig
diff --git a/lib/std/os/linux/start_pie.zig b/lib/std/os/linux/pie.zig
similarity index 100%
rename from lib/std/os/linux/start_pie.zig
rename to lib/std/os/linux/pie.zig
diff --git a/lib/std/os/linux/thumb.zig b/lib/std/os/linux/thumb.zig
index baaf130578..a464030858 100644
--- a/lib/std/os/linux/thumb.zig
+++ b/lib/std/os/linux/thumb.zig
@@ -141,7 +141,7 @@ pub fn syscall6(
     );
 }
 
-pub const clone = @import("arm-eabi.zig").clone;
+pub const clone = @import("arm.zig").clone;
 
 pub fn restore() callconv(.Naked) noreturn {
     asm volatile (