diff --git a/lib/heap/CMakeLists.txt b/lib/heap/CMakeLists.txt
index fc684cb98c..58fc62fa82 100644
--- a/lib/heap/CMakeLists.txt
+++ b/lib/heap/CMakeLists.txt
@@ -2,12 +2,12 @@
 
 zephyr_sources(
   heap.c
-  heap-info.c
+  heap_info.c
   multi_heap.c
   )
 
-zephyr_sources_ifdef(CONFIG_SYS_HEAP_VALIDATE heap-validate.c)
-zephyr_sources_ifdef(CONFIG_SYS_HEAP_STRESS heap-stress.c)
+zephyr_sources_ifdef(CONFIG_SYS_HEAP_VALIDATE heap_validate.c)
+zephyr_sources_ifdef(CONFIG_SYS_HEAP_STRESS heap_stress.c)
 zephyr_sources_ifdef(CONFIG_SHARED_MULTI_HEAP shared_multi_heap.c)
 
 zephyr_sources_ifdef(CONFIG_HEAP_LISTENER heap_listener.c)
diff --git a/lib/heap/heap-info.c b/lib/heap/heap_info.c
similarity index 100%
rename from lib/heap/heap-info.c
rename to lib/heap/heap_info.c
diff --git a/lib/heap/heap-stress.c b/lib/heap/heap_stress.c
similarity index 100%
rename from lib/heap/heap-stress.c
rename to lib/heap/heap_stress.c
diff --git a/lib/heap/heap-validate.c b/lib/heap/heap_validate.c
similarity index 100%
rename from lib/heap/heap-validate.c
rename to lib/heap/heap_validate.c