diff --git a/source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt b/source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt
index 667e5d5ad070e08f331d505fa4e742ce61b39df7..b9434aeb6575293b01482473f3467403e969ab86 100644
--- a/source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt
@@ -7,7 +7,9 @@ armarx_build_if(OpenCV_FOUND "OpenCV not available")
 set(COMPONENT_LIBS
     ArmarXCore ArmarXCoreInterfaces  # for DebugObserverInterface
     ArmarXGuiComponentPlugins
-    RobotAPICore RobotAPIInterfaces armem aronopencvconverter aronjsonconverter
+    RobotAPICore RobotAPIInterfaces
+    armem
+    aronopencvconverter aronjsonconverter
 
     ${OpenCV_LIBRARIES}
 )
diff --git a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
index eae52c5054369e599acebfa5378075b7a448d6e5..d5ffd4c911804296d10c756577b3c573b3174235 100644
--- a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
+++ b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
@@ -597,7 +597,6 @@ namespace armarx
 
         if (tab.queryResult)
         {
-            tab.queryResultGroup = armem::server::MemoryRemoteGui().makeGroupBox(*tab.queryResult);
         }
 
         VBoxLayout root = {tab.queryResultGroup, VSpacer()};
diff --git a/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
index 7d2017104f74dc74d8c55b93c403e6e27ae1c4ab..2762e4152f4a3711b4d49fd8022ef5f5a90bcbe4 100644
--- a/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt
@@ -8,20 +8,19 @@ armarx_add_component(
         RobotAPICore
         RobotAPIInterfaces
         RobotAPI::armem_server
-        RobotAPI::ArMemMotions
-        RobotAPI::armem_mps
+        RobotAPI::armem_motions_server
+        RobotAPI::armem_mps_server
+
     SOURCES
         MotionMemory.cpp
+
     HEADERS
         MotionMemory.h
 )
 
 
 # add unit tests
-add_subdirectory(test)
+# add_subdirectory(test)
 
 #generate the application
 armarx_generate_and_add_component_executable()
-
-
-
diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
index 7dc9f54a296c145e5992a4dddf30a8f7cd8ab5c1..24c6616942f86aa4a6e828675db83f59b14aff72 100644
--- a/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
+++ b/source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt
@@ -10,8 +10,8 @@ set(COMPONENT_LIBS
     # RobotAPI
     RobotAPICore RobotAPIInterfaces
     RobotAPIComponentPlugins
-    armem_server
-    armem_robot_state
+    RobotAPI::armem_server
+    RobotAPI::armem_robot_state_server
 )
 
 set(SOURCES