diff --git a/source/RobotAPI/components/robotstate/RobotStateComponent.cpp b/source/RobotAPI/components/robotstate/RobotStateComponent.cpp
index aa5ecd43997afefe5d3f5287c2530e8a3decad32..a8a154d615437997ba063a39f39a71abea7831ad 100644
--- a/source/RobotAPI/components/robotstate/RobotStateComponent.cpp
+++ b/source/RobotAPI/components/robotstate/RobotStateComponent.cpp
@@ -96,7 +96,7 @@ namespace armarx
         }
         usingTopic(robotNodeSetName + "State");
 
-        VirtualRobot::RobotNodeSetPtr pns = this->_synchronized->getRobotNodeSet("Platform");
+        /*VirtualRobot::RobotNodeSetPtr pns = this->_synchronized->getRobotNodeSet("Platform");
         if (pns)
         {
             usingTopic("PlatformState");
@@ -107,7 +107,7 @@ namespace armarx
             {
                 ARMARX_VERBOSE << "Node: " << node->getName() << endl;
             }
-        }
+        }*/
         _sharedRobotServant =  new SharedRobotServant(this->_synchronized);
         _sharedRobotServant->ref();
     }
diff --git a/source/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp b/source/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp
index 36e0a9860063c503c1bd718993f0d1fa0581840e..7a6601400684e28806902cac3f9653d04a2de4ce 100644
--- a/source/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui_plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp
@@ -182,4 +182,4 @@ void armarx::HandUnitWidget::reportJointPressures(const armarx::NameValueMap &ac
 
 }
 
-Q_EXPORT_PLUGIN2(armar3_gui_HandUnitGuiPlugin, HandUnitGuiPlugin)
+Q_EXPORT_PLUGIN2(robotapi_gui_HandUnitGuiPlugin, HandUnitGuiPlugin)
diff --git a/source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp b/source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
index 017445f1187cb014f81f36053dd029ba72b54307..56acc084cb150570380fdc3c921058dd862712c7 100644
--- a/source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
@@ -188,4 +188,4 @@ void HapticUnitWidget::updateDisplayWidgets()
 }
 
 
-Q_EXPORT_PLUGIN2(armar3_gui_HapticUnitGuiPlugin, HapticUnitGuiPlugin)
+Q_EXPORT_PLUGIN2(robotapi_gui_HapticUnitGuiPlugin, HapticUnitGuiPlugin)
diff --git a/source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp b/source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
index eeb85b8d5260e6e66efd013e5e9d3aacfa153b3c..1dcc2186df572f4f9385df96194e66076f0dd1ea 100644
--- a/source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
@@ -1088,4 +1088,4 @@ void RangeValueDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
         QStyledItemDelegate::paint(painter, option, index);
 }
 
-Q_EXPORT_PLUGIN2(armar3_gui_KinematicUnitGuiPlugin, KinematicUnitGuiPlugin)
+Q_EXPORT_PLUGIN2(robotapi_gui_KinematicUnitGuiPlugin, KinematicUnitGuiPlugin)
diff --git a/source/RobotAPI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp b/source/RobotAPI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
index 5cc2e5642717b1a131371fe2b23ca2d3460b39d4..151de1ef32fe3221a1f685bb478bbda3afeb5ec5 100644
--- a/source/RobotAPI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui_plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
@@ -194,5 +194,5 @@ void PlatformUnitWidget::controlTimerTick()
 
 }
 
-Q_EXPORT_PLUGIN2(armar3_gui_PlatformUnitGuiPlugin, PlatformUnitGuiPlugin)
+Q_EXPORT_PLUGIN2(robotapi_gui_PlatformUnitGuiPlugin, PlatformUnitGuiPlugin)