diff --git a/models/bodystate/test_bodystate/test_bodystate.cc b/models/bodystate/test_bodystate/test_bodystate.cc
index ca33a1e..ae9beda 100644
--- a/models/bodystate/test_bodystate/test_bodystate.cc
+++ b/models/bodystate/test_bodystate/test_bodystate.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "test_bodystate.h"
diff --git a/models/bodystate/vizkit3d_bodystate/vizkit3d_bodystate.cc b/models/bodystate/vizkit3d_bodystate/vizkit3d_bodystate.cc
index 9e68c70..d3a1400 100644
--- a/models/bodystate/vizkit3d_bodystate/vizkit3d_bodystate.cc
+++ b/models/bodystate/vizkit3d_bodystate/vizkit3d_bodystate.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_bodystate.h"
diff --git a/models/bodystate/vizkit3d_rigidbodystate/vizkit3d_rigidbodystate.cc b/models/bodystate/vizkit3d_rigidbodystate/vizkit3d_rigidbodystate.cc
index 6b052a0..f59ab32 100644
--- a/models/bodystate/vizkit3d_rigidbodystate/vizkit3d_rigidbodystate.cc
+++ b/models/bodystate/vizkit3d_rigidbodystate/vizkit3d_rigidbodystate.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* Functions to be filled by the user (never overwritten by buildsupport tool) */
 
 #include "vizkit3d_rigidbodystate.h"
diff --git a/models/range/test_range/test_range.cc b/models/range/test_range/test_range.cc
index 5cca3de..70c8be9 100644
--- a/models/range/test_range/test_range.cc
+++ b/models/range/test_range/test_range.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "test_range.h"
diff --git a/models/range/vizkit3d_depthmap/vizkit3d_depthmap.cc b/models/range/vizkit3d_depthmap/vizkit3d_depthmap.cc
index 5fc7279..0a19a35 100644
--- a/models/range/vizkit3d_depthmap/vizkit3d_depthmap.cc
+++ b/models/range/vizkit3d_depthmap/vizkit3d_depthmap.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_depthmap.h"
diff --git a/models/range/vizkit3d_laserscan/vizkit3d_laserscan.cc b/models/range/vizkit3d_laserscan/vizkit3d_laserscan.cc
index 4810ac5..957898c 100644
--- a/models/range/vizkit3d_laserscan/vizkit3d_laserscan.cc
+++ b/models/range/vizkit3d_laserscan/vizkit3d_laserscan.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_laserscan.h"
diff --git a/models/range/vizkit3d_pointcloud/vizkit3d_pointcloud.cc b/models/range/vizkit3d_pointcloud/vizkit3d_pointcloud.cc
index 9653eff..f07860f 100644
--- a/models/range/vizkit3d_pointcloud/vizkit3d_pointcloud.cc
+++ b/models/range/vizkit3d_pointcloud/vizkit3d_pointcloud.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_pointcloud.h"
diff --git a/models/range/vizkit3d_sonarbeam/vizkit3d_sonarbeam.cc b/models/range/vizkit3d_sonarbeam/vizkit3d_sonarbeam.cc
index 8780213..2367b73 100644
--- a/models/range/vizkit3d_sonarbeam/vizkit3d_sonarbeam.cc
+++ b/models/range/vizkit3d_sonarbeam/vizkit3d_sonarbeam.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_sonarbeam.h"
diff --git a/models/robot/test_robot/test_robot.cc b/models/robot/test_robot/test_robot.cc
index c9700f1..0e8ba3b 100644
--- a/models/robot/test_robot/test_robot.cc
+++ b/models/robot/test_robot/test_robot.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "test_robot.h"
diff --git a/models/robot/vizkit3d_robot/vizkit3d_robot.cc b/models/robot/vizkit3d_robot/vizkit3d_robot.cc
index 3f5b2f3..d61fa51 100644
--- a/models/robot/vizkit3d_robot/vizkit3d_robot.cc
+++ b/models/robot/vizkit3d_robot/vizkit3d_robot.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_robot.h"
diff --git a/models/trajectory/test_trajectory/test_trajectory.cc b/models/trajectory/test_trajectory/test_trajectory.cc
index 008f75c..c3a24b0 100644
--- a/models/trajectory/test_trajectory/test_trajectory.cc
+++ b/models/trajectory/test_trajectory/test_trajectory.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "test_trajectory.h"
diff --git a/models/trajectory/vizkit3d_motioncommand/vizkit3d_motioncommand.cc b/models/trajectory/vizkit3d_motioncommand/vizkit3d_motioncommand.cc
index 6c079cd..c88f155 100644
--- a/models/trajectory/vizkit3d_motioncommand/vizkit3d_motioncommand.cc
+++ b/models/trajectory/vizkit3d_motioncommand/vizkit3d_motioncommand.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_motioncommand.h"
diff --git a/models/trajectory/vizkit3d_trajectory/vizkit3d_trajectory.cc b/models/trajectory/vizkit3d_trajectory/vizkit3d_trajectory.cc
index 376f485..2361522 100644
--- a/models/trajectory/vizkit3d_trajectory/vizkit3d_trajectory.cc
+++ b/models/trajectory/vizkit3d_trajectory/vizkit3d_trajectory.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_trajectory.h"
diff --git a/models/trajectory/vizkit3d_waypoint/vizkit3d_waypoint.cc b/models/trajectory/vizkit3d_waypoint/vizkit3d_waypoint.cc
index c40ad10..6b63d0e 100644
--- a/models/trajectory/vizkit3d_waypoint/vizkit3d_waypoint.cc
+++ b/models/trajectory/vizkit3d_waypoint/vizkit3d_waypoint.cc
@@ -1,3 +1,9 @@
+/*
+ * H2020 ESROCOS Project
+ * Company: GMV Aerospace & Defence S.A.U.
+ * Licence: GPLv2
+ */
+
 /* User code: This file will not be overwritten by TASTE. */
 
 #include "vizkit3d_waypoint.h"
diff --git a/test/make-links.sh b/test/make-links.sh
index 4f81802..49c46cb 100755
--- a/test/make-links.sh
+++ b/test/make-links.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# H2020 ESROCOS Project
+# Company: GMV Aerospace & Defence S.A.U.
+# Licence: GPLv2
+
 # Run the script from the build folder.
 #
 # Makes symbolic links to the configuration and data files of the