diff --git a/source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt
index de9b660b2175a34c4cd3aeb90152370f222ceb11..b1a5224421ff0147e3fd990c5c17917334dd61a9 100644
--- a/source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt
@@ -6,7 +6,8 @@ armarx_build_if(OpenCV_FOUND "OpenCV not available")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces  # for DebugObserverInterface
     ArmarXGuiComponentPlugins
-    RobotAPICore RobotAPIInterfaces armem
+    RobotAPICore RobotAPIInterfaces
+    armem_server
 )
 
 set(SOURCES
diff --git a/source/RobotAPI/components/armem/server/GeneralPurposeMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/GeneralPurposeMemory/CMakeLists.txt
index f0521043e0891a4b42b3fd75e612b607b3e421aa..278e9c29a43c0d8d42de5d512b128354481d89b9 100644
--- a/source/RobotAPI/components/armem/server/GeneralPurposeMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/GeneralPurposeMemory/CMakeLists.txt
@@ -4,7 +4,7 @@ armarx_component_set_name("GeneralPurposeMemory")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces  # for DebugObserverInterface
     ArmarXGuiComponentPlugins
-    RobotAPICore RobotAPIInterfaces armem
+    RobotAPICore RobotAPIInterfaces armem_server
     # RobotAPIComponentPlugins  # for ArViz and other plugins
 
     ${IVT_LIBRARIES}
diff --git a/source/RobotAPI/components/armem/server/GraspMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/GraspMemory/CMakeLists.txt
index 7bac572cd11bae463d2349529691f2ff5d6b79b2..6f09f46f79512819800b879bbd7701677fde1118 100644
--- a/source/RobotAPI/components/armem/server/GraspMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/GraspMemory/CMakeLists.txt
@@ -4,7 +4,7 @@ armarx_component_set_name("GraspMemory")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces  # for DebugObserverInterface
     ArmarXGuiComponentPlugins
-    RobotAPICore RobotAPIInterfaces armem
+    RobotAPICore RobotAPIInterfaces armem_server
     RobotAPIComponentPlugins  # for ArViz and other plugins
 
     ${IVT_LIBRARIES}
diff --git a/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
index 4b9a866f9c3be383e589ba9e0bafbc60368f0f57..7d2017104f74dc74d8c55b93c403e6e27ae1c4ab 100644
--- a/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
@@ -7,7 +7,7 @@ armarx_add_component(
         ArmarXGuiComponentPlugins
         RobotAPICore
         RobotAPIInterfaces
-        RobotAPI::ArMem
+        RobotAPI::armem_server
         RobotAPI::ArMemMotions
         RobotAPI::armem_mps
     SOURCES
diff --git a/source/RobotAPI/components/armem/server/ObjectMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/ObjectMemory/CMakeLists.txt
index 1c90c244bf872fdc4931e0b9067a92c189d9b694..ac589f21a49e3b86f01d413b023dc3825fbf9f7c 100644
--- a/source/RobotAPI/components/armem/server/ObjectMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/ObjectMemory/CMakeLists.txt
@@ -8,7 +8,9 @@ set(COMPONENT_LIBS
     ArmarXGuiComponentPlugins
     # RobotAPI
     RobotAPI::ComponentPlugins
+    RobotAPI::armem_server
     RobotAPI::armem_objects
+    RobotAPI::armem_objects_server
 
     # This project
     ${PROJECT_NAME}Interfaces
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
index f49cb33c231a20857aa30458b4f7f5f14c05acdc..7dc9f54a296c145e5992a4dddf30a8f7cd8ab5c1 100644
--- a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
@@ -10,7 +10,7 @@ set(COMPONENT_LIBS
     # RobotAPI
     RobotAPICore RobotAPIInterfaces
     RobotAPIComponentPlugins
-    armem
+    armem_server
     armem_robot_state
 )
 
diff --git a/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
index eee41fad2917ac3689f98d103f1a927a0715d205..dda3d1f24a956c0d1882af2fea2ef056183abc96 100644
--- a/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/SkillsMemory/CMakeLists.txt
@@ -4,7 +4,7 @@ armarx_component_set_name("SkillsMemory")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces
     RobotAPICore RobotAPIInterfaces
-    armem armem_skills
+    armem_server armem_skills
 
     ${IVT_LIBRARIES}
 )