diff --git a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/CMakeLists.txt b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/CMakeLists.txt
index 4cdab2f848eba6ba8ea1939c27b76c770f3f1c54..8ba9a6e56bab9040426e2e6993ba1804e5cf9482 100644
--- a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/CMakeLists.txt
+++ b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/CMakeLists.txt
@@ -7,7 +7,7 @@ if(Eigen3_FOUND)
 endif()
 
 set(COMPONENT_LIBS
-ArmarXInterfaces
+ArmarXCoreInterfaces
 ArmarXCore
 RobotAPIInterfaces
 DebugDrawer
diff --git a/source/RobotAPI/applications/HandUnitSimulation/CMakeLists.txt b/source/RobotAPI/applications/HandUnitSimulation/CMakeLists.txt
index 529b2f94308fd1a0d9305cf1cbf5d2bd2669daa2..5ab07e08cab7afea440dfd8a58890e9573b27967 100644
--- a/source/RobotAPI/applications/HandUnitSimulation/CMakeLists.txt
+++ b/source/RobotAPI/applications/HandUnitSimulation/CMakeLists.txt
@@ -9,7 +9,7 @@ if (Eigen3_FOUND)
 endif()
 
 
-set(COMPONENT_LIBS RobotAPIUnits ArmarXInterfaces ArmarXCore)
+set(COMPONENT_LIBS RobotAPIUnits ArmarXCoreInterfaces ArmarXCore)
 
 set(EXE_SOURCE main.cpp)
 
diff --git a/source/RobotAPI/applications/InertialMeasurementUnitObserver/CMakeLists.txt b/source/RobotAPI/applications/InertialMeasurementUnitObserver/CMakeLists.txt
index 9fd6cf01ff46b757947cacb71591b6edba6b9d7b..e280918bcf6713df170b90e5a40273c4b5da86c2 100644
--- a/source/RobotAPI/applications/InertialMeasurementUnitObserver/CMakeLists.txt
+++ b/source/RobotAPI/applications/InertialMeasurementUnitObserver/CMakeLists.txt
@@ -9,7 +9,7 @@ armarx_component_set_name("InertialMeasurementUnitObserverApp")
 #    include_directories(${MyLib_INCLUDE_DIRS})
 #endif()
 
-set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore ArmarXCoreObservers  RobotAPIUnits)
+set(COMPONENT_LIBS ArmarXCoreInterfaces ArmarXCore ArmarXCoreObservers  RobotAPIUnits)
 
 set(EXE_SOURCE InertialMeasurementUnitObserverApp.h main.cpp)
 
diff --git a/source/RobotAPI/applications/MMMPlayer/CMakeLists.txt b/source/RobotAPI/applications/MMMPlayer/CMakeLists.txt
index 1aa2b39a4c3f68a824af971907286c0716c0eef0..84a48de2986de1098d0fc14f95815cb5b140da6c 100644
--- a/source/RobotAPI/applications/MMMPlayer/CMakeLists.txt
+++ b/source/RobotAPI/applications/MMMPlayer/CMakeLists.txt
@@ -16,7 +16,7 @@ if (Eigen3_FOUND)
     include_directories(${Eigen3_INCLUDE_DIR})
 endif()
 
-set(COMPONENT_LIBS MMMPlayer ArmarXInterfaces ArmarXCore ${MMMCORE_LIBRARIES})
+set(COMPONENT_LIBS MMMPlayer ArmarXCoreInterfaces ArmarXCore ${MMMCORE_LIBRARIES})
 
 set(EXE_SOURCE MMMPlayerApp.h main.cpp)
 
diff --git a/source/RobotAPI/applications/XsensIMU/CMakeLists.txt b/source/RobotAPI/applications/XsensIMU/CMakeLists.txt
index 73778cdf5323c15503526ab8e9461e503dd2e3e4..68a3af2b1c42625496dba90e2fc18eea9acd1f6d 100644
--- a/source/RobotAPI/applications/XsensIMU/CMakeLists.txt
+++ b/source/RobotAPI/applications/XsensIMU/CMakeLists.txt
@@ -9,7 +9,7 @@ armarx_component_set_name("XsensIMUApp")
 #    include_directories(${MyLib_INCLUDE_DIRS})
 #endif()
 
-set(COMPONENT_LIBS ArmarXInterfaces ArmarXCore XsensIMU)
+set(COMPONENT_LIBS ArmarXCoreInterfaces ArmarXCore XsensIMU)
 
 set(EXE_SOURCE XsensIMUApp.h main.cpp)
 
diff --git a/source/RobotAPI/applications/deprecated/MotionControl/CMakeLists.txt b/source/RobotAPI/applications/deprecated/MotionControl/CMakeLists.txt
index c8099e969b735a7dc2cfa1571e8b0dc139dc1e9c..711bc726927394a249a20ac8ecb4583b01433c64 100644
--- a/source/RobotAPI/applications/deprecated/MotionControl/CMakeLists.txt
+++ b/source/RobotAPI/applications/deprecated/MotionControl/CMakeLists.txt
@@ -8,7 +8,7 @@ find_package(Simox QUIET)
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
 
 
-set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers RobotAPIRobotStateComponent ArmarXCoreStatechart RobotAPIOperations)
+set(COMPONENT_LIBS MotionControl RobotAPICore ArmarXCoreInterfaces ArmarXCore ArmarXCoreObservers RobotAPIRobotStateComponent ArmarXCoreStatechart RobotAPIOperations)
 
 set(SOURCES main.cpp MotionControlApp.h)
 
