diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a54b117..99e0891d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,8 +83,8 @@ add_subdirectory(msgs)
 add_subdirectory(interfaces)
 add_subdirectory(devices)
 add_subdirectory(modules)
-add_subdirectory(wrappers)
-add_subdirectory(remappers)
+add_subdirectory(servers)
+add_subdirectory(clients)
 add_subdirectory(publishers)
 add_subdirectory(HumanDynamicsEstimationLibrary)