diff --git a/library/std/src/sys/wasm/condvar_atomics.rs b/library/std/src/sys/wasm/atomics/condvar.rs
similarity index 100%
rename from library/std/src/sys/wasm/condvar_atomics.rs
rename to library/std/src/sys/wasm/atomics/condvar.rs
diff --git a/library/std/src/sys/wasm/futex_atomics.rs b/library/std/src/sys/wasm/atomics/futex.rs
similarity index 100%
rename from library/std/src/sys/wasm/futex_atomics.rs
rename to library/std/src/sys/wasm/atomics/futex.rs
diff --git a/library/std/src/sys/wasm/mutex_atomics.rs b/library/std/src/sys/wasm/atomics/mutex.rs
similarity index 100%
rename from library/std/src/sys/wasm/mutex_atomics.rs
rename to library/std/src/sys/wasm/atomics/mutex.rs
diff --git a/library/std/src/sys/wasm/rwlock_atomics.rs b/library/std/src/sys/wasm/atomics/rwlock.rs
similarity index 100%
rename from library/std/src/sys/wasm/rwlock_atomics.rs
rename to library/std/src/sys/wasm/atomics/rwlock.rs
diff --git a/library/std/src/sys/wasm/thread_atomics.rs b/library/std/src/sys/wasm/atomics/thread.rs
similarity index 100%
rename from library/std/src/sys/wasm/thread_atomics.rs
rename to library/std/src/sys/wasm/atomics/thread.rs
diff --git a/library/std/src/sys/wasm/mod.rs b/library/std/src/sys/wasm/mod.rs
index 71877fce993..0bd2c0d0f9d 100644
--- a/library/std/src/sys/wasm/mod.rs
+++ b/library/std/src/sys/wasm/mod.rs
@@ -48,15 +48,15 @@
 
 cfg_if::cfg_if! {
     if #[cfg(target_feature = "atomics")] {
-        #[path = "condvar_atomics.rs"]
+        #[path = "atomics/condvar.rs"]
         pub mod condvar;
-        #[path = "mutex_atomics.rs"]
+        #[path = "atomics/mutex.rs"]
         pub mod mutex;
-        #[path = "rwlock_atomics.rs"]
+        #[path = "atomics/rwlock.rs"]
         pub mod rwlock;
-        #[path = "futex_atomics.rs"]
+        #[path = "atomics/futex.rs"]
         pub mod futex;
-        #[path = "thread_atomics.rs"]
+        #[path = "atomics/thread.rs"]
         pub mod thread;
     } else {
         #[path = "../unsupported/condvar.rs"]