diff --git a/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/CMakeLists.txt b/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/CMakeLists.txt
index 84a9104738bd6d1ba2fc58ff3d82f7f290fb722c..63cfd74317611827fb63241f6542d94bb1b961f5 100644
--- a/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/CMakeLists.txt
+++ b/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/CMakeLists.txt
@@ -18,7 +18,7 @@ if (Eigen3_FOUND AND Simox_FOUND)
         ${Simox_INCLUDE_DIRS})
 endif()
 
-set(COMPONENT_LIBS RobotAPIInterfaces RobotAPICore ArmarXInterfaces ArmarXCore ArmarXCoreObservers ${MMMCORE_LIBRARIES})
+set(COMPONENT_LIBS RobotAPIInterfaces RobotAPICore ArmarXCoreInterfaces ArmarXCore ArmarXCoreObservers ${MMMCORE_LIBRARIES})
 
 set(SOURCES
 ./MMMPlayer.cpp
diff --git a/source/RobotAPI/gui-plugins/HandUnitPlugin/CMakeLists.txt b/source/RobotAPI/gui-plugins/HandUnitPlugin/CMakeLists.txt
index 6bed53b72473a1516a251bfad620ca64a30a96fe..4f3f2c54a60befe510c368134a5c58b2e009088d 100644
--- a/source/RobotAPI/gui-plugins/HandUnitPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui-plugins/HandUnitPlugin/CMakeLists.txt
@@ -27,7 +27,7 @@ set(GUI_UIS
     HandUnitConfigDialog.ui
 )
 
-set(COMPONENT_LIBS RobotAPIUnits ArmarXInterfaces ${Simox_LIBRARIES})
+set(COMPONENT_LIBS RobotAPIUnits ArmarXCoreInterfaces ${Simox_LIBRARIES})
 
 set(LIB_VERSION    0.1.0)
 set(LIB_SOVERSION  0)
diff --git a/source/RobotAPI/gui-plugins/HapticUnitPlugin/CMakeLists.txt b/source/RobotAPI/gui-plugins/HapticUnitPlugin/CMakeLists.txt
index 9caeeee68f7beded8305dce337f2fa83c8c02904..2c036a010181920768c409937a12cfa9b1aa36b7 100644
--- a/source/RobotAPI/gui-plugins/HapticUnitPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui-plugins/HapticUnitPlugin/CMakeLists.txt
@@ -42,7 +42,7 @@ set(GUI_UIS
     MatrixDisplayWidget.ui
 )
 
-set(COMPONENT_LIBS RobotAPIUnits ArmarXInterfaces ArmarXCoreEigen3Variants ${Simox_LIBRARIES})
+set(COMPONENT_LIBS RobotAPIUnits ArmarXCoreInterfaces ArmarXCoreEigen3Variants ${Simox_LIBRARIES})
 
 set(LIB_VERSION    0.1.0)
 set(LIB_SOVERSION  0)
diff --git a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/CMakeLists.txt b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/CMakeLists.txt
index 14ee4c60b1c6de31ae9080b0dec02e321e666d40..7566a64079c6113cd8fe0b9b6d76ac22ac8816b2 100644
--- a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/CMakeLists.txt
@@ -27,7 +27,7 @@ set(GUI_UIS
     PlatformUnitConfigDialog.ui
 )
 
-set(COMPONENT_LIBS RobotAPIUnits ArmarXInterfaces ${Simox_LIBRARIES})
+set(COMPONENT_LIBS RobotAPIUnits ArmarXCoreInterfaces ${Simox_LIBRARIES})
 
 set(LIB_VERSION    0.1.0)
 set(LIB_SOVERSION  0)
diff --git a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/CMakeLists.txt b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/CMakeLists.txt
index 07a53d84ebfbb07ece2b65c832d0f45e4dd58ea1..3605bd699ce4a853e232b6d4b01bff5c410f9321 100644
--- a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/CMakeLists.txt
+++ b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/CMakeLists.txt
@@ -26,7 +26,7 @@ armarx_component_set_name("StatechartProfilesTestGroup")
 
 set(COMPONENT_LIBS
 #   RobotAPIInterfaces RobotAPICore
-    ArmarXInterfaces ArmarXCore ArmarXCoreStatechart ArmarXCoreObservers)
+    ArmarXCoreInterfaces ArmarXCore ArmarXCoreStatechart ArmarXCoreObservers)
 
 # Sources
 
diff --git a/source/RobotAPI/statecharts/WeissHapticGroup/CMakeLists.txt b/source/RobotAPI/statecharts/WeissHapticGroup/CMakeLists.txt
index 1bb8a3e825f4e4af96ddd3666d76d9b5a21094fc..b0fea04f1a90ab5dc83cc8dd3c2938bca46b7637 100644
--- a/source/RobotAPI/statecharts/WeissHapticGroup/CMakeLists.txt
+++ b/source/RobotAPI/statecharts/WeissHapticGroup/CMakeLists.txt
@@ -26,7 +26,7 @@ endif()
 
 set(COMPONENT_LIBS
     RobotAPIInterfaces RobotAPICore RobotAPIUnits
-    ArmarXInterfaces ArmarXCore ArmarXCoreStatechart ArmarXCoreObservers)
+    ArmarXCoreInterfaces ArmarXCore ArmarXCoreStatechart ArmarXCoreObservers)
 
 # Sources