diff --git a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.cpp b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.cpp
index c3380bff11dd73768e9de647d33fe9b139067c86..ae00f7755b5f71eaeaaf7907617d065542f8c612 100644
--- a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.cpp
+++ b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RobotAPI::DebugDrawerTestApp
 * @author     vahrenkamp
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.h b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.h
index 7c054fad7c4c6a0ca809676e87f83319da2224c3..3f8c50bfb1af875c41ce5e236929121a31021b3d 100644
--- a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.h
+++ b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTest.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RobotAPI::DebugDrawerTestApp
 * @author     vahrenkamp
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTestApp.h b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTestApp.h
index 7e62132d17979e2820e80c0e894f928088d75cd8..47686c9267c33184bacc2e70e1ee19c3b66e48cb 100644
--- a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTestApp.h
+++ b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/DebugDrawerTestApp.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RobotAPI::DebugDrawerTestApp
 * @author     vahrenkamp
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/main.cpp b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/main.cpp
index b55cc27cc210ab5713171b3ad5b3aa10148c6d3f..f837e8036f30884b4cffaa3143d51a289366eb10 100644
--- a/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/main.cpp
+++ b/scenarios/tests/DebugDrawerTest/DebugDrawerTestApp/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::DebugDrawerTestApp
  * @author     vahrenkamp
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp
index e70ec49339c10c70f60ed3ba311a9987a03f87a4..103f195414416fdedf8c9b1894f13563c1948217 100644
--- a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp
+++ b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RemoteRobotTestProject::
 * @author     ( at kit dot edu)
 * @date       
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h
index bcdafe56aeb774dcc92204465455b6f2b241a00e..94bf8c14aa4609b4138e9619d51039c858516a6f 100644
--- a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h
+++ b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProject.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RemoteRobotTestProject::
 * @author     ( at kit dot edu)
 * @date       
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h
index a468c295916cf511089b4b0e6f42126c4c902fad..b0b64a6b0117a737ac35dba6756f949c28940a8d 100644
--- a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h
+++ b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/RemoteRobotTestProjectApp.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RemoteRobotTestProject::
 * @author     ( at kit dot edu)
 * @date
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp
index ab3310ce34dd85cafcdc7720a23e97c58a2e0439..aa3e2250ab0b086aad64a442585a347430951fc2 100644
--- a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp
+++ b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/test/RemoteRobotTestProjectTest.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RemoteRobotTestProject::
 * @author     (at kit dot edu)
 * @date       
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/applications/ForceTorqueObserver/ForceTorqueObserverApp.h b/source/RobotAPI/applications/ForceTorqueObserver/ForceTorqueObserverApp.h
index 3695b5b85c3309ff9e6f58571bce1f2ace5d9d85..d1fd84d25423ef685bfb9b845a181206016f84d9 100644
--- a/source/RobotAPI/applications/ForceTorqueObserver/ForceTorqueObserverApp.h
+++ b/source/RobotAPI/applications/ForceTorqueObserver/ForceTorqueObserverApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Kai Welke (weöle dot at kit dot edu)
  * @date       2012
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/ForceTorqueObserver/main.cpp b/source/RobotAPI/applications/ForceTorqueObserver/main.cpp
index af757dcead3461a7e01e90de48f7238899c8727a..f75a56a95de5d3dc42543797a4c5ab4aedd30a2b 100644
--- a/source/RobotAPI/applications/ForceTorqueObserver/main.cpp
+++ b/source/RobotAPI/applications/ForceTorqueObserver/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::ForceTorqueObserver
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/ForceTorqueUnitSimulation/ForceTorqueUnitSimulationApp.h b/source/RobotAPI/applications/ForceTorqueUnitSimulation/ForceTorqueUnitSimulationApp.h
index 6fc70c250aedd1b68b27b0daf6bb5be071a5a00f..3d3d2b8f07e3bdd12bdd8d5df513b2998cd0e982 100644
--- a/source/RobotAPI/applications/ForceTorqueUnitSimulation/ForceTorqueUnitSimulationApp.h
+++ b/source/RobotAPI/applications/ForceTorqueUnitSimulation/ForceTorqueUnitSimulationApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::applications
  * @author     Peter Kaiser
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/ForceTorqueUnitSimulation/main.cpp b/source/RobotAPI/applications/ForceTorqueUnitSimulation/main.cpp
index 398862ed8b6d5b6159043ea6bad6cc5e539ef054..080b5c2c50f0a4571180fecd57aefb5070217e9d 100644
--- a/source/RobotAPI/applications/ForceTorqueUnitSimulation/main.cpp
+++ b/source/RobotAPI/applications/ForceTorqueUnitSimulation/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::ForceTorqueUnitSimulation
  * @author     Peter Kaiser
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/HandUnitSimulation/HandUnitSimulationApp.h b/source/RobotAPI/applications/HandUnitSimulation/HandUnitSimulationApp.h
index d23a2e9cc53330346c3d76572f6017803af8144f..85d5f779a7cf0475556166da3973a4548b255bc8 100644
--- a/source/RobotAPI/applications/HandUnitSimulation/HandUnitSimulationApp.h
+++ b/source/RobotAPI/applications/HandUnitSimulation/HandUnitSimulationApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::HandUnitSimulation
  * @author     David Schiebener ( schiebener at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/HandUnitSimulation/main.cpp b/source/RobotAPI/applications/HandUnitSimulation/main.cpp
index f57ea93e2cf6e4c493ff1fe019b3a03db608b2d4..27de1ec1c24063aac04682f82e99f555ad9f839d 100644
--- a/source/RobotAPI/applications/HandUnitSimulation/main.cpp
+++ b/source/RobotAPI/applications/HandUnitSimulation/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::HandUnitSimulation
  * @author     David Schiebener ( schiebener at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/HapticObserver/HapticObserverApp.h b/source/RobotAPI/applications/HapticObserver/HapticObserverApp.h
index 18cdc19c0ad481c7d5e3eed65710a44db09ef03b..27661c8c5bd795b10dd8aa72e99ccb21496b81d4 100644
--- a/source/RobotAPI/applications/HapticObserver/HapticObserverApp.h
+++ b/source/RobotAPI/applications/HapticObserver/HapticObserverApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::HapticObserver
  * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/HapticObserver/main.cpp b/source/RobotAPI/applications/HapticObserver/main.cpp
index 9c964b02f97c4df0dbca617eae121102eed47910..ca0fdaf45cb5a1e1abc0c923470f1e989b4a6ca8 100644
--- a/source/RobotAPI/applications/HapticObserver/main.cpp
+++ b/source/RobotAPI/applications/HapticObserver/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::HapticObserver
  * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h b/source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h
index b53c006b01f64ee2616ef0529971037a3f3f8bcc..4fad3f0d0cbfe10b956344baf4bf2486c56d6dc5 100644
--- a/source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h
+++ b/source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     David Schiebener (schiebener at kit dot edu)
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/HeadIKUnit/main.cpp b/source/RobotAPI/applications/HeadIKUnit/main.cpp
index 411a5eef168cdd16c4a3f58e69d221139511a585..e919c4a2428af4eda531c5ec684b813044451081 100644
--- a/source/RobotAPI/applications/HeadIKUnit/main.cpp
+++ b/source/RobotAPI/applications/HeadIKUnit/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::HeadIKUnit
  * @author     David Schiebener
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/InertialMeasurementUnitObserver/InertialMeasurementUnitObserverApp.h b/source/RobotAPI/applications/InertialMeasurementUnitObserver/InertialMeasurementUnitObserverApp.h
index 72074243d45559ce2ae94dc67112f895fe42c224..b11a61759294dec3ccfa26ccfdf13a8fcb799f46 100644
--- a/source/RobotAPI/applications/InertialMeasurementUnitObserver/InertialMeasurementUnitObserverApp.h
+++ b/source/RobotAPI/applications/InertialMeasurementUnitObserver/InertialMeasurementUnitObserverApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::InertialMeasurementUnitObserver
  * @author     Markus Grotz ( markus-grotz at web dot de )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/InertialMeasurementUnitObserver/main.cpp b/source/RobotAPI/applications/InertialMeasurementUnitObserver/main.cpp
index 044533ed9550848d3f7a7959069d202cab5da78e..1a293f2ace157ceed9e65912a1197028b4c7ffb2 100644
--- a/source/RobotAPI/applications/InertialMeasurementUnitObserver/main.cpp
+++ b/source/RobotAPI/applications/InertialMeasurementUnitObserver/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::InertialMeasurementUnitObserver
  * @author     Markus Grotz ( markus-grotz at web dot de )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/KinematicUnitObserver/KinematicUnitObserverApp.h b/source/RobotAPI/applications/KinematicUnitObserver/KinematicUnitObserverApp.h
index d137a911de80d56f6ab62e9ef99997a07cef4d74..feb30b46a610959dd46e74d61526ede04448f6d3 100644
--- a/source/RobotAPI/applications/KinematicUnitObserver/KinematicUnitObserverApp.h
+++ b/source/RobotAPI/applications/KinematicUnitObserver/KinematicUnitObserverApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Christian Boege (boege dot at kit dot edu)
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/KinematicUnitObserver/main.cpp b/source/RobotAPI/applications/KinematicUnitObserver/main.cpp
index 522935d1fcc51e55ac045998f3b733b45800b6f7..accfeceb8d206d5851c5aa080314443bb8b708a7 100644
--- a/source/RobotAPI/applications/KinematicUnitObserver/main.cpp
+++ b/source/RobotAPI/applications/KinematicUnitObserver/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core::application::KinematicUnitObserver
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/KinematicUnitSimulation/KinematicUnitSimulationApp.h b/source/RobotAPI/applications/KinematicUnitSimulation/KinematicUnitSimulationApp.h
index 4f309f34a1a3c69387af41c2a0e793a0ef0e416c..d3279b41b84e09153c9f3fa0a9ae4f5f69b8677a 100644
--- a/source/RobotAPI/applications/KinematicUnitSimulation/KinematicUnitSimulationApp.h
+++ b/source/RobotAPI/applications/KinematicUnitSimulation/KinematicUnitSimulationApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Christian Boege (boege at kit dot edu)
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/KinematicUnitSimulation/main.cpp b/source/RobotAPI/applications/KinematicUnitSimulation/main.cpp
index 011187cde79d213adef41f70c5fce12871fa891a..243525eb84e1b320bb7a28a8317ab4e4c849f270 100644
--- a/source/RobotAPI/applications/KinematicUnitSimulation/main.cpp
+++ b/source/RobotAPI/applications/KinematicUnitSimulation/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core::application::KinematicUnitSimulation
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/MMMPlayer/MMMPlayerApp.h b/source/RobotAPI/applications/MMMPlayer/MMMPlayerApp.h
index d5e86d663db83c01c2d01cbe0af162fd70862a1c..ec6ccbc0191ce21e4cb3a53422f7cd6db593df50 100644
--- a/source/RobotAPI/applications/MMMPlayer/MMMPlayerApp.h
+++ b/source/RobotAPI/applications/MMMPlayer/MMMPlayerApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::MMMPlayer
  * @author     Mirko Waechter ( mirko dot waechter at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/MMMPlayer/main.cpp b/source/RobotAPI/applications/MMMPlayer/main.cpp
index d4af2864a9ec57e5d07fc541d32ecdee5be10a64..da1c3893b3192d218bca51df0f5c333cc1dc9f4a 100644
--- a/source/RobotAPI/applications/MMMPlayer/main.cpp
+++ b/source/RobotAPI/applications/MMMPlayer/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::MMMPlayer
  * @author     Mirko Waechter ( mirko dot waechter at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/PlatformUnitObserver/PlatformUnitObserverApp.h b/source/RobotAPI/applications/PlatformUnitObserver/PlatformUnitObserverApp.h
index 0d5e35efb57714ace17253757c7823c1891ea5ec..846d3c57df3e4ee086559996f5cdefdb2e794322 100644
--- a/source/RobotAPI/applications/PlatformUnitObserver/PlatformUnitObserverApp.h
+++ b/source/RobotAPI/applications/PlatformUnitObserver/PlatformUnitObserverApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Manfred Kroehnert (manfred dot kroehnert at kit dot edu)
  * @date       2013
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/PlatformUnitObserver/main.cpp b/source/RobotAPI/applications/PlatformUnitObserver/main.cpp
index 0cf7439e8cbc828621a8a779eebe83ddf37b515d..a3e52e8ed2ab320c498d3ea43b913f8a1cff66cd 100644
--- a/source/RobotAPI/applications/PlatformUnitObserver/main.cpp
+++ b/source/RobotAPI/applications/PlatformUnitObserver/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core::application::PlatformUnitObserver
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/PlatformUnitSimulation/PlatformUnitSimulationApp.h b/source/RobotAPI/applications/PlatformUnitSimulation/PlatformUnitSimulationApp.h
index e6d3413867293a4f3eda4c87f7e892294cac24b7..3d58e699ed101e60c3cd33ed746fba07122933a1 100644
--- a/source/RobotAPI/applications/PlatformUnitSimulation/PlatformUnitSimulationApp.h
+++ b/source/RobotAPI/applications/PlatformUnitSimulation/PlatformUnitSimulationApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     tobias haass
  * @date       2013
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/PlatformUnitSimulation/main.cpp b/source/RobotAPI/applications/PlatformUnitSimulation/main.cpp
index 38def62421b6ce6d00e01b4d97ea4ca5896aeefb..3a2ff9ecf98e3565b84926cc8dcf41d5a2d7e7bc 100644
--- a/source/RobotAPI/applications/PlatformUnitSimulation/main.cpp
+++ b/source/RobotAPI/applications/PlatformUnitSimulation/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core::application::PlatformUnitSimulation
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/RobotControl/RobotControlApp.h b/source/RobotAPI/applications/RobotControl/RobotControlApp.h
index 807c360d35e635ff0678f69e9f5a3d9567664ff0..884072e4a3b8d98837daf0b2fee14acd0b8a3275 100644
--- a/source/RobotAPI/applications/RobotControl/RobotControlApp.h
+++ b/source/RobotAPI/applications/RobotControl/RobotControlApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Kai Welke (weöle dot at kit dot edu)
  * @date       2012
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/RobotControl/main.cpp b/source/RobotAPI/applications/RobotControl/main.cpp
index 4c0762f3778a57703878ea9866bf1a6de4a80029..8ff8a5db87d5049bc35667f2b376a4844e8819e7 100644
--- a/source/RobotAPI/applications/RobotControl/main.cpp
+++ b/source/RobotAPI/applications/RobotControl/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core::application::RobotControl
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/RobotControlUI/RobotControlUI.cpp b/source/RobotAPI/applications/RobotControlUI/RobotControlUI.cpp
index fbea2177a66188015f77941b31c74fb061e081eb..75d5d8cd8d8c4f4ad3f346e9d1f9d3c52ad34730 100644
--- a/source/RobotAPI/applications/RobotControlUI/RobotControlUI.cpp
+++ b/source/RobotAPI/applications/RobotControlUI/RobotControlUI.cpp
@@ -2,23 +2,22 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public LIcense as
- * published by the Free Software Foundation; either version 2 of
- * the LIcense, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public LIcense for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public LIcense
- * along with this program. If not, see <http://www.gnu.org/lIcenses/>.
+ * 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    ArmarX::Applications
  * @author     Jan Issac (jan dot issac at gmx dot net)
  * @date       2011
- * @copyright  http://www.gnu.org/lIcenses/gpl-2.0.txt
- *             GNU General Public LIcense
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
+ *             GNU General Public License
  */
 
 #include "RobotControlUI.h"
diff --git a/source/RobotAPI/applications/RobotControlUI/RobotControlUI.h b/source/RobotAPI/applications/RobotControlUI/RobotControlUI.h
index 742484ae7e3c1a328033997103ab459cd81350b7..8f6d223becf456e4c59557a67338e46c78f9310f 100644
--- a/source/RobotAPI/applications/RobotControlUI/RobotControlUI.h
+++ b/source/RobotAPI/applications/RobotControlUI/RobotControlUI.h
@@ -2,23 +2,22 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public LIcense as
- * published by the Free Software Foundation; either version 2 of
- * the LIcense, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public LIcense for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public LIcense
- * along with this program. If not, see <http://www.gnu.org/lIcenses/>.
+ * 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    ArmarX::Applications
  * @author     Jan Issac (jan dot issac at gmx dot net)
  * @date       2011
- * @copyright  http://www.gnu.org/lIcenses/gpl-2.0.txt
- *             GNU General Public LIcense
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
+ *             GNU General Public License
  */
 
 #ifndef _ARMARX_SIMPLECOMPONENTTEST_H
diff --git a/source/RobotAPI/applications/RobotControlUI/RobotControlUIApp.h b/source/RobotAPI/applications/RobotControlUI/RobotControlUIApp.h
index 66749c37d4b0a9653937752dc9af33034416833a..c596c983d5463d63b897f1e145d4b78382e68865 100644
--- a/source/RobotAPI/applications/RobotControlUI/RobotControlUIApp.h
+++ b/source/RobotAPI/applications/RobotControlUI/RobotControlUIApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Kai Welke (weöle dot at kit dot edu)
  * @date       2012
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/RobotControlUI/main.cpp b/source/RobotAPI/applications/RobotControlUI/main.cpp
index 9069e45566be2b23137e035041d9f6bb8f48a611..dca188e23dd8c529da34f498356ee8098a09cc3c 100644
--- a/source/RobotAPI/applications/RobotControlUI/main.cpp
+++ b/source/RobotAPI/applications/RobotControlUI/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core::application::RobotControlUI
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h b/source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h
index 0de010ef3b2e1692749f5150ac11da72241c1d9b..afab04d494e52d6d95bcb935f33c93bc26fd43f8 100644
--- a/source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h
+++ b/source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RobotStateComponent::
 * @author     ( at kit dot edu)
 * @date
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/applications/RobotStateComponent/main.cpp b/source/RobotAPI/applications/RobotStateComponent/main.cpp
index eb59409e1892462dad75f9255e926f28844825d8..2966ad88097e52a83f9b0b48d78371857e9963b0 100644
--- a/source/RobotAPI/applications/RobotStateComponent/main.cpp
+++ b/source/RobotAPI/applications/RobotStateComponent/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core::application::RobotStateComponent
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/RobotStateObserver/RobotStateObserverApp.h b/source/RobotAPI/applications/RobotStateObserver/RobotStateObserverApp.h
index b1672bc1ed6c034e8bf474894c3629c120e87806..f641c2f3b6ac1ba7ea6022684cf6c96f8424ee45 100644
--- a/source/RobotAPI/applications/RobotStateObserver/RobotStateObserverApp.h
+++ b/source/RobotAPI/applications/RobotStateObserver/RobotStateObserverApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Kai Welke (welke dot at kit dot edu)
  * @date       2012
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/RobotStateObserver/main.cpp b/source/RobotAPI/applications/RobotStateObserver/main.cpp
index 8d62855d7e53aab1f47399c4ffd53adfb6daee0f..c57020dfa7cd60c3132118a1bf67052beb278d3f 100644
--- a/source/RobotAPI/applications/RobotStateObserver/main.cpp
+++ b/source/RobotAPI/applications/RobotStateObserver/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core::application::RobotStateObserver
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/TCPControlUnit/TCPControlUnitApp.h b/source/RobotAPI/applications/TCPControlUnit/TCPControlUnitApp.h
index f94b6c3af5610510b250b4388e2f60efb461b415..c1560f9c356e9c17574934320a7f569edbe7680c 100644
--- a/source/RobotAPI/applications/TCPControlUnit/TCPControlUnitApp.h
+++ b/source/RobotAPI/applications/TCPControlUnit/TCPControlUnitApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Kai Welke (weöle dot at kit dot edu)
  * @date       2012
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/TCPControlUnit/main.cpp b/source/RobotAPI/applications/TCPControlUnit/main.cpp
index 9e0cceb0631b26630b2c01c3745a4ca69d18738a..941b7017ba23ae1ed5a7dfe963ded261ccffd019 100644
--- a/source/RobotAPI/applications/TCPControlUnit/main.cpp
+++ b/source/RobotAPI/applications/TCPControlUnit/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::TCPControlUnit
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/WeissHapticUnit/WeissHapticUnitApp.h b/source/RobotAPI/applications/WeissHapticUnit/WeissHapticUnitApp.h
index 861cac6313b6e50f79ee963986ade85720236548..21d421af42808c8f07035835cef6ffafce438025 100644
--- a/source/RobotAPI/applications/WeissHapticUnit/WeissHapticUnitApp.h
+++ b/source/RobotAPI/applications/WeissHapticUnit/WeissHapticUnitApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::WeissHapticUnit
  * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/WeissHapticUnit/main.cpp b/source/RobotAPI/applications/WeissHapticUnit/main.cpp
index 489a7c566f15d814c1841334d3e4dbf404fafe11..e627759fca862ba748105456b459d6e8da9e7d69 100644
--- a/source/RobotAPI/applications/WeissHapticUnit/main.cpp
+++ b/source/RobotAPI/applications/WeissHapticUnit/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::WeissHapticUnit
  * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/XsensIMU/XsensIMUApp.h b/source/RobotAPI/applications/XsensIMU/XsensIMUApp.h
index e1d02c57654832f567326d408dc0ad6b4499a78f..fd3630c57ed183c5dfe4e27b9a32a1cfc8e68ad9 100644
--- a/source/RobotAPI/applications/XsensIMU/XsensIMUApp.h
+++ b/source/RobotAPI/applications/XsensIMU/XsensIMUApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::XsensIMU
  * @author     Markus Grotz ( markus-grotz at web dot de )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/XsensIMU/main.cpp b/source/RobotAPI/applications/XsensIMU/main.cpp
index 5262ce5b4155b16b0c7e79ad0f4e41ff8bf5ac65..d1a482c9f534cb79d5ecc7022b7cb6502c3794ff 100644
--- a/source/RobotAPI/applications/XsensIMU/main.cpp
+++ b/source/RobotAPI/applications/XsensIMU/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::XsensIMU
  * @author     Markus Grotz ( markus-grotz at web dot de )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/deprecated/MotionControl/MotionControlApp.h b/source/RobotAPI/applications/deprecated/MotionControl/MotionControlApp.h
index 86197e708b697633a933a1142504bd02d87c75db..29a437ebaedd7e511e83b26f05880e3a169eb14f 100644
--- a/source/RobotAPI/applications/deprecated/MotionControl/MotionControlApp.h
+++ b/source/RobotAPI/applications/deprecated/MotionControl/MotionControlApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Kai Welke (weöle dot at kit dot edu)
  * @date       2012
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/deprecated/MotionControl/main.cpp b/source/RobotAPI/applications/deprecated/MotionControl/main.cpp
index afd9efeeb50df016f39db5ed0fadfeae75f533e5..221c3c39cae5ebd4ba14fdca409ea3a4a31282e9 100644
--- a/source/RobotAPI/applications/deprecated/MotionControl/main.cpp
+++ b/source/RobotAPI/applications/deprecated/MotionControl/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::MotionControl
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/deprecated/MotionControlTest/MotionControlTestApp.h b/source/RobotAPI/applications/deprecated/MotionControlTest/MotionControlTestApp.h
index 6e6a986a218ff403caee1ba683a97004c4df682e..fb8021dd3901e16c7d040a003d4940543e33c007 100644
--- a/source/RobotAPI/applications/deprecated/MotionControlTest/MotionControlTestApp.h
+++ b/source/RobotAPI/applications/deprecated/MotionControlTest/MotionControlTestApp.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::applications
  * @author     Kai Welke (weöle dot at kit dot edu)
  * @date       2012
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/deprecated/MotionControlTest/main.cpp b/source/RobotAPI/applications/deprecated/MotionControlTest/main.cpp
index 423eb36a7473faf81a5cbf8037d1a8dfce03f85e..d6c5b5587217d77cf4d09da44e924780a5b7dddf 100644
--- a/source/RobotAPI/applications/deprecated/MotionControlTest/main.cpp
+++ b/source/RobotAPI/applications/deprecated/MotionControlTest/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::application::MotionControlTest
  * @author     Manfred Kroehnert
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/RobotIKApp.h b/source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/RobotIKApp.h
index 3b9bf06d428aa87989081e1ca9d682b367451cbd..4b30dc3ead8d8545bed545e69bb56e24dec6f04d 100644
--- a/source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/RobotIKApp.h
+++ b/source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/RobotIKApp.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RobotAPI::RobotIK
 * @author     ( joshua dot haustein at gmail dot com)
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/main.cpp b/source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/main.cpp
index 61a3cd99e1d1f2f27b1e6740ad33c026741a90c3..18b3ad25f9a17f19a237e9479266a65aaceaa846 100644
--- a/source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/main.cpp
+++ b/source/RobotAPI/applications/moved_to_robotcomponents_RobotIK/main.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::applications::RobotIK
  * @author     Joshua Haustein
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
index 8e98cacf11f6400bf5c1c0d0b98cc32db9b56dd4..88a4f451f093120c9879d29e05432e4195f83c87 100644
--- a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
+++ b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -18,7 +17,7 @@
  * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu )
  * @author     Peter Kaiser ( peter dot kaiser at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
index daa8c538befcf8342955237c974bce055bb20e4b..0ccd7836f79902f2cabe4021d8e89adeda37c606 100644
--- a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
+++ b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -18,7 +17,7 @@
  * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu )
  * @author     Peter Kaiser ( peter dot kaiser at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/RobotState/RobotStateComponent.cpp b/source/RobotAPI/components/RobotState/RobotStateComponent.cpp
index 43d48dd03a6b5ffc39d546702062131643da2506..f5220eb3ac826a67c60b6643b65e5ee09348ab7d 100644
--- a/source/RobotAPI/components/RobotState/RobotStateComponent.cpp
+++ b/source/RobotAPI/components/RobotState/RobotStateComponent.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotStateComponent::
  * @author     ( at kit dot edu)
  * @date
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/RobotState/RobotStateComponent.h b/source/RobotAPI/components/RobotState/RobotStateComponent.h
index 75b3eafe7f1391c23a731a582daac8d7504ee66b..e3c8db3ea6b38a78b4ce81b6abfe8ace93f5538e 100644
--- a/source/RobotAPI/components/RobotState/RobotStateComponent.h
+++ b/source/RobotAPI/components/RobotState/RobotStateComponent.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotStateComponent::
  * @author     ( stefan dot ulbrich at kit dot edu)
  * @date
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/MMMPlayer.cpp b/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/MMMPlayer.cpp
index 097507fdc5f63e70ebeeb71583e8d5c4cb7b72e9..9fa8881c5c520e8b30e85c657f45d28fd72f557f 100644
--- a/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/MMMPlayer.cpp
+++ b/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/MMMPlayer.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::MMMPlayer
  * @author     Mirko Waechter ( mirko dot waechter at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/MMMPlayer.h b/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/MMMPlayer.h
index ed5f3d8437fa5815b8e9bd0afe745ff899deb183..99c8e44e608f73f76d895018447eb17bf63b90f0 100644
--- a/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/MMMPlayer.h
+++ b/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/MMMPlayer.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::MMMPlayer
  * @author     Mirko Waechter ( mirko dot waechter at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/test/MMMPlayerTest.cpp b/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/test/MMMPlayerTest.cpp
index 326edd5156a723b5b205d7a29ec561e2d2f18e6d..0e8c7269d24e039b321b5b65bfb132490aeca3e7 100644
--- a/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/test/MMMPlayerTest.cpp
+++ b/source/RobotAPI/components/moved_to_robotcomponents_MMMPlayer/test/MMMPlayerTest.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::MMMPlayer
  * @author     Mirko Waechter ( mirko dot waechter at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/RobotIK.cpp b/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/RobotIK.cpp
index 3b5881c568d3838e338381b464ad8737a0cec36c..a1d749b65c2c29d582645eb4a5af3efef11025ad 100644
--- a/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/RobotIK.cpp
+++ b/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/RobotIK.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::RobotIK
  * @author     Joshua Haustein ( joshua dot haustein at gmail dot com )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/RobotIK.h b/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/RobotIK.h
index 908490b59025685575e838915ed5406f655b47fe..80dba68e295b073b6dcce8ac686dec027a254b6b 100644
--- a/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/RobotIK.h
+++ b/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/RobotIK.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::RobotIK
  * @author     Joshua Haustein ( joshua dot haustein at gmail dot com )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/test/RobotIKTest.cpp b/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/test/RobotIKTest.cpp
index 532c8e5795786921aa2f541aaaeeff109c5209b7..07c776c74e6f4674509db2da8b50335b01a242bd 100644
--- a/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/test/RobotIKTest.cpp
+++ b/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/test/RobotIKTest.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::RobotIK
  * @author     Joshua Haustein ( joshua dot haustein at gmail dot com )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/test/RobotIKTestEnvironment.h b/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/test/RobotIKTestEnvironment.h
index f8dbd715c8c5920ec58650c161b8c676bac45f6f..c49073606bf38792a62c08f1b297a7861a8a213b 100644
--- a/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/test/RobotIKTestEnvironment.h
+++ b/source/RobotAPI/components/moved_to_robotcomponents_RobotIK/test/RobotIKTestEnvironment.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    RobotAPI::ArmarXObjects::RobotIKTestEnvironment
 * @author     Joshua Haustein ( joshua dot haustein at gmail dot com)
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/components/units/BusInspectionUnit.cpp b/source/RobotAPI/components/units/BusInspectionUnit.cpp
index 20506415423cfeba683533a9d2b4d267c5694e46..30acee8e89df979ae920eb8d78f393cdb1e414b6 100644
--- a/source/RobotAPI/components/units/BusInspectionUnit.cpp
+++ b/source/RobotAPI/components/units/BusInspectionUnit.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core
  * @author     Matthias Hadlich (matthias dot hadlich at student dot kit dot edu)
  * @copyright  2014 Matthias Hadlich
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/BusInspectionUnit.h b/source/RobotAPI/components/units/BusInspectionUnit.h
index ecc85c493fb21d3b891701e2611bbe095ceee93a..668d80518f781b00a4ef73c3e255bb02870cc4ca 100644
--- a/source/RobotAPI/components/units/BusInspectionUnit.h
+++ b/source/RobotAPI/components/units/BusInspectionUnit.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    Core
  * @author     Matthias Hadlich (matthias dot hadlich at student dot kit dot edu)
  * @copyright  2014 Matthias Hadlich
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/ForceTorqueObserver.cpp b/source/RobotAPI/components/units/ForceTorqueObserver.cpp
index 3604bd4b903151770e4e96d7cc57dbec8c625792..85634e8f6d28ac6f15b127260ac40b9f20353ac2 100644
--- a/source/RobotAPI/components/units/ForceTorqueObserver.cpp
+++ b/source/RobotAPI/components/units/ForceTorqueObserver.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2013
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/components/units/ForceTorqueObserver.h b/source/RobotAPI/components/units/ForceTorqueObserver.h
index 43068961f7a1d866353f8a8575f965935a8d0161..d64ba77c16c918ff51d101d1df4a1d336c396f3c 100644
--- a/source/RobotAPI/components/units/ForceTorqueObserver.h
+++ b/source/RobotAPI/components/units/ForceTorqueObserver.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2013
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/components/units/ForceTorqueUnit.cpp b/source/RobotAPI/components/units/ForceTorqueUnit.cpp
index dd18a056d60b74988898c824235960f98f731c11..38684050cbb157d1e6e6be9770714f75426ed3ef 100644
--- a/source/RobotAPI/components/units/ForceTorqueUnit.cpp
+++ b/source/RobotAPI/components/units/ForceTorqueUnit.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Peter Kaiser <peter dot kaiser at kit dot edu>
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/ForceTorqueUnit.h b/source/RobotAPI/components/units/ForceTorqueUnit.h
index 7205161a042c0e655fd8db64c11420cc6f11a3f1..947a4b60431ec9731130476dd58e65d0a706d670 100644
--- a/source/RobotAPI/components/units/ForceTorqueUnit.h
+++ b/source/RobotAPI/components/units/ForceTorqueUnit.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Peter Kaiser <peter dot kaiser at kit dot edu>
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/ForceTorqueUnitSimulation.cpp b/source/RobotAPI/components/units/ForceTorqueUnitSimulation.cpp
index 42fb1c8ba4bdc24bd7bdd8fe10bb49b8f970d6ec..6b0330f628e0d0b94ee2d0f3c99b7b0aeebcdb72 100644
--- a/source/RobotAPI/components/units/ForceTorqueUnitSimulation.cpp
+++ b/source/RobotAPI/components/units/ForceTorqueUnitSimulation.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::units
  * @author     Peter Kaiser (peter dot kaiser at kit dot edu)
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/ForceTorqueUnitSimulation.h b/source/RobotAPI/components/units/ForceTorqueUnitSimulation.h
index a8e983d0442446ceec540befe82247afd55072ca..12c499a6d3057355c5e5e470231a67dfcb9776e9 100644
--- a/source/RobotAPI/components/units/ForceTorqueUnitSimulation.h
+++ b/source/RobotAPI/components/units/ForceTorqueUnitSimulation.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::units
  * @author     Peter Kaiser (peter dot kaiser at kit dot edu)
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/HandUnit.cpp b/source/RobotAPI/components/units/HandUnit.cpp
index cabbf0b3d24ccba6a28f67024906b2ce339d3d01..73d02c74a9a5a1329a00af40be6187e4559159b0 100644
--- a/source/RobotAPI/components/units/HandUnit.cpp
+++ b/source/RobotAPI/components/units/HandUnit.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Manfred Kroehnert (Manfred dot Kroehnert at kit dot edu)
  * @date       2013
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/HandUnit.h b/source/RobotAPI/components/units/HandUnit.h
index 628be637ac7ed7e36b8062fe599cabb977747bb7..d68c4f5f7f6002ca722ae4a55c2c016f7a528dde 100644
--- a/source/RobotAPI/components/units/HandUnit.h
+++ b/source/RobotAPI/components/units/HandUnit.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Manfred Kroehnert (manfred dot kroehnert at kit dot edu)
  * @date       2013
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/HandUnitSimulation.cpp b/source/RobotAPI/components/units/HandUnitSimulation.cpp
index 2b18416f7b6ac0f721f5b376520031ceaef2f8b4..c6e8e534b3f34b0df3625616cac62cf0a24ed31f 100644
--- a/source/RobotAPI/components/units/HandUnitSimulation.cpp
+++ b/source/RobotAPI/components/units/HandUnitSimulation.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     David Schiebener (schiebener at kit dot edu)
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/HandUnitSimulation.h b/source/RobotAPI/components/units/HandUnitSimulation.h
index 36a4d8a8359e500c21cc65bbb2f4c4369b6a328e..74d5aefa29d3b5cf6c3307355cbd29fc251043fd 100644
--- a/source/RobotAPI/components/units/HandUnitSimulation.h
+++ b/source/RobotAPI/components/units/HandUnitSimulation.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     David Schiebener (schiebener at kit dot edu)
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/HapticObserver.h b/source/RobotAPI/components/units/HapticObserver.h
index da07ed5b559a36b4182c375ca55658227305873b..6a73f77c9bbf43ae5c0eb2fdab2009899d2a2b28 100644
--- a/source/RobotAPI/components/units/HapticObserver.h
+++ b/source/RobotAPI/components/units/HapticObserver.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Peter Kaiser <peter dot kaiser at kit dot edu>
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/HapticUnit.cpp b/source/RobotAPI/components/units/HapticUnit.cpp
index aef0f4e890a05766782217b1ccdcc5b08caf6437..584b430430c5662c9e02cae02d8e4369b346b3c7 100644
--- a/source/RobotAPI/components/units/HapticUnit.cpp
+++ b/source/RobotAPI/components/units/HapticUnit.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Peter Kaiser <peter dot kaiser at kit dot edu>
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/HapticUnit.h b/source/RobotAPI/components/units/HapticUnit.h
index 0a2e7468060196392a80a350a6ccc1609392a615..a5837e80024d9afece25ba2e8334ba81b7a32175 100644
--- a/source/RobotAPI/components/units/HapticUnit.h
+++ b/source/RobotAPI/components/units/HapticUnit.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Peter Kaiser <peter dot kaiser at kit dot edu>
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/HeadIKUnit.h b/source/RobotAPI/components/units/HeadIKUnit.h
index 69f0356fbd427d3ba82ee889bfcb58ad2b7bbc07..0805fd78086eddc33e87e2b5c4bd49e71a112049 100644
--- a/source/RobotAPI/components/units/HeadIKUnit.h
+++ b/source/RobotAPI/components/units/HeadIKUnit.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     David Schiebener ( schiebener at kit dot edu)
 * @date       2014
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/components/units/InertialMeasurementUnit.cpp b/source/RobotAPI/components/units/InertialMeasurementUnit.cpp
index 672f856d35c99fa1c63b1e63c1981a98bf8c3154..d0f0b1d30096fba8673df04cb2d031c14bc57cfe 100644
--- a/source/RobotAPI/components/units/InertialMeasurementUnit.cpp
+++ b/source/RobotAPI/components/units/InertialMeasurementUnit.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::InertialMeasurementUnit
  * @author     Markus Grotz ( markus-grotz at web dot de )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/InertialMeasurementUnit.h b/source/RobotAPI/components/units/InertialMeasurementUnit.h
index 383fb0cf6c60f5e10bb86b287f7482bfb6d7ac14..9dec375d78f069a9cf5710e710bee06b1393e507 100644
--- a/source/RobotAPI/components/units/InertialMeasurementUnit.h
+++ b/source/RobotAPI/components/units/InertialMeasurementUnit.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::InertialMeasurementUnit
  * @author     Markus Grotz ( markus-grotz at web dot de )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/InertialMeasurementUnitObserver.h b/source/RobotAPI/components/units/InertialMeasurementUnitObserver.h
index 740543b32e1e8ebaf3182c7aeadb5c1fa39e8c5c..a19daa9851108c60a63d991c61cc62bf24cdd5e7 100644
--- a/source/RobotAPI/components/units/InertialMeasurementUnitObserver.h
+++ b/source/RobotAPI/components/units/InertialMeasurementUnitObserver.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::units
  * @author     David Schiebener <schiebener at kit dot edu>
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/KinematicUnit.cpp b/source/RobotAPI/components/units/KinematicUnit.cpp
index 39957f4ddd9efde378fa07ac23026daa45e3dd07..e6de3483d47f4f83f2b6cbce3a3e752478bb6f6d 100644
--- a/source/RobotAPI/components/units/KinematicUnit.cpp
+++ b/source/RobotAPI/components/units/KinematicUnit.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Christian Boege (boege at kit dot edu)
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/KinematicUnit.h b/source/RobotAPI/components/units/KinematicUnit.h
index d01ae541835ff2f80c8d4204e3693c0176b08ada..5a94b5a6717c8da81e4d9ee37b56476a96ed9336 100644
--- a/source/RobotAPI/components/units/KinematicUnit.h
+++ b/source/RobotAPI/components/units/KinematicUnit.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Christian Boege (boege at kit dot edu)
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/KinematicUnitObserver.cpp b/source/RobotAPI/components/units/KinematicUnitObserver.cpp
index 827d14d4fd72f0cbb8f5bc1c84598ddda546166a..f940879f99083b494d917cdff63b2fd5a2f6a4d7 100644
--- a/source/RobotAPI/components/units/KinematicUnitObserver.cpp
+++ b/source/RobotAPI/components/units/KinematicUnitObserver.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/components/units/KinematicUnitObserver.h b/source/RobotAPI/components/units/KinematicUnitObserver.h
index e7e0caecb4d6db1ead4220fec1a4d58d0e82ea3e..bb772980ad212758c097273d5d052e0f744ff82f 100644
--- a/source/RobotAPI/components/units/KinematicUnitObserver.h
+++ b/source/RobotAPI/components/units/KinematicUnitObserver.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/components/units/KinematicUnitSimulation.cpp b/source/RobotAPI/components/units/KinematicUnitSimulation.cpp
index b631b9f960c43df1cc0dffd2a6c72608aac988a9..fce1e50257f0796706de3f64f237f59bb0fd2f7a 100644
--- a/source/RobotAPI/components/units/KinematicUnitSimulation.cpp
+++ b/source/RobotAPI/components/units/KinematicUnitSimulation.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Christian Boege (boege at kit dot edu)
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/KinematicUnitSimulation.h b/source/RobotAPI/components/units/KinematicUnitSimulation.h
index df5db59b844e677e4fc99a95cd8348ba548da23c..ece22420037000179824d457208bb8a9b84d6159 100644
--- a/source/RobotAPI/components/units/KinematicUnitSimulation.h
+++ b/source/RobotAPI/components/units/KinematicUnitSimulation.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Christian Boege (boege dot at kit dot edu)
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/PlatformUnit.cpp b/source/RobotAPI/components/units/PlatformUnit.cpp
index 7e0273357c3aa8010006abdfc910ff77c809f330..cb244890358ad29214c761e9cb09a4f862719f2e 100644
--- a/source/RobotAPI/components/units/PlatformUnit.cpp
+++ b/source/RobotAPI/components/units/PlatformUnit.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Manfred Kroehnert (Manfred dot Kroehnert at kit dot edu)
  * @date       2013
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/PlatformUnit.h b/source/RobotAPI/components/units/PlatformUnit.h
index 0b35fa5966ec9d4c799568c0fdfc365f8a1746f2..1d46043a134842fcb8415ac86d126f828852aa05 100644
--- a/source/RobotAPI/components/units/PlatformUnit.h
+++ b/source/RobotAPI/components/units/PlatformUnit.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Manfred Kroehnert (Manfred dot Kroehnert at kit dot edu)
  * @date       2013
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/PlatformUnitObserver.cpp b/source/RobotAPI/components/units/PlatformUnitObserver.cpp
index d0cbf1da48c440f5b99fc317f28562f16d6fae6d..8b9d63b0623f6a05943f97d2e3a649cddfabe237 100644
--- a/source/RobotAPI/components/units/PlatformUnitObserver.cpp
+++ b/source/RobotAPI/components/units/PlatformUnitObserver.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/components/units/PlatformUnitObserver.h b/source/RobotAPI/components/units/PlatformUnitObserver.h
index 30c3e93436e33850877fcefc8e9cb4f410c432fe..b1a9649839fb588af50c62f0c06e9d4d95909b76 100644
--- a/source/RobotAPI/components/units/PlatformUnitObserver.h
+++ b/source/RobotAPI/components/units/PlatformUnitObserver.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/components/units/PlatformUnitSimulation.cpp b/source/RobotAPI/components/units/PlatformUnitSimulation.cpp
index 44c57e54a17ec4cefa57370407425351995ed97c..dd76eba8164aec7d3ddf88f2fc71e19584273d00 100644
--- a/source/RobotAPI/components/units/PlatformUnitSimulation.cpp
+++ b/source/RobotAPI/components/units/PlatformUnitSimulation.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Christian Boege (boege at kit dot edu)
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/PlatformUnitSimulation.h b/source/RobotAPI/components/units/PlatformUnitSimulation.h
index 9c0d081ba7a8bbc5922f6398d27010d624c66e0d..8724c8000032e36a28f9dd70cd7db8b2b65232a3 100644
--- a/source/RobotAPI/components/units/PlatformUnitSimulation.h
+++ b/source/RobotAPI/components/units/PlatformUnitSimulation.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarXCore::units
  * @author     Christian Boege (boege dot at kit dot edu)
  * @date       2011
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/components/units/SensorActorUnit.cpp b/source/RobotAPI/components/units/SensorActorUnit.cpp
index eb4b644573b690bcf204244d665ec21f149e8cf4..7565ca674be7b575ce0c6d39dac1a260e225c637 100644
--- a/source/RobotAPI/components/units/SensorActorUnit.cpp
+++ b/source/RobotAPI/components/units/SensorActorUnit.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/components/units/SensorActorUnit.h b/source/RobotAPI/components/units/SensorActorUnit.h
index d0ee55d63d52892efe26a5a5767bbfcfd23fda71..8c82ff86271221d5a0156b04295a350852b5bb86 100644
--- a/source/RobotAPI/components/units/SensorActorUnit.h
+++ b/source/RobotAPI/components/units/SensorActorUnit.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/components/units/TCPControlUnit.cpp b/source/RobotAPI/components/units/TCPControlUnit.cpp
index e052b9c5d5eeb601b683628c06ed7aa8a9b97053..43242f839b62ddb3096e26f0e1dd907c0b187bd4 100644
--- a/source/RobotAPI/components/units/TCPControlUnit.cpp
+++ b/source/RobotAPI/components/units/TCPControlUnit.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2013
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/components/units/TCPControlUnit.h b/source/RobotAPI/components/units/TCPControlUnit.h
index dbc5b8f95bc9922a4c80e07bf9dd34e2ab5eca65..6b585979dd667e4b50118375038a421c82c7fd71 100644
--- a/source/RobotAPI/components/units/TCPControlUnit.h
+++ b/source/RobotAPI/components/units/TCPControlUnit.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter (mirko.waechter at kit dot edu)
 * @date       2013
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/components/units/TCPControlUnitObserver.cpp b/source/RobotAPI/components/units/TCPControlUnitObserver.cpp
index 83b9bdee945d5afc0e2597c0048769475a4c8345..b8931ef7067d08c18b77ca8f60a6106d0851c81f 100644
--- a/source/RobotAPI/components/units/TCPControlUnitObserver.cpp
+++ b/source/RobotAPI/components/units/TCPControlUnitObserver.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2013
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/components/units/TCPControlUnitObserver.h b/source/RobotAPI/components/units/TCPControlUnitObserver.h
index 383b49d498ab04963bdb1d19c38aff9ae7cea40b..ac8a6bbae10f6fda3ea0eb24a2967d6f0b1233d3 100644
--- a/source/RobotAPI/components/units/TCPControlUnitObserver.h
+++ b/source/RobotAPI/components/units/TCPControlUnitObserver.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2013
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 #ifndef _ARMARX_TCPCONTROLUNITOBSERVER_H
diff --git a/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.cpp b/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.cpp
index 831e9b33631f98dd92cdad52cf84ef059a6b74c6..b99d8db65ae5697043cc5f89503956abe30af4d9 100644
--- a/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.cpp
+++ b/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.h b/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.h
index 8c70df47c0689e180db46b96a72b09ec27b832af..df5a39243cd9604b7325e07449395c597e124c97 100644
--- a/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.h
+++ b/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h b/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h
index 0dac13c97174d71ab84f5c47ec6aef3fbed2e60a..931d4713d853d750836129f5c221a937819efa84 100644
--- a/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Component::ObjectExaminerGuiPlugin
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @copyright  2012
-* @license    http://www.gnu.org/licenses/gpl.txt
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
diff --git a/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitConfigDialog.cpp b/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitConfigDialog.cpp
index 55aefcec1a51f80f8fda01b5a69d70936f58f859..155b2cfd68483560b1c6f04f33b9df98482513bb 100644
--- a/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitConfigDialog.cpp
+++ b/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitConfigDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitConfigDialog.h b/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitConfigDialog.h
index 1e7f3f94ae20a38593e6104f74dec8b20f9f2f63..2b34936eb3fb5e9d2065fe18a2fb60612c7c6b76 100644
--- a/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitConfigDialog.h
+++ b/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitConfigDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h b/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h
index 190e5b59bb614fe14bf12f5c01ffdf8cf7800615..21e5c7781931a923265e2308963e59c2c9e212ce 100644
--- a/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Component::ObjectExaminerGuiPlugin
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @copyright  2012
-* @license    http://www.gnu.org/licenses/gpl.txt
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp
index bb428b13c33bb4f1a9d1ddd50ad29aa5ffc61e9b..03ed91cef871b53d259d73e3069fb2bda696522b 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h
index 58103d9cc40ad1b73d8334305d47922767192396..4a0e95672ef50d4975dbafa3e6ab5ea1455d1817 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
index d0e576751b6450fe855a25170466d13815b6481f..8dae7b5fbc3d11f821f4c44b2669b5515a02649d 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Component::KinematicUnitGuiPlugin
 * @author     Christian Boege <boege at kit dot edu>
 * @copyright  2011 Christian Böge
-* @license    http://www.gnu.org/licenses/gpl.txt
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
diff --git a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.cpp b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.cpp
index 756c9cc1128483ddab954686a56d0419e5676c1f..daf1249859979b0ab98ca78f7dc8ba036b4e940f 100644
--- a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.cpp
+++ b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.h b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.h
index 314574da82db8d4e46a372c03c6df2e9be86e967..1cb33441f443875c817e96a36ea0e188918a2a33 100644
--- a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.h
+++ b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitConfigDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
index 770f9f06b3f03a5dd9ff27fa71f3359357c6f994..fa3eb342696cda65373f76af1f7000fbe7e6b380 100644
--- a/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * \package    ArmarX::Component::ObjectExaminerGuiPlugin
 * \author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * \copyright  2012
-* \license    http://www.gnu.org/licenses/gpl.txt
+* \license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
diff --git a/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.cpp b/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.cpp
index 047d818ccdc94375c7b8e7f8c3d8ffa2856c2775..e95f108befca5e85440a4cb1676e62dd80c0c4b0 100644
--- a/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.cpp
+++ b/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.h b/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.h
index 1a0500e9ac94a30da1e612512f46d4ac28dceeb0..1a65513600e37e89508e0a720c966efe822d7e28 100644
--- a/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.h
+++ b/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerConfigDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h b/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
index 5bf625e6b0cc4dafa94cf3d73d321364ced8c8b9..4aeb826eb34ff537a94575a4f4ef6c3f05ca98b5 100644
--- a/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Component::RobotViewerGuiPlugin
 * @author     Nikolaus Vahrenkamp
 * @copyright  2015 KIT
-* @license    http://www.gnu.org/licenses/gpl.txt
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
index 6ccaf170a03ad6a9ccec55a1e0d1c62fc43de9f7..8c461c407d58ca250e016c0a1b1faa4c2217a7cd 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Gui
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h
index f23584694158870b99d8199aca85c39b06c0b9a6..d8d9e76f4cd324ce21dcd412dc735fe1ace21b71 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Gui
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.cpp b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.cpp
index 9ec9e79858fa043994e6cd3a0c832f68a208d62a..fa7ff7e71bb79a1f398dff5711927b7cd292e92f 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.cpp
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Gui
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.h b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.h
index ed04249463eea733b842a399787001c91edd114f..ad2f39a481709e74a06f54203f7629b35af0b282 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.h
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotterDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Gui
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.cpp b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.cpp
index 44dcd92fdae74b5b70699cbfb595d0c08948aae9..81e90b88e7358e58dcb65ceeee0d51077b56607b 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.cpp
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.h b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.h
index 6e396ae11984b22be0bbb1d70c702e3d2ce404d1..c566dae489cd5dab15ac7fba9d2fcf678fe3f5a4 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.h
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMover.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.cpp b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.cpp
index daee4b75e7d688de3711aa444dcbf4509be9fcdc..99871491cc1b21191c917bc8847225a1bdc8f573 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.cpp
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.h b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.h
index 69f8a0820f9960084b9531e7630ee8d4e6a4d556..72546c54159272021579579cb35eee6b9f3ffe53 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.h
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXTCPMover/TCPMoverConfigDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp ( vahrenkamp at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.cpp b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.cpp
index b0b046e1876a7258fdd121917c010da8e9fa7cb8..d40db01839d8afd42c3f292df35e643f09695378 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.cpp
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Gui::SensorActorWidgetsPlugin
 * @author     ( at kit dot edu)
 * @date
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.h b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.h
index 093a968b3a6316606bc83fd94e21b0850e7b0b65..40301dc6a249f7dc8d9ef34390a2f9f8069a2876 100644
--- a/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.h
+++ b/source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Gui::SensorActorWidgetsPlugin
 * @author     ( at kit dot edu)
 * @date
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerConfigDialog.cpp b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerConfigDialog.cpp
index 1a55ec188de066156a7ac55027b9b3f3bda8313e..decc984af837c3322f9cac272e23538953bfbd22 100644
--- a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerConfigDialog.cpp
+++ b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerConfigDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerConfigDialog.h b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerConfigDialog.h
index 2c05232836e3af4122b83558964f56ce3e31a0ed..bbadff39da43ab1077bffeb14623f967cf913814 100644
--- a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerConfigDialog.h
+++ b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerConfigDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Nikolaus Vahrenkamp
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerGuiPlugin.h b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerGuiPlugin.h
index 89a274c77df066a8aed6d4c6df4731b76fa89b3d..395727f4863cdd12303847a29d134808f6edca88 100644
--- a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/Backup/RobotViewerGuiPlugin.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Component::RobotViewerGuiPlugin
 * @author     Nikolaus Vahrenkamp
 * @copyright  2015 KIT
-* @license    http://www.gnu.org/licenses/gpl.txt
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
diff --git a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKConfigDialog.cpp b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKConfigDialog.cpp
index 847ace97c2597f3edf5a2b3493fc6bb0f7f4a1aa..410129096ac85e86eb15edb7ed3f493c05d812fd 100644
--- a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKConfigDialog.cpp
+++ b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKConfigDialog.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Philipp Schmidt
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKConfigDialog.h b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKConfigDialog.h
index a0af1c0e0d4e9857d50252eb11765ae355263861..42f06335c5fb950c019c7a7e159c95f18b7c0010 100644
--- a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKConfigDialog.h
+++ b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKConfigDialog.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Philipp Schmidt
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKGuiPlugin.cpp b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKGuiPlugin.cpp
index 9f20be7ae9c56fef936019c6c97989afbaf66216..2f2d733030572b5e991021c0d5df28295b6a6be0 100644
--- a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKGuiPlugin.cpp
+++ b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKGuiPlugin.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Philipp Schmidt
 * @date       2015
-* @license    http://www.gnu.org/licenses/gpl.txt
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
diff --git a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKGuiPlugin.h b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKGuiPlugin.h
index 4536dd3ec5a8daf066b57ffa675dc159fb94cb7f..f446cd7f75e9ca3913c49d279958d87f8477d65c 100644
--- a/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/moved_to_robotcomponents_RobotIKPlugin/RobotIKGuiPlugin.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Philipp Schmidt
 * @date       2015
-* @license    http://www.gnu.org/licenses/gpl.txt
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
diff --git a/source/RobotAPI/interface/core/FramedPoseBase.ice b/source/RobotAPI/interface/core/FramedPoseBase.ice
index cba790dbc52e6ae32da23b0f465805aba32858ee..59d50d4c4905ad10da3b0160579a556ee21043a7 100644
--- a/source/RobotAPI/interface/core/FramedPoseBase.ice
+++ b/source/RobotAPI/interface/core/FramedPoseBase.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/core/LinkedPoseBase.ice b/source/RobotAPI/interface/core/LinkedPoseBase.ice
index 3f465967c721200bd717266150797b14a5bb3125..b9801d6100b247bf15b8a37e8b9e36a3492cfdb1 100644
--- a/source/RobotAPI/interface/core/LinkedPoseBase.ice
+++ b/source/RobotAPI/interface/core/LinkedPoseBase.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/core/PoseBase.ice b/source/RobotAPI/interface/core/PoseBase.ice
index 0e8b640fa0bb412d8f1d94cc0079b99b034764d6..f89217ac84d72e6989c388f6a3ee1eb22ba721fc 100644
--- a/source/RobotAPI/interface/core/PoseBase.ice
+++ b/source/RobotAPI/interface/core/PoseBase.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/core/RobotStateObserverInterface.ice b/source/RobotAPI/interface/core/RobotStateObserverInterface.ice
index 369c40f8fc0958436fa6cf8961d101a8ba387b72..607f0812c9e0d9c175479306ddd5424725907fea 100644
--- a/source/RobotAPI/interface/core/RobotStateObserverInterface.ice
+++ b/source/RobotAPI/interface/core/RobotStateObserverInterface.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/hardware/BusInspectionInterface.ice b/source/RobotAPI/interface/hardware/BusInspectionInterface.ice
index 94821c9c7abe63b3d7116cfdb7443110a7c903a6..321d3dfd7647c7cab4a9de29110c82e5f380ea04 100644
--- a/source/RobotAPI/interface/hardware/BusInspectionInterface.ice
+++ b/source/RobotAPI/interface/hardware/BusInspectionInterface.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -18,7 +17,7 @@
  * @author     Peter Kaiser (peter dot kaiser at kit dot edu)
  * @author     Matthias Hadlich (matthias dot hadlich at student dot kit dot edu)
  * @copyright  2014 Peter Kaiser 
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/interface/observers/KinematicUnitObserverInterface.ice b/source/RobotAPI/interface/observers/KinematicUnitObserverInterface.ice
index aa48839a36dfd91dd963c5109255ea8ca07a6545..6dbefd25992f6b1b6b3c141a0a78443d63a0efb7 100644
--- a/source/RobotAPI/interface/observers/KinematicUnitObserverInterface.ice
+++ b/source/RobotAPI/interface/observers/KinematicUnitObserverInterface.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/observers/ObserverFilters.ice b/source/RobotAPI/interface/observers/ObserverFilters.ice
index df5bb34dee2b18e122f781790d99260076702b23..4ba2872954735fb187543b25a80ec028112dc8a1 100644
--- a/source/RobotAPI/interface/observers/ObserverFilters.ice
+++ b/source/RobotAPI/interface/observers/ObserverFilters.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/observers/PlatformUnitObserverInterface.ice b/source/RobotAPI/interface/observers/PlatformUnitObserverInterface.ice
index c3a31df516d505eb26f5cc48a11bfe39daf46c26..73db196ecc19f00d2ac3b413310df5a2bf65304b 100644
--- a/source/RobotAPI/interface/observers/PlatformUnitObserverInterface.ice
+++ b/source/RobotAPI/interface/observers/PlatformUnitObserverInterface.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/selflocalisation/SelfLocalisationProcess.ice b/source/RobotAPI/interface/selflocalisation/SelfLocalisationProcess.ice
index 0a7f47958914e87b86b4ef80040f7374b519064b..7fb058b50fead45e5a7d702e0365dd9cd722da85 100644
--- a/source/RobotAPI/interface/selflocalisation/SelfLocalisationProcess.ice
+++ b/source/RobotAPI/interface/selflocalisation/SelfLocalisationProcess.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI
  * @author     Thomas von der Heyde <tvh242 at hotmail dot com>
  * @copyright  2014
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/interface/speech/SpeechInterface.ice b/source/RobotAPI/interface/speech/SpeechInterface.ice
index 9f37056c7797535a5e47c9c871c59961923aba20..d9df885c189f5fae6c2ae7538248d3e5ece2694c 100644
--- a/source/RobotAPI/interface/speech/SpeechInterface.ice
+++ b/source/RobotAPI/interface/speech/SpeechInterface.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/units/ForceTorqueUnit.ice b/source/RobotAPI/interface/units/ForceTorqueUnit.ice
index ac7030e5a912f53e0a7e012ca7ab3c8d5b486d35..b9924aca5a68932fa40685fe5260ece392f5cff0 100644
--- a/source/RobotAPI/interface/units/ForceTorqueUnit.ice
+++ b/source/RobotAPI/interface/units/ForceTorqueUnit.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI
  * @author     Mirko Waechter <waechter at kit dot edu>
  * @copyright  2013 Mirko Waechter
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  **/
 
diff --git a/source/RobotAPI/interface/units/HandUnitInterface.ice b/source/RobotAPI/interface/units/HandUnitInterface.ice
index cf91da40d47d4824e46321c818ff7d0875976903..f3df38d6289ac39d3d8a93f5f63da3f0a8be4ab9 100644
--- a/source/RobotAPI/interface/units/HandUnitInterface.ice
+++ b/source/RobotAPI/interface/units/HandUnitInterface.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarX::Core
  * @author     Manfred Kroehnert (manfred dot kroehnert at kit dot edu)
  * @copyright  2013 Manfred Kroehnert
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/interface/units/HapticUnit.ice b/source/RobotAPI/interface/units/HapticUnit.ice
index 101ddd2b897a1ea64770e3f739d1e72078606090..d24d5a5c30b171fd0b1b0d309f6a13056d0e9973 100644
--- a/source/RobotAPI/interface/units/HapticUnit.ice
+++ b/source/RobotAPI/interface/units/HapticUnit.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/units/HeadIKUnit.ice b/source/RobotAPI/interface/units/HeadIKUnit.ice
index af1bafb042c44e0959be63519fc1e751b15bc734..fec56ec4aaef6f80a1d40f0970550e49a87d5899 100644
--- a/source/RobotAPI/interface/units/HeadIKUnit.ice
+++ b/source/RobotAPI/interface/units/HeadIKUnit.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI
  * @author     David Schiebener <schiebener at kit dot edu>
  * @copyright  2014 David Schiebener
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/interface/units/InertialMeasurementUnit.ice b/source/RobotAPI/interface/units/InertialMeasurementUnit.ice
index b2ab3305c13becfe9d73fb0645eacabb284a6962..642f1b1ea2188209974b52ec700579bf625afa56 100644
--- a/source/RobotAPI/interface/units/InertialMeasurementUnit.ice
+++ b/source/RobotAPI/interface/units/InertialMeasurementUnit.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/units/KinematicUnitInterface.ice b/source/RobotAPI/interface/units/KinematicUnitInterface.ice
index 3f685ec6aba1c2f048e817cdedeac353a6b043d0..ff0f432537e411f343463a6de9b61aed9a93bedd 100644
--- a/source/RobotAPI/interface/units/KinematicUnitInterface.ice
+++ b/source/RobotAPI/interface/units/KinematicUnitInterface.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarX::Core
  * @author     Christian Boege (boege at kit dot edu)
  * @copyright  2011 Christian Boege
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/interface/units/PlatformUnitInterface.ice b/source/RobotAPI/interface/units/PlatformUnitInterface.ice
index a2569042d1983d6f73c1d33f1c1961007f80b103..4c275ee00424da8c82467c206ccf8f596eca38cb 100644
--- a/source/RobotAPI/interface/units/PlatformUnitInterface.ice
+++ b/source/RobotAPI/interface/units/PlatformUnitInterface.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarX::Core
  * @author     Manfred Kroehnert (manfred dot kroehnert at kit dot edu)
  * @copyright  2013 Manfred Kroehnert
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/interface/units/TCPControlUnit.ice b/source/RobotAPI/interface/units/TCPControlUnit.ice
index 3d971e4e7d48e2f3f41db947866ead1968722f8d..33117e380a73d620f0ba9755b5709881bc8d1993 100644
--- a/source/RobotAPI/interface/units/TCPControlUnit.ice
+++ b/source/RobotAPI/interface/units/TCPControlUnit.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI
  * @author     Mirko Waechter <waechter at kit dot edu>
  * @copyright  2013 Mirko Waechter
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/interface/units/TCPMoverUnitInterface.ice b/source/RobotAPI/interface/units/TCPMoverUnitInterface.ice
index 04116bff906045d35958ee9caaee9ac5c549edc9..11d93b2ea51ae59b23a7ec31f4b81043a0bc82d5 100644
--- a/source/RobotAPI/interface/units/TCPMoverUnitInterface.ice
+++ b/source/RobotAPI/interface/units/TCPMoverUnitInterface.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarX::Core
  * @author     Christian Boege (boege at kit dot edu)
  * @copyright  2011 Christian Boege
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/interface/units/UnitInterface.ice b/source/RobotAPI/interface/units/UnitInterface.ice
index 1f683d9c36ea5bbd00be323c6a33622616cdf2c0..916c31d58a2d8e149bd4bba4602b0e31587d816a 100644
--- a/source/RobotAPI/interface/units/UnitInterface.ice
+++ b/source/RobotAPI/interface/units/UnitInterface.ice
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/units/WeissHapticUnit.ice b/source/RobotAPI/interface/units/WeissHapticUnit.ice
index 414a1aae8cead59d120307ccdc336d12928232b9..bc43d8da8b44fc9285bdaac74ca5546c9fdf9e70 100644
--- a/source/RobotAPI/interface/units/WeissHapticUnit.ice
+++ b/source/RobotAPI/interface/units/WeissHapticUnit.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/interface/visualization/DebugDrawerInterface.ice b/source/RobotAPI/interface/visualization/DebugDrawerInterface.ice
index 9fae97116a0b07484a8b380b9a0a66683fdd1854..ccd0ecfe976b4e87d41e73a74c388f3a6c00147a 100644
--- a/source/RobotAPI/interface/visualization/DebugDrawerInterface.ice
+++ b/source/RobotAPI/interface/visualization/DebugDrawerInterface.ice
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    ArmarX::RobotAPI
  * @author     Nikolaus Vahrenkamp
  * @copyright  2014
- * @license    http://www.gnu.org/licenses/gpl.txt
+ * @license    http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/core/FramedPose.h b/source/RobotAPI/libraries/core/FramedPose.h
index c4b3993950f748da2b589077236e0ca80b88ad99..1289ad63c8991f453999247f90dc41032ecfee47 100644
--- a/source/RobotAPI/libraries/core/FramedPose.h
+++ b/source/RobotAPI/libraries/core/FramedPose.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::RobotStateComponent::
  * @author     ( stefan dot ulbrich at kit dot edu)
  * @date
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/core/LinkedPose.h b/source/RobotAPI/libraries/core/LinkedPose.h
index ea3a7d5aab2583c511730504bbf6b36d34191931..2e06709049816e98978ac6bca9ede4d7ea814e8c 100644
--- a/source/RobotAPI/libraries/core/LinkedPose.h
+++ b/source/RobotAPI/libraries/core/LinkedPose.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotStateComponent::
  * @author     ( stefan dot ulbrich at kit dot edu)
  * @date
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/core/PIDController.cpp b/source/RobotAPI/libraries/core/PIDController.cpp
index c323138a775fd9a6c35380570a869809ff5c2aa9..0c91c9ca68e27b1ed4798f83002fe08ad41efdc8 100644
--- a/source/RobotAPI/libraries/core/PIDController.cpp
+++ b/source/RobotAPI/libraries/core/PIDController.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::core::PIDController
  * @author     Mirko Waechter ( mirko dot waechter at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/core/PIDController.h b/source/RobotAPI/libraries/core/PIDController.h
index 2374769978a9feaaac5236d81e9f30722bc19dc8..8aa5712af5c91a6255da69db93dfe2479ba3d3fb 100644
--- a/source/RobotAPI/libraries/core/PIDController.h
+++ b/source/RobotAPI/libraries/core/PIDController.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::core::PIDController
  * @author     Mirko Waechter ( mirko dot waechter at kit dot edu )
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/core/Pose.h b/source/RobotAPI/libraries/core/Pose.h
index 4f48ba1131df29dca1d0831febe4e3273481ddd4..5e67090edab805928ad5c9c2a12bc9e0419efca0 100644
--- a/source/RobotAPI/libraries/core/Pose.h
+++ b/source/RobotAPI/libraries/core/Pose.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::Core
  * @author     ( stefan dot ulbrich at kit dot edu)
  * @date
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/core/RobotAPIObjectFactories.cpp b/source/RobotAPI/libraries/core/RobotAPIObjectFactories.cpp
index 2de2300b9c11e3685dcd85f27dffe33422109fd7..3ccdd28bc41ecffe6fc6a3e284fcecdeaad19535 100644
--- a/source/RobotAPI/libraries/core/RobotAPIObjectFactories.cpp
+++ b/source/RobotAPI/libraries/core/RobotAPIObjectFactories.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2014
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/RobotAPIObjectFactories.h b/source/RobotAPI/libraries/core/RobotAPIObjectFactories.h
index 24425b993f1ba990994b7cfc49bd57dc790192a5..199bfb0d05e6ab2b051c843ba7b999a8b3e05530 100644
--- a/source/RobotAPI/libraries/core/RobotAPIObjectFactories.h
+++ b/source/RobotAPI/libraries/core/RobotAPIObjectFactories.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/libraries/core/RobotStatechartContext.cpp b/source/RobotAPI/libraries/core/RobotStatechartContext.cpp
index e95b4739f06c2dbcdeb9943e63eaf4f6f4a4e095..0e8f4e28fc72e0a164e39d6d8cec4850a08b68c5 100644
--- a/source/RobotAPI/libraries/core/RobotStatechartContext.cpp
+++ b/source/RobotAPI/libraries/core/RobotStatechartContext.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    Armar4::api
 * @author     Nikolaus Vahrenkamp
 * @date       2012 Nikolaus Vahrenkamp
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/RobotStatechartContext.h b/source/RobotAPI/libraries/core/RobotStatechartContext.h
index 9fb57cd76e1a21b1f3bc94b3fe14c47fd66f56b3..8490e966383a11d857b8cd0ee773dc447dae1539 100644
--- a/source/RobotAPI/libraries/core/RobotStatechartContext.h
+++ b/source/RobotAPI/libraries/core/RobotStatechartContext.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    Armar4::api
 * @author     Nikolaus Vahrenkamp
 * @date       2012 Nikolaus Vahrenkamp
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/math/MathUtils.h b/source/RobotAPI/libraries/core/math/MathUtils.h
index 1a56170a8d6e123a940c39f82ccd3f89ef7d2a5c..6b56ad0faee1cea310c39e949beda627bc1b1afb 100644
--- a/source/RobotAPI/libraries/core/math/MathUtils.h
+++ b/source/RobotAPI/libraries/core/math/MathUtils.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Core
 * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/math/MatrixHelpers.h b/source/RobotAPI/libraries/core/math/MatrixHelpers.h
index 258a16600462eb0be51dc1acc1c8c96507987ccb..7597fcd9a33881d2ed46743951cdcf22b9aafd1d 100644
--- a/source/RobotAPI/libraries/core/math/MatrixHelpers.h
+++ b/source/RobotAPI/libraries/core/math/MatrixHelpers.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Core
 * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/math/SVD.h b/source/RobotAPI/libraries/core/math/SVD.h
index 09f6ad0ffa4557d4647d20b28bda1a508010f23a..c955e5309f11e6297c4cdfc15ed2c9e29c2fe8f3 100644
--- a/source/RobotAPI/libraries/core/math/SVD.h
+++ b/source/RobotAPI/libraries/core/math/SVD.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Core
 * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/math/SlidingWindowVectorMedian.h b/source/RobotAPI/libraries/core/math/SlidingWindowVectorMedian.h
index dd86f9230cc341d53b067afb9447f19dd3499ff6..4b5e2cb91cfc35ef5257bb4be25344bdd29a5e44 100644
--- a/source/RobotAPI/libraries/core/math/SlidingWindowVectorMedian.h
+++ b/source/RobotAPI/libraries/core/math/SlidingWindowVectorMedian.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Core
 * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/math/StatUtils.h b/source/RobotAPI/libraries/core/math/StatUtils.h
index f63f00ad86b3088b0f6146154fcfcf32f865c565..092adb3d07b8622afc44eefb85dd97939ad6c9bb 100644
--- a/source/RobotAPI/libraries/core/math/StatUtils.h
+++ b/source/RobotAPI/libraries/core/math/StatUtils.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Core
 * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/math/Trigonometry.h b/source/RobotAPI/libraries/core/math/Trigonometry.h
index 4520e674d438992d4f770fad0bcc23455066f08c..6cc3ccc31d48f88e385672c749bdb191e042569c 100644
--- a/source/RobotAPI/libraries/core/math/Trigonometry.h
+++ b/source/RobotAPI/libraries/core/math/Trigonometry.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::Core
 * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h b/source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
index e9a27d14edd55a20f29feb9a207525315a56377d..6068d564e64717017a38042c861b4223ebd89ff2 100644
--- a/source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
+++ b/source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Simon Ottenhaus ( simon.ottenhaus at kit dot edu)
 * @date       2015
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h b/source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
index 397acc57c3cdba8654ad6ddc22ce7e034037c537..224e7756590c6fa484137c57735e6ef8ee97b69f 100644
--- a/source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
+++ b/source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2014
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
index e251f861237890be99ebedf9890c638a0a466813..4d677edf3b3e9a79dcb9e8e918575d9ac5f61d46 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::
  * @author     (stefan dot ulbrich at kit dot edu)
  * @date
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.cpp b/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.cpp
index 03affd8d6162f131539aceb32c14de88d64de5b6..71470505ab4b0d2c05ed3e48a4206ad308055d08 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.cpp
+++ b/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.h b/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.h
index be77615e240458ba65a7fa98d607f1c8a7e57b9d..e114de0ca2691cbe7d9f4c5a4e01ff2cc0f88b66 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.h
+++ b/source/RobotAPI/libraries/core/remoterobot/RobotStateObserver.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/libraries/core/remoterobot/test/ArmarPoseTest.cpp b/source/RobotAPI/libraries/core/remoterobot/test/ArmarPoseTest.cpp
index d0a17e4e284c2fd81ec1ee72a574fc1a1ea2cc25..bdaf225f068cadc4ecc6edb6760056b252ec9cda 100644
--- a/source/RobotAPI/libraries/core/remoterobot/test/ArmarPoseTest.cpp
+++ b/source/RobotAPI/libraries/core/remoterobot/test/ArmarPoseTest.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.cpp b/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.cpp
index 24c1edda1132ec2290eba62c5ca4252e5a5906dc..62aaf9c37b20abb683e730b8033d969551d9e83e 100644
--- a/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.cpp
+++ b/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.cpp
@@ -2,14 +2,14 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
+ * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +17,7 @@
  * @package    ArmarXCore::units
  * @author     Peter Kaiser
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.h b/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.h
index b8334f5ec3a59a9c9ab91ca8367621bd056069b1..dd7e68483c39f58abfae64ee1b1188572084598b 100644
--- a/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.h
+++ b/source/RobotAPI/libraries/drivers/WeissHapticSensor/WeissHapticUnit.h
@@ -2,14 +2,14 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
+ * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +17,7 @@
  * @package    Armar4::units
  * @author     Simon Ottenhaus <simon dot ottenhaus at kit dot edu>
  * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.cpp b/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.cpp
index 2857dca6918e593c1df02fa28bf5e38630d90d75..9bd91962232ea60c553257346676fb54dc032195 100644
--- a/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.cpp
+++ b/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.cpp
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::XsensIMU
  * @author     Markus Grotz ( markus-grotz at web dot de )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.h b/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.h
index 89a33792a895e040e22d7918dc3f10bc600d041a..d412f84412d890d842c4f1f7496c62763279afcf 100644
--- a/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.h
+++ b/source/RobotAPI/libraries/drivers/XsensIMU/XsensIMU.h
@@ -2,14 +2,13 @@
  * This file is part of ArmarX.
  *
  * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
  * @package    RobotAPI::ArmarXObjects::XsensIMU
  * @author     Markus Grotz ( markus-grotz at web dot de )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.cpp b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.cpp
index c81db898dd7187b88f4e355c5969f17c06e429db..55462636f80a3e2c8565963cc5e9402c249654ee 100644
--- a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.cpp
+++ b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.cpp
@@ -7,7 +7,7 @@
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -16,7 +16,7 @@
  * @package    RobotAPI::StatechartProfilesTestGroup::StatechartProfilesTestGroupRemoteStateOfferer
  * @author     Valerij Wittenbeck ( valerij dot wittenbeck at student dot kit dot edu )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.h b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.h
index 13dc48c1abb7df9e4cc3ebb54352f4d940b97646..6965ea51d112b69542941d9facaa84fac9bb6d09 100644
--- a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.h
+++ b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/StatechartProfilesTestGroupRemoteStateOfferer.h
@@ -7,7 +7,7 @@
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -16,7 +16,7 @@
  * @package    RobotAPI::StatechartProfilesTestGroup
  * @author     Valerij Wittenbeck ( valerij dot wittenbeck at student dot kit dot edu )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.cpp b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.cpp
index 609d625909cf0f82524519c2e79c05c8c96902b3..63b26f24cdde1f13bd73c874b4a0d7cc1af5a114 100644
--- a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.cpp
+++ b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.cpp
@@ -7,7 +7,7 @@
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -16,7 +16,7 @@
  * @package    RobotAPI::StatechartProfilesTestGroup
  * @author     Valerij Wittenbeck ( valerij dot wittenbeck at student dot kit dot edu )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.h b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.h
index 6a2e87bdf12270ca84fce63547c0ea6155292d04..99a3e281ae9389a08bdd3a8a90fa932de337e8e3 100644
--- a/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.h
+++ b/source/RobotAPI/statecharts/StatechartProfilesTestGroup/TestState.h
@@ -7,7 +7,7 @@
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -16,7 +16,7 @@
  * @package    RobotAPI::StatechartProfilesTestGroup
  * @author     Valerij Wittenbeck ( valerij dot wittenbeck at student dot kit dot edu )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroupRemoteStateOfferer.cpp b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroupRemoteStateOfferer.cpp
index a8f0c6b0e2bb73a32a26da3ba4a23afef190c40c..f0d2820e6bc419494ff8465a88a7f9e6deef6daa 100644
--- a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroupRemoteStateOfferer.cpp
+++ b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroupRemoteStateOfferer.cpp
@@ -7,7 +7,7 @@
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -16,7 +16,7 @@
  * @package    RobotAPI::WeissHapticGroup::WeissHapticGroupRemoteStateOfferer
  * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroupRemoteStateOfferer.h b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroupRemoteStateOfferer.h
index 3c57e225e7af2cd761a2c14bfec8bae8e7d52d35..bb5cd13a26d5e446db364bee0131b4d240b93634 100644
--- a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroupRemoteStateOfferer.h
+++ b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroupRemoteStateOfferer.h
@@ -7,7 +7,7 @@
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -16,7 +16,7 @@
  * @package    RobotAPI::WeissHapticGroup
  * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.cpp b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.cpp
index ac0edd94540c762281d997bea5684cc08bf3fb58..769c40d0c1011f8463898270dd12b93fdbcc1492 100644
--- a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.cpp
+++ b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.cpp
@@ -7,7 +7,7 @@
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -16,7 +16,7 @@
  * @package    RobotAPI::WeissHapticGroup
  * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.h b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.h
index 34b84f98978965e66af0c0f79a2c9322ca177df3..4e132b7e77c656ee9950fe79eec1934c1e7e3133 100644
--- a/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.h
+++ b/source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticSensorTest.h
@@ -7,7 +7,7 @@
  *
  * ArmarX is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -16,7 +16,7 @@
  * @package    RobotAPI::WeissHapticGroup
  * @author     Simon Ottenhaus ( simon dot ottenhaus at kit dot edu )
  * @date       2015
- * @copyright  http://www.gnu.org/licenses/gpl.txt
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
 
diff --git a/source/RobotAPI/statecharts/operations/RobotControl.cpp b/source/RobotAPI/statecharts/operations/RobotControl.cpp
index 3ac7da6268dbf625f904f8a861a9bc03afbd272b..9f15e6ec637bac582c3bd8f6ecafc9ced80df892 100644
--- a/source/RobotAPI/statecharts/operations/RobotControl.cpp
+++ b/source/RobotAPI/statecharts/operations/RobotControl.cpp
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Mirko Waechter ( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */
 
diff --git a/source/RobotAPI/statecharts/operations/RobotControl.h b/source/RobotAPI/statecharts/operations/RobotControl.h
index 93865cf66230573e29df840c8b7f50267a3d5868..897a2b62d575f5bb7dfd7c4f88385aaf7c2ac945 100644
--- a/source/RobotAPI/statecharts/operations/RobotControl.h
+++ b/source/RobotAPI/statecharts/operations/RobotControl.h
@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    Robot::
 * @author     Mirko Waechter( mirko.waechter at kit dot edu)
 * @date       2012
-* @copyright  http://www.gnu.org/licenses/gpl.txt
+* @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 */