diff --git a/source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp b/source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp
index 6666d1604fbc271f0ce450c057d820801fe60932..a3f097b8c36c2337096180d922004618f974d1ac 100644
--- a/source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp
@@ -14,7 +14,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * @package    RobotAPI
-* @author     Raphael ( ufdrv at student dot kit dot edu )
+* @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
 * @date       2017
 * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/BasicControllers.h b/source/RobotAPI/components/units/RobotUnit/BasicControllers.h
index ff0592b4bc97a55cac6962ebf6d158704fc32a3e..7110497bb9d8c604fbd82b4fc120f91759e46557 100644
--- a/source/RobotAPI/components/units/RobotUnit/BasicControllers.h
+++ b/source/RobotAPI/components/units/RobotUnit/BasicControllers.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Constants.h b/source/RobotAPI/components/units/RobotUnit/Constants.h
index 6ee2be06c382cd7246c60367e5a0a84244e509ea..81724864cfe30f9eb5962a2b3b16545457eaa4c4 100644
--- a/source/RobotAPI/components/units/RobotUnit/Constants.h
+++ b/source/RobotAPI/components/units/RobotUnit/Constants.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/ControlModes.h b/source/RobotAPI/components/units/RobotUnit/ControlModes.h
index ffc95e5c900e34512261e04325324a51daa1c8b8..f116dc539b1ebafe4ba0dc16d8fcc2d846c92bc9 100644
--- a/source/RobotAPI/components/units/RobotUnit/ControlModes.h
+++ b/source/RobotAPI/components/units/RobotUnit/ControlModes.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h b/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h
index 640bd4f88fa337ce1629634e3449554e315b1a61..aed01a0081268f17db843258e8659312f2821d7a 100644
--- a/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h
+++ b/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::ActuatorVelocityTarget
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.cpp b/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.cpp
index 2a48abf52d71f29ac6a9ea09837c96cbba8fb4fc..babe410c15281f927ce552167cf8982cbb65dd78 100644
--- a/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::ControlTargetBase
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.h b/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.h
index 29ae86b6b26b68b929b6c1ac983e17e5b8170563..8b69a5d565d944c415be16a0815f26b9d5c1af07 100644
--- a/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.h
+++ b/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::ControlTargetBase
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetHolonomicPlatformVelocity.h b/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetHolonomicPlatformVelocity.h
index 93479e1189ba85c147a579b2310c23238c414f32..04b537b8545c57b162ff67f99735d4c21fa095b4 100644
--- a/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetHolonomicPlatformVelocity.h
+++ b/source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetHolonomicPlatformVelocity.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::ControlTargetHolonomicPlatformVelocity
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/DefaultWidgetDescriptions.cpp b/source/RobotAPI/components/units/RobotUnit/DefaultWidgetDescriptions.cpp
index e1f6361c3a4222da637e03b58b21b87dbd173f12..ca6b0a2e40e4507420c68ed94fd29785884d1ee1 100644
--- a/source/RobotAPI/components/units/RobotUnit/DefaultWidgetDescriptions.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/DefaultWidgetDescriptions.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::RobotUnit
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/DefaultWidgetDescriptions.h b/source/RobotAPI/components/units/RobotUnit/DefaultWidgetDescriptions.h
index cc70c31ce6d316536ce51539358e255b783dc1b1..cdff566eea4141e2d6a9d9535873fa558e905cc4 100644
--- a/source/RobotAPI/components/units/RobotUnit/DefaultWidgetDescriptions.h
+++ b/source/RobotAPI/components/units/RobotUnit/DefaultWidgetDescriptions.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::RobotUnit
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.cpp b/source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.cpp
index b7096f0a9147599b3602cad1021489f8c10ee08a..06f696762b4c8b02143900cc11a31d4c4573467c 100644
--- a/source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.h b/source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.h
index 7376ab7479a640a34ab42f4c6179ed2711016ea7..3a9c5915df3610764ea2d4bbecfc0a253e335383 100644
--- a/source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.h
+++ b/source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Devices/DeviceBase.h b/source/RobotAPI/components/units/RobotUnit/Devices/DeviceBase.h
index 1483696459051cef20766787c5dd2bf8089ffa05..ce8f870d7952da931f73c591f97b9c8bf67a3554 100644
--- a/source/RobotAPI/components/units/RobotUnit/Devices/DeviceBase.h
+++ b/source/RobotAPI/components/units/RobotUnit/Devices/DeviceBase.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Devices/RTThreadTimingsSensorDevice.h b/source/RobotAPI/components/units/RobotUnit/Devices/RTThreadTimingsSensorDevice.h
index 971935730cbf201a68b38d97a8bc90d8763a6836..9e38d7d35ea6a93847b9ebefe2ebe6b01d48ac98 100644
--- a/source/RobotAPI/components/units/RobotUnit/Devices/RTThreadTimingsSensorDevice.h
+++ b/source/RobotAPI/components/units/RobotUnit/Devices/RTThreadTimingsSensorDevice.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Devices/SensorDevice.cpp b/source/RobotAPI/components/units/RobotUnit/Devices/SensorDevice.cpp
index 20ca86f2e8077738ba8c80546b53e242d7c70352..956e334a81e46441e3850779a0d40e3650c7fe6c 100644
--- a/source/RobotAPI/components/units/RobotUnit/Devices/SensorDevice.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/Devices/SensorDevice.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Devices/SensorDevice.h b/source/RobotAPI/components/units/RobotUnit/Devices/SensorDevice.h
index 5019b20033007109c26b2ac878f37e556547706e..66760b4be0405bd3c092aec23bb9e6da4c7e4e05 100644
--- a/source/RobotAPI/components/units/RobotUnit/Devices/SensorDevice.h
+++ b/source/RobotAPI/components/units/RobotUnit/Devices/SensorDevice.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.cpp b/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.cpp
index a2825105875a0e72454972692a388f0cd8721f62..2fae772fcb58d62f4bc06e365060e849f87d108a 100644
--- a/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::JointController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.h b/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.h
index d872fc70e9662b2abdccad702be2c0317851a1f8..bff6b97589e78b69e69d738de8c17a421eb85c70 100644
--- a/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.h
+++ b/source/RobotAPI/components/units/RobotUnit/JointControllers/JointController.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::JointController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.cpp
index c8ff8749204a1d35457e9e5b07e9e4b3faecfc45..6fd11bd486166177694ec16cee0b594202cda03f 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::NJointController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
index 95f34f7858f8893c4c53298d61c9ca2f9d1ced0a..ce9a64b4e2b0fc8175189611c228da3cdab57e43 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::NJointController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.ipp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.ipp
index de94045bfb4bdc1a9127f774446c6a22d42bf136..e71fd985c532f9669bef8ca8038fe5d6139163cc 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.ipp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.ipp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::NJointController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.cpp
index 148090ede09cbaf44fe80ccc2c581f6bc50b9668..9c055b45e0f65150b309957bcb4b0f230a4e101a 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::NJointHolonomicPlatformUnitVelocityPassThroughController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.h
index a60fce25e1b3994946751f2ec769e62e17ab54f1..2f1bfe26ee17d8a661d3fe180e6d43d5755f64fe 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.h
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::NJointHolonomicPlatformUnitVelocityPassThroughController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.cpp
index 9245b2086e8e688fafc4ba6cae5b83b8f1fec231..9dac25286a771000dd35cf7006ac630533f0466b 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::NJointKinematicUnitPassThroughController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.h
index 51093ec658888ca6cf956b2ce88af12cd3e3601c..d8f0b321d6f53a2d8023e0cc6e99c3567ba5c790 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.h
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::NJointKinematicUnitPassThroughController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/PDController.h b/source/RobotAPI/components/units/RobotUnit/PDController.h
index eabc9410c057bad53047235ab953635c2d47fa60..e534efd0ca0426daabf74b7bb04408e676c0a412 100644
--- a/source/RobotAPI/components/units/RobotUnit/PDController.h
+++ b/source/RobotAPI/components/units/RobotUnit/PDController.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::RobotUnit
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp b/source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
index e3ad39c38ffba9e7241da8ed69b85a8028ca7dc9..44c1df4514e42b5f62c8548843971e0b9b7b4ce5 100644
--- a/source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::RobotUnit
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnit.h b/source/RobotAPI/components/units/RobotUnit/RobotUnit.h
index a336b182cc90798477a8a44aaa04787b21927922..639de739475ca5a2b8b12b73f8183697d0898cc2 100644
--- a/source/RobotAPI/components/units/RobotUnit/RobotUnit.h
+++ b/source/RobotAPI/components/units/RobotUnit/RobotUnit.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::RobotUnit
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/SyntaxCheck.cpp b/source/RobotAPI/components/units/RobotUnit/SyntaxCheck.cpp
index 9b84a642a771e169886e6232bf9207387b75a5bc..377f180e28ee14404829854cadca2733a02295f5 100644
--- a/source/RobotAPI/components/units/RobotUnit/SyntaxCheck.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/SyntaxCheck.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Units/RobotUnitSubUnit.cpp b/source/RobotAPI/components/units/RobotUnit/Units/RobotUnitSubUnit.cpp
index 481cfac2884ff6689fe51112ab9232630d2316a2..5b92e88f3b631e08e1ddeebfe66befec6aae7ef3 100644
--- a/source/RobotAPI/components/units/RobotUnit/Units/RobotUnitSubUnit.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/Units/RobotUnitSubUnit.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::RobotUnitSubUnit
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/Units/RobotUnitSubUnit.h b/source/RobotAPI/components/units/RobotUnit/Units/RobotUnitSubUnit.h
index c84b344b6155615f39da64e53c158c018bcf3427..8d1d4db3501edd1e6198c8bf9d4457aef9bb657c 100644
--- a/source/RobotAPI/components/units/RobotUnit/Units/RobotUnitSubUnit.h
+++ b/source/RobotAPI/components/units/RobotUnit/Units/RobotUnitSubUnit.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::RobotUnitSubUnit
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp b/source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
index 45dc33fed52a8a3be233a2592254b09ae3da0692..8ac73f63551b23a965c6e709118fc44bddeac504 100644
--- a/source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
@@ -14,7 +14,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * @package    ArmarX::RobotAPI::Test
-* @author     Raphael ( ufdrv at student dot kit dot edu )
+* @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
 * @date       2017
 * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
