diff --git a/source/RobotAPI/components/DSObstacleAvoidance/main.cpp b/source/RobotAPI/components/DSObstacleAvoidance/main.cpp
index 3443a1532116011cd679198f9727563b4ff3885d..350f59edd246a0f74e3cbabfb3f95871f4d12cf0 100644
--- a/source/RobotAPI/components/DSObstacleAvoidance/main.cpp
+++ b/source/RobotAPI/components/DSObstacleAvoidance/main.cpp
@@ -29,7 +29,7 @@
 #include <ArmarXCore/core/Component.h>
 #include <ArmarXCore/core/logging/Logging.h>
 
-// Armar6Skills
+// armar6_skills
 #include <RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.h>
 
 
diff --git a/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp b/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp
index f15496da384cd8c25169bdcc5decf93b730cff6e..6ca25b01ef9eb704a2f29140e54e6e602c8b32b6 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp
+++ b/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * @package    Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package    armar6_skills::ArmarXObjects::DynamicObstacleManager
  * @author     Fabian PK ( fabian dot peller-konrad at kit dot edu )
  * @date       2020
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h b/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h
index f0820c595d0651933255fc1d207f54c40f6c8aae..cdabab3966b27c232b14c6e4f31a2070eba12e8f 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h
+++ b/source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * @package    Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package    armar6_skills::ArmarXObjects::DynamicObstacleManager
  * @author     Fabian PK ( fabian dot peller-konrad at kit dot edu )
  * @date       2020
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp b/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp
index 3cebd4612e8c94ddb015480e8079dd5859ed741e..91af23ed518e9348e3d37cd71ddcdcc2b8646ff8 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp
+++ b/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * @package    Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package    armar6_skills::ArmarXObjects::DynamicObstacleManager
  * @author     Fabian PK ( fabian dot peller-konrad at kit dot edu )
  * @date       2020
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h b/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h
index 95b7491d2d08e989321dcfdf30463acd46a95e9d..5dd70f211733cc61469a0d8b2be38f242b3307ff 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h
+++ b/source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.h
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * @package    Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package    armar6_skills::ArmarXObjects::DynamicObstacleManager
  * @author     Fabian PK ( fabian dot peller-konrad at kit dot edu )
  * @date       2020
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
diff --git a/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp b/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
index 52fa2345cd6c12f0cd6fd7cecb3a43564731605a..3184203cd117e51e8e9748ec823208089e40a488 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
+++ b/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
@@ -13,19 +13,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * @package    Armar6Skills::ArmarXObjects::DynamicObstacleManager
+ * @package    armar6_skills::ArmarXObjects::DynamicObstacleManager
  * @author     Fabian PK ( fabian dot peller-konrad at kit dot edu )
  * @date       2020
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
-#define BOOST_TEST_MODULE Armar6Skills::ArmarXObjects::DynamicObstacleManager
+#define BOOST_TEST_MODULE armar6_skills::ArmarXObjects::DynamicObstacleManager
 
 #define ARMARX_BOOST_TEST
 
 #include <RobotAPI/Test.h>
-#include <Armar6Skills/components/DynamicObstacleManager/DynamicObstacleManager.h>
+#include <armar6_skills/components/DynamicObstacleManager/DynamicObstacleManager.h>
 
 #include <iostream>
 
diff --git a/source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice b/source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice
index 5ff2649fae12cb906f5821f73ba1fb1fd21647fe..df0f5596b78a783c94e6ae21fc1a0cfdf0e5a16e 100644
--- a/source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice
+++ b/source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * @package    Armar6Skills::ArmarXObjects::HumanAvoidance
+ * @package    armar6_skills::ArmarXObjects::HumanAvoidance
  * @author     Christian R. G. Dreher <c.dreher@kit.edu>
  * @author     Fabian Peller
  * @date       2019
diff --git a/source/RobotAPI/libraries/diffik/GraspTrajectory.cpp b/source/RobotAPI/libraries/diffik/GraspTrajectory.cpp
index 6d76464e94326b8e864ace29ec294d10aff65402..3e6cdff5c28a7a27494e222ce78517abe3d8a5f5 100644
--- a/source/RobotAPI/libraries/diffik/GraspTrajectory.cpp
+++ b/source/RobotAPI/libraries/diffik/GraspTrajectory.cpp
@@ -392,7 +392,7 @@ void GraspTrajectory::writeToFile(const std::string& filename)
 
 GraspTrajectoryPtr GraspTrajectory::ReadFromFile(const grasping::GraspCandidatePtr& cnd)
 {
-    std::string packageName = "Armar6Skills";// cnd->executionHints->graspTrajectoryPackage;
+    std::string packageName = "armar6_skills";// cnd->executionHints->graspTrajectoryPackage;
     armarx::CMakePackageFinder finder(packageName);
     std::string dataDir = finder.getDataDir() + "/" + packageName;
     return GraspTrajectory::ReadFromFile(dataDir + "/motions/grasps/" + cnd->executionHints->graspTrajectoryName + ".xml");