diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 260e2c7d9..6f9ad7bc3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,25 +23,23 @@
 # All executables link against libvillas
 link_libraries(villas)
 
-add_executable(villas-node node.c)
-add_executable(villas-test-rtt test-rtt.c)
-add_executable(villas-test-shmem test-shmem.c)
+add_executable(villas-node villas-node.c)
+add_executable(villas-test-rtt villas-test-rtt.c)
+add_executable(villas-test-shmem villas-test-shmem.c)
 
 set(SRCS )
 
 if(WITH_IO)
-    add_executable(villas-test-cmp test-cmp.c)
-    
-    add_executable(villas-convert convert.c)
-    
-    add_executable(villas-pipe pipe.c)
     target_link_libraries(villas-pipe PUBLIC pthread)
+    add_executable(villas-test-cmp villas-test-cmp.c)
+    add_executable(villas-convert villas-convert.c)
+    add_executable(villas-pipe villas-pipe.c)
+    add_executable(villas-signal villas-signal.c)
 
-    add_executable(villas-signal signal.c)
 endif()
 
 if(WITH_IO AND WITH_HOOKS)
-    add_executable(villas-hook hook.c)
+    add_executable(villas-hook villas-hook.c)
 endif()
 
 install(
diff --git a/src/convert.c b/src/villas-convert.c
similarity index 100%
rename from src/convert.c
rename to src/villas-convert.c
diff --git a/src/hook.c b/src/villas-hook.c
similarity index 100%
rename from src/hook.c
rename to src/villas-hook.c
diff --git a/src/node.c b/src/villas-node.c
similarity index 100%
rename from src/node.c
rename to src/villas-node.c
diff --git a/src/pipe.c b/src/villas-pipe.c
similarity index 100%
rename from src/pipe.c
rename to src/villas-pipe.c
diff --git a/src/signal.c b/src/villas-signal.c
similarity index 100%
rename from src/signal.c
rename to src/villas-signal.c
diff --git a/src/test-cmp.c b/src/villas-test-cmp.c
similarity index 100%
rename from src/test-cmp.c
rename to src/villas-test-cmp.c
diff --git a/src/test-rtt.c b/src/villas-test-rtt.c
similarity index 100%
rename from src/test-rtt.c
rename to src/villas-test-rtt.c
diff --git a/src/test-shmem.c b/src/villas-test-shmem.c
similarity index 100%
rename from src/test-shmem.c
rename to src/villas-test-shmem.c