diff --git a/subsys/random/CMakeLists.txt b/subsys/random/CMakeLists.txt
index cde2431ae2..bdda2f4257 100644
--- a/subsys/random/CMakeLists.txt
+++ b/subsys/random/CMakeLists.txt
@@ -5,7 +5,7 @@ if (CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR OR
     CONFIG_XOSHIRO_RANDOM_GENERATOR)
 zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/random/random.h)
 zephyr_library()
-zephyr_library_sources_ifdef(CONFIG_USERSPACE           rand32_handlers.c)
+zephyr_library_sources_ifdef(CONFIG_USERSPACE           random_handlers.c)
 endif()
 
 if (CONFIG_TIMER_RANDOM_GENERATOR)
@@ -15,12 +15,12 @@ if (CONFIG_TIMER_RANDOM_GENERATOR)
     Use it carefully.")
 endif()
 
-zephyr_library_sources_ifdef(CONFIG_TIMER_RANDOM_GENERATOR          rand32_timer.c)
-zephyr_library_sources_ifdef(CONFIG_XOSHIRO_RANDOM_GENERATOR        rand32_xoshiro128.c)
-zephyr_library_sources_ifdef(CONFIG_CTR_DRBG_CSPRNG_GENERATOR       rand32_ctr_drbg.c)
+zephyr_library_sources_ifdef(CONFIG_TIMER_RANDOM_GENERATOR          random_timer.c)
+zephyr_library_sources_ifdef(CONFIG_XOSHIRO_RANDOM_GENERATOR        random_xoshiro128.c)
+zephyr_library_sources_ifdef(CONFIG_CTR_DRBG_CSPRNG_GENERATOR       random_ctr_drbg.c)
 
 if (CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR OR CONFIG_HARDWARE_DEVICE_CS_GENERATOR)
-zephyr_library_sources(rand32_entropy_device.c)
+zephyr_library_sources(random_entropy_device.c)
 endif()
 
 if (CONFIG_CTR_DRBG_CSPRNG_GENERATOR)
diff --git a/subsys/random/rand32_ctr_drbg.c b/subsys/random/random_ctr_drbg.c
similarity index 100%
rename from subsys/random/rand32_ctr_drbg.c
rename to subsys/random/random_ctr_drbg.c
diff --git a/subsys/random/rand32_entropy_device.c b/subsys/random/random_entropy_device.c
similarity index 100%
rename from subsys/random/rand32_entropy_device.c
rename to subsys/random/random_entropy_device.c
diff --git a/subsys/random/rand32_handlers.c b/subsys/random/random_handlers.c
similarity index 100%
rename from subsys/random/rand32_handlers.c
rename to subsys/random/random_handlers.c
diff --git a/subsys/random/rand32_timer.c b/subsys/random/random_timer.c
similarity index 100%
rename from subsys/random/rand32_timer.c
rename to subsys/random/random_timer.c
diff --git a/subsys/random/rand32_xoshiro128.c b/subsys/random/random_xoshiro128.c
similarity index 100%
rename from subsys/random/rand32_xoshiro128.c
rename to subsys/random/random_xoshiro128.c