diff --git a/source/RobotAPI/components/units/RobotUnit/test/SingleBasicControllerTest.cpp b/source/RobotAPI/components/units/RobotUnit/test/SingleBasicControllerTest.cpp
index 96f13e19823bc975393379444c1666abcbcad5a7..ec56bf0511be737f3b46b48d2adc7c4b3a703a40 100644
--- a/source/RobotAPI/components/units/RobotUnit/test/SingleBasicControllerTest.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/test/SingleBasicControllerTest.cpp
@@ -14,7 +14,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * @package    ArmarX::RobotAPI::Test
-* @author     Raphael ( ufdrv at student dot kit dot edu )
+* @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
 * @date       2017
 * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
diff --git a/source/RobotAPI/components/units/relays/ForceTorqueUnitListenerRelay.h b/source/RobotAPI/components/units/relays/ForceTorqueUnitListenerRelay.h
index 84a09cad7f3bb5da58368678f054b9cac0b3b183..13d21373fc3f1e49ba8718d0c5e24745daa895e5 100644
--- a/source/RobotAPI/components/units/relays/ForceTorqueUnitListenerRelay.h
+++ b/source/RobotAPI/components/units/relays/ForceTorqueUnitListenerRelay.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    VisionX::ArmarXObjects::ForceTorqueUnitListenerRelay
- * @author     Raphael Grimm ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2016
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/relays/InertialMeasurementUnitListenerRelay.h b/source/RobotAPI/components/units/relays/InertialMeasurementUnitListenerRelay.h
index cda02514ab3d63c2900c7379ea7bd706a7eaeda0..3443d1f1d728d29f7054eb5ac74b16eb1d739931 100644
--- a/source/RobotAPI/components/units/relays/InertialMeasurementUnitListenerRelay.h
+++ b/source/RobotAPI/components/units/relays/InertialMeasurementUnitListenerRelay.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    VisionX::ArmarXObjects::InertialMeasurementUnitListenerRelay
- * @author     Raphael Grimm ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2016
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/relays/KinematicUnitListenerRelay.h b/source/RobotAPI/components/units/relays/KinematicUnitListenerRelay.h
index a3c366e85d4060d05d4f0087e5999e5ac7daa3ba..91e2d518954e6290b48e8f5eca182e25c7153cb7 100644
--- a/source/RobotAPI/components/units/relays/KinematicUnitListenerRelay.h
+++ b/source/RobotAPI/components/units/relays/KinematicUnitListenerRelay.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    VisionX::ArmarXObjects::KinematicUnitListenerRelay
- * @author     Raphael Grimm ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2016
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/components/units/relays/RobotStateListenerRelay.h b/source/RobotAPI/components/units/relays/RobotStateListenerRelay.h
index dafbc38b8edc0125bd882372a9fdb39f183fe4ac..daf3cacd9547eeb395aa6eab320ddb936b5431bd 100644
--- a/source/RobotAPI/components/units/relays/RobotStateListenerRelay.h
+++ b/source/RobotAPI/components/units/relays/RobotStateListenerRelay.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    VisionX::ArmarXObjects::KinematicUnitListenerRelay
- * @author     Raphael Grimm ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2016
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorGuiPlugin.cpp b/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorGuiPlugin.cpp
index 6a8fefc2d009774eb3a2659f079930ab2fb07857..c6a7a61dcf8c1476532976776f56820e7e663a7d 100644
--- a/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorGuiPlugin.cpp
+++ b/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorGuiPlugin.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::HomogeneousMatrixCalculatorGuiPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorGuiPlugin.h b/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorGuiPlugin.h
index 61298f432f0dcb17d7379c0ff91bd9f819f41b03..f883ca4643b40ba274cac2543c6ecd4b12d4ee3c 100644
--- a/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorGuiPlugin.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::HomogeneousMatrixCalculator
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorWidgetController.cpp b/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorWidgetController.cpp
index 4808a79f5824ad6357c4ddf23b44677f500d6dae..43b5ca8e42613ea6b6a2e9110329bf482aa87ef6 100644
--- a/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorWidgetController.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::HomogeneousMatrixCalculatorWidgetController
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorWidgetController.h b/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorWidgetController.h
index 50f8d3aece89c8cc4970c848c7a2f913edb9201b..f58937e8f8de83e025ed7cd41cd2b2154605fd36 100644
--- a/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorWidgetController.h
+++ b/source/RobotAPI/gui-plugins/HomogeneousMatrixCalculator/HomogeneousMatrixCalculatorWidgetController.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::gui-plugins::HomogeneousMatrixCalculatorWidgetController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.cpp b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.cpp
index 84521faef049c7daa41bdae48051ae3cc2363bb6..e3ad0afa99de791e1c07b0b2ba829d7944dc5b98 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.cpp
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.h
index 1feb693f45e69dc3c0734469ac2ec6064f1f5c34..b06897427de80b4cfd60e6283ddde502770752a1 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp
index e76bc8fdbeedc34561a329b5fe2bf473a0b3b109..400d2884deb8652f7b09750c3f4ead94a5f1bcdf 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.h
index 1bd814875dfc5d0b49d58b178bba04c53039b16e..21e44e0a86287660b5eeb842563ae5e5327f4073 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp
index 554ee4780dfabfbb8f75508a3f4f1c9edc2a35b8..3e4f830f183182c1c5a024f26e36403ce47a6730 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.h
index a930d82b1abe102b9668a81f38204aa89bdac700..d6abed0dafda4047a269018ec7386438700de496 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.cpp b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.cpp
index f4b419b4ba44f79de6809b76ccc8361232ae1eff..cec5e3d551aee103ae032d23dc52acb7b249531d 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.cpp
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h
index 09ab24e9ed7c1a0bbe5b7476d3898b0d4e49901c..d0fe28f26295a239f68e9420ec3d74a0efecab0a 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.cpp b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.cpp
index 87ed1e20e1b65e7df4e9c35c7da41c5383aa93c4..070f0401948ed8b9639ee66aa061aac08abcf51c 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.cpp
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.h
index 95053ffd58359702ea3b19330b77f1e3e8e710ff..bccbbda1f8e57b5562e477634812d0ca66522a0a 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/StyleSheets.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/StyleSheets.h
index d34aaa5f75fed2d6a7af74bcbfe6cc5e2aed4d8b..76fdae08c6766f3aeb0b9dce22fe0266748fde99 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/StyleSheets.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/StyleSheets.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
index 0c4d6e2d110b42a09c4a4e934ed5d3828e33416c..db997c5d2ac8006245a44ddadb27c775c23836e1 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPluginWidgetController
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.h
index e3281fce143f390fca5d3db1d94f13ae25be7349..03b8671112b067a5cee7037b1494e6cbced15b7e 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::gui-plugins::RobotUnitPluginWidgetController
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginGuiPlugin.cpp b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginGuiPlugin.cpp
index b9f72623def01d9c24c364abab44921de2e195de..5393a152cfd9ff20fdfec0c5765319d7a5be0158 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginGuiPlugin.cpp
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginGuiPlugin.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPluginGuiPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginGuiPlugin.h b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginGuiPlugin.h
index 9f7828b8033b0d619ebb3cc132b7a0ba715aa71c..cf02a7abb139d40cab9fbbcc5a0021d17a77382f 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginGuiPlugin.h
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginGuiPlugin.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * \package    RobotAPI::gui-plugins::RobotUnitPlugin
- * \author     Raphael ( ufdrv at student dot kit dot edu )
+ * \author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * \date       2017
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/libraries/RobotAPIVariantWidget/RobotAPIVariantWidget.cpp b/source/RobotAPI/libraries/RobotAPIVariantWidget/RobotAPIVariantWidget.cpp
index e23ee6b9f66675572a69ae1a72ca8110cb89cf8a..8660ad028f98a01061fba2918557d50322689ffd 100644
--- a/source/RobotAPI/libraries/RobotAPIVariantWidget/RobotAPIVariantWidget.cpp
+++ b/source/RobotAPI/libraries/RobotAPIVariantWidget/RobotAPIVariantWidget.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::RobotAPIVariantWidget
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/libraries/RobotAPIVariantWidget/RobotAPIVariantWidget.h b/source/RobotAPI/libraries/RobotAPIVariantWidget/RobotAPIVariantWidget.h
index 73277c1b2a1ef2b03f111c2873d473ca41a9f23e..40b616f95194153696144e4286893a7243cad809 100644
--- a/source/RobotAPI/libraries/RobotAPIVariantWidget/RobotAPIVariantWidget.h
+++ b/source/RobotAPI/libraries/RobotAPIVariantWidget/RobotAPIVariantWidget.h
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::RobotAPIVariantWidget
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
diff --git a/source/RobotAPI/libraries/RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp b/source/RobotAPI/libraries/RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp
index 66687060b2d21073c9751c977ec09d332fc83069..29434013e569e395822acadea3bcfd9251fb50d4 100644
--- a/source/RobotAPI/libraries/RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp
+++ b/source/RobotAPI/libraries/RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @package    RobotAPI::ArmarXObjects::RobotAPIVariantWidget
- * @author     Raphael ( ufdrv at student dot kit dot edu )
+ * @author     Raphael Grimm ( raphael dot grimm at kit dot edu )
  * @date       2017
  * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License