diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba8f3c68db4d6f7f8e33420e6b35ddb1f09ac79a..e6825e2a059549c0cd9bf7aff07bf2a40f26fdfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ stages:
   -   export PREV_YEAR=$(( CURRENT_YEAR-1 ))
   -   echo "Creating new file license_header_${CURRENT_YEAR}.txt..."
   -   git mv license_header_${PREV_YEAR}.txt license_header_${CURRENT_YEAR}.txt
-  -   sed -i "s/${PREV_YEAR}/${PREV_YEAR},${CURRENT_YEAR}/g" license_header_${CURRENT_YEAR}.txt
+  -   sed -i "s/${PREV_YEAR}/${CURRENT_YEAR}/g" license_header_${CURRENT_YEAR}.txt
   -   ./license_manager.sh --update --path=${CI_PROJECT_DIR} --license-header=license_header_${CURRENT_YEAR}.txt --exclude=ci_deps
   - fi
   - cd ..
diff --git a/examples/polyline_demo.cpp b/examples/polyline_demo.cpp
index 4bb848cab67a6a968fb76aaf79f7c57798ea43f9..7b7e095d1daa19b1cd8b8e06f64bb99a31b8ac1b 100644
--- a/examples/polyline_demo.cpp
+++ b/examples/polyline_demo.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,14 +17,6 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file polyline_test.cpp
- *
- *  Created on: Jul 5, 2016
- *      \author: jvallve
- */
 
 //LaserScanUtils includes
 #include "laser_scan_utils/line_finder_iterative.h"
diff --git a/include/laser_scan_utils/corner_falko_2d.h b/include/laser_scan_utils/corner_falko_2d.h
index 94911a42cfc9a1344da03498eecfebf93dba936e..bbbe0590b4fb5ab145b5cfd395076c14178b215b 100644
--- a/include/laser_scan_utils/corner_falko_2d.h
+++ b/include/laser_scan_utils/corner_falko_2d.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,17 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file corner_falko_2d.h
- *
- *  Created on: Jan 26, 2021
- *      \author: spujol
- */
 
-#ifndef CORNER_FALKO_2D_H_
-#define CORNER_FALKO_2D_H_
+#pragma once
 
 #include <fstream>
 #include <iostream>
@@ -135,6 +126,4 @@ public:
   int refSceneAddingTh = 4;
 };
 
-} /* namespace laserscanutils */
-
-#endif /* LANDMARK_POLYLINE_2d_H_ */
+} /* namespace laserscanutils */
\ No newline at end of file
diff --git a/include/laser_scan_utils/corner_finder.h b/include/laser_scan_utils/corner_finder.h
index fdab44af6e660639049b2a99926bdaecf5063556..d1bee1fb77b85344da4a3fd4d327a22c53005e1c 100644
--- a/include/laser_scan_utils/corner_finder.h
+++ b/include/laser_scan_utils/corner_finder.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef CORNER_FINDER_H_
-#define CORNER_FINDER_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -119,5 +117,4 @@ class CornerFinder
         virtual void print() const;
 };
 
-}    //namespace
-#endif
+}    //namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/corner_finder_inscribed_angle.h b/include/laser_scan_utils/corner_finder_inscribed_angle.h
index 6f16c9c01d6afdd5c43d73e1aae2406a5dd9c31f..2a12090834c6ab4ee0f77977c18884c020159733 100644
--- a/include/laser_scan_utils/corner_finder_inscribed_angle.h
+++ b/include/laser_scan_utils/corner_finder_inscribed_angle.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef CORNER_FINDER_INSCRIBED_ANGLE_H_
-#define CORNER_FINDER_INSCRIBED_ANGLE_H_
+
+#pragma once
 
 //laserscanutils
 #include "corner_finder.h"
@@ -103,5 +101,4 @@ class CornerFinderInscribedAngle : public CornerFinder
          **/
         void print() const override;
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/corner_point.h b/include/laser_scan_utils/corner_point.h
index a85ff032d7abb27f900704dfd3ca037262743cc8..327d60cc6bcc10295039a34a046f89582600d4ab 100644
--- a/include/laser_scan_utils/corner_point.h
+++ b/include/laser_scan_utils/corner_point.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef CORNER_POINT_H_
-#define CORNER_POINT_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -91,5 +89,4 @@ class CornerPoint
         //print
         void print() const;    
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/grid_2d.h b/include/laser_scan_utils/grid_2d.h
index 00b615435b793521e31a98cecfa5ff213cea7421..b8b3d9d010a9697c843fb42a30e6a19e2dd414f6 100644
--- a/include/laser_scan_utils/grid_2d.h
+++ b/include/laser_scan_utils/grid_2d.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,11 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef GRID2D_H
-#define GRID2D_H
 
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -279,6 +276,4 @@ class Grid2D
     
 };
 
-}//end of namespace
-
-#endif
+}//end of namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/grid_cluster.h b/include/laser_scan_utils/grid_cluster.h
index 026b62129957c2145f2cb75eb26e8345b2c80bf1..a7282afdac945f49b557aa5e1fa53656ac3b48a1 100644
--- a/include/laser_scan_utils/grid_cluster.h
+++ b/include/laser_scan_utils/grid_cluster.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef GRID_CLUSTER_H_
-#define GRID_CLUSTER_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -61,5 +59,4 @@ class GridCluster : public PointSet
         //print
         void print() const override;    
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/icp.h b/include/laser_scan_utils/icp.h
index 2d3376fe59bd70a9de677bf14f465076cb1441c3..bcdfa4278b4e0d3c0ad068be287f0bafd179cdda 100644
--- a/include/laser_scan_utils/icp.h
+++ b/include/laser_scan_utils/icp.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef ICP_H_
-#define ICP_H_
+
+#pragma once
 
 #include "laser_scan.h"
 #include <chrono>
@@ -233,6 +231,4 @@ namespace laserscanutils
         static void printTwoLaserData(sm_params &params);
         static void printLaserData(LDP &laser_data);
     };
-}
-
-#endif
+}
\ No newline at end of file
diff --git a/include/laser_scan_utils/laser_scan.h b/include/laser_scan_utils/laser_scan.h
index 144f031d4e46aa87dd7af207581f6d9470e162ba..f14e7ddf57cd8e094be8d014aef1879a4e27b0a3 100644
--- a/include/laser_scan_utils/laser_scan.h
+++ b/include/laser_scan_utils/laser_scan.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef LASER_SCAN_H_
-#define LASER_SCAN_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -194,6 +192,4 @@ class LaserScan
 
 };
 
-}        //namespace
-#endif
-
+}        //namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/laser_scan_utils.h b/include/laser_scan_utils/laser_scan_utils.h
index b055283cb984abb36f27aa875fca148522fa59dc..33adec2c5eb9cd8617befeba769b4ad6255e12fb 100644
--- a/include/laser_scan_utils/laser_scan_utils.h
+++ b/include/laser_scan_utils/laser_scan_utils.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,11 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
 
-#ifndef TYPES_LASER_SCAN_UTILS_H_
-#define TYPES_LASER_SCAN_UTILS_H_
+#pragma once
 
 //includes from Eigen lib
 #include <Eigen/Dense>
@@ -59,5 +56,4 @@ namespace Eigen
     // 2. Quaternions and other rotation things
     typedef Quaternion<laserscanutils::ScalarT> Quaternions;               ///< Quaternion of real scalar_t type
     typedef AngleAxis<laserscanutils::ScalarT> AngleAxiss;                 ///< Angle-Axis of real scalar_t type
-}
-#endif
+}
\ No newline at end of file
diff --git a/include/laser_scan_utils/laser_scan_with_params.h b/include/laser_scan_utils/laser_scan_with_params.h
index db93fc00cb13fa9794083f5607be3d989f460bff..5ff9b189e8b09d3ba70ea10b387af559dca18a53 100644
--- a/include/laser_scan_utils/laser_scan_with_params.h
+++ b/include/laser_scan_utils/laser_scan_with_params.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef LASER_SCAN_WITH_PARAMS_H_
-#define LASER_SCAN_WITH_PARAMS_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan.h"
@@ -57,6 +55,4 @@ class LaserScanWithParams : public LaserScan
 
 };
 
-}        //namespace
-#endif
-
+}        //namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/line_finder.h b/include/laser_scan_utils/line_finder.h
index 5696da18fa50106dd904a75648a8d6773d79af1a..5df2fb6f2965363daa9ff365f9aed82fdfd8bc54 100644
--- a/include/laser_scan_utils/line_finder.h
+++ b/include/laser_scan_utils/line_finder.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef LINE_FINDER_H_
-#define LINE_FINDER_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -119,5 +117,4 @@ class LineFinder
          **/
         virtual void print() const;
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/line_finder_hough.h b/include/laser_scan_utils/line_finder_hough.h
index 1b4f8840bd5870458113263015b538cfb6354032..97bc5c0e5b4c1142aeaad95540b24a1c2d932bfb 100644
--- a/include/laser_scan_utils/line_finder_hough.h
+++ b/include/laser_scan_utils/line_finder_hough.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef LINE_FINDER_HOUGH_H_
-#define LINE_FINDER_HOUGH_H_
+
+#pragma once
 
 //laserscanutils
 #include "line_finder.h"
@@ -110,5 +108,4 @@ class LineFinderHough : public LineFinder
          **/
         void print() const override;
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/line_finder_iterative.h b/include/laser_scan_utils/line_finder_iterative.h
index c68055cbb5f39f81aba83ac3833861df1a1f962e..19aced84ee39fbc60b80de9ebc3e3a9794c6e2d9 100644
--- a/include/laser_scan_utils/line_finder_iterative.h
+++ b/include/laser_scan_utils/line_finder_iterative.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef LINE_FINDER_ITERATIVE_H_
-#define LINE_FINDER_ITERATIVE_H_
+
+#pragma once
 
 //laserscanutils
 #include "line_finder.h"
@@ -194,5 +192,4 @@ class LineFinderIterative : public LineFinder
 
 };
 
-} //namespace
-#endif
+} //namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/line_finder_jump_fit.h b/include/laser_scan_utils/line_finder_jump_fit.h
index ed3acb1061a5e12fe82d760ab6516c63ad778656..6df0a3b4f743e8231d3aad2f78f5335d3aa16293 100644
--- a/include/laser_scan_utils/line_finder_jump_fit.h
+++ b/include/laser_scan_utils/line_finder_jump_fit.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef LINE_FINDER_JUMP_FIT_H_
-#define LINE_FINDER_JUMP_FIT_H_
+
+#pragma once
 
 //laserscanutils
 #include "line_finder.h"
@@ -105,5 +103,4 @@ class LineFinderJumpFit : public LineFinder
          **/
         void print() const override;
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/line_segment.h b/include/laser_scan_utils/line_segment.h
index 6b5b28a9eb73c939bf88ce5f4afdf45fe4c5383a..e97a305b978060d599f032a05dad66e92592fd72 100644
--- a/include/laser_scan_utils/line_segment.h
+++ b/include/laser_scan_utils/line_segment.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef LINE_SEGMENT_H_
-#define LINE_SEGMENT_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -106,5 +104,4 @@ class LineSegment
         //print
         void print() const;    
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/loop_closure_base.h b/include/laser_scan_utils/loop_closure_base.h
index 92fe92be01145cc5bf659cca3b5a047a6a207764..a40c53becd93c0e52fc1431f7663726f29e4b949 100644
--- a/include/laser_scan_utils/loop_closure_base.h
+++ b/include/laser_scan_utils/loop_closure_base.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,17 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file loop_closure_base_2d.h
- *
- *  Created on: Feb 9, 2021
- *      \author: spujol
- */
 
-#ifndef LOOP_CLOSURE_BASE_2D_H_
-#define LOOP_CLOSURE_BASE_2D_H_
+#pragma once
 
 #include <fstream>
 #include <iostream>
@@ -86,6 +77,4 @@ namespace laserscanutils
             return matchings;
         }
     };
-} /* namespace laserscanutils */
-
-#endif /* LOOP_CLOSURE_BASE_2D_H_ */
+} /* namespace laserscanutils */
\ No newline at end of file
diff --git a/include/laser_scan_utils/loop_closure_falko.h b/include/laser_scan_utils/loop_closure_falko.h
index c5b3e1d2a104118f594ab4c59c929a9213574905..0f452229940e66a78b5c0e3e7d851e63a7b0b3fa 100644
--- a/include/laser_scan_utils/loop_closure_falko.h
+++ b/include/laser_scan_utils/loop_closure_falko.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,17 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file loop_closure_base_2d.h
- *
- *  Created on: Feb 9, 2021
- *      \author: spujol
- */
 
-#ifndef LOOP_CLOSURE_FALKO_H_
-#define LOOP_CLOSURE_FALKO_H_
+#pragma once
 
 #include <fstream>
 #include <iostream>
@@ -539,6 +530,4 @@ template <class D, class Extr> class LoopClosureFalkoNn : public LoopClosureFalk
           };
 };
 
-} /* namespace laserscanutils */
-
-#endif /* LOOP_CLOSURE_FALKO_H_ */
+} /* namespace laserscanutils */
\ No newline at end of file
diff --git a/include/laser_scan_utils/match_loop_closure_scene.h b/include/laser_scan_utils/match_loop_closure_scene.h
index 98053932e2f9f7b81b16c668a4d5b39c7e2bdb1b..d15ca18bd763eada94487042bcc2d20d21b91db8 100644
--- a/include/laser_scan_utils/match_loop_closure_scene.h
+++ b/include/laser_scan_utils/match_loop_closure_scene.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,17 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file match_loop_closure.h
- *
- *  Created on: Feb 15, 2021
- *      \author: spujol
- */
 
-#ifndef MATCH_LOOP_CLOSURE_SCENE_H_
-#define MATCH_LOOP_CLOSURE_SCENE_H_
+#pragma once
 
 #include <fstream>
 #include <iostream>
@@ -52,6 +43,4 @@ struct MatchLoopClosureScene {
 
 typedef std::shared_ptr<MatchLoopClosureScene> MatchLoopClosureScenePtr;
 
-} /* namespace laserscanutils */
-
-#endif /* MATCH_LOOP_CLOSURE_SCENE_H_ */
+} /* namespace laserscanutils */
\ No newline at end of file
diff --git a/include/laser_scan_utils/point_set.h b/include/laser_scan_utils/point_set.h
index 1dc8b8e90ad819f588782693c8f451f479557ee8..19f9f3e207413a061b1eec6976481c303bcd45f6 100644
--- a/include/laser_scan_utils/point_set.h
+++ b/include/laser_scan_utils/point_set.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef POINT_SET_H_
-#define POINT_SET_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -130,5 +128,4 @@ class PointSet
         //print
         virtual void print() const;    
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/polyline.h b/include/laser_scan_utils/polyline.h
index 03012f69ae513ad05b1333e4341b52f0d227a525..dc38190cdacf5a91825e5ef27b697dfd28749750 100644
--- a/include/laser_scan_utils/polyline.h
+++ b/include/laser_scan_utils/polyline.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef POLYLINE_H_
-#define POLYLINE_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -62,5 +60,4 @@ class Polyline
         //compute lines between points
         void computeLines();    
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/scan_segment.h b/include/laser_scan_utils/scan_segment.h
index 21520f7bc801dbf295733ca0d62fe961569866bc..04a56b79e514433b6003f7996929c96deed48be2 100644
--- a/include/laser_scan_utils/scan_segment.h
+++ b/include/laser_scan_utils/scan_segment.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,10 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-#ifndef SCAN_SEGMENT_H_
-#define SCAN_SEGMENT_H_
+
+#pragma once
 
 //laserscanutils
 #include "laser_scan_utils.h"
@@ -66,5 +64,4 @@ class ScanSegment : public PointSet
         //print
         void print() const override;    
 };
-}//namespace
-#endif
+}//namespace
\ No newline at end of file
diff --git a/include/laser_scan_utils/scene_base.h b/include/laser_scan_utils/scene_base.h
index cb3d2220ca1e1cb4105e3213371c09f0d7cf546f..fee3cf3410d5d3bf3f89a4551212c3d3401ea87d 100644
--- a/include/laser_scan_utils/scene_base.h
+++ b/include/laser_scan_utils/scene_base.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,17 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file scene_base.h
- *
- *  Created on: Feb 9, 2021
- *      \author: spujol
- */
 
-#ifndef SCENE_BASE_H_
-#define SCENE_BASE_H_
+#pragma once
 
 #include <fstream>
 #include <iostream>
@@ -50,6 +41,4 @@ struct SceneBase
 };
 typedef std::shared_ptr<SceneBase> sceneBasePtr;
 
-} /* namespace laserscanutils */
-
-#endif /* SCENE_BASE_H_ */
+} /* namespace laserscanutils */
\ No newline at end of file
diff --git a/include/laser_scan_utils/scene_falko.h b/include/laser_scan_utils/scene_falko.h
index 3775176ced0e4c8b0688a6113344171b49d0c8ec..997a1ef049b2eb81178d84926f0ec843c5253c19 100644
--- a/include/laser_scan_utils/scene_falko.h
+++ b/include/laser_scan_utils/scene_falko.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,17 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file scene_falko.h
- *
- *  Created on: Feb 9, 2021
- *      \author: spujol
- */
 
-#ifndef SCENE_FALKO_H_
-#define SCENE_FALKO_H_
+#pragma once
 
 #include <fstream>
 #include <iostream>
@@ -60,6 +51,4 @@ template <typename D> struct SceneFalko : public SceneFalkoBase
     std::vector<double>          angle_rotation_;
 };
 
-} /* namespace laserscanutils */
-
-#endif /* SCENE_FALKO_H_ */
+} /* namespace laserscanutils */
\ No newline at end of file
diff --git a/include/laser_scan_utils/scene_falko_base.h b/include/laser_scan_utils/scene_falko_base.h
index 62f79159c46fdd58b60b1bdf29e72018c802c221..73ee77f989ceb228c3b1ea3b4b34ec40a6b53707 100644
--- a/include/laser_scan_utils/scene_falko_base.h
+++ b/include/laser_scan_utils/scene_falko_base.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,11 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
 
-#ifndef SCENE_FALKO_BASE_H_
-#define SCENE_FALKO_BASE_H_
+#pragma once
 
 #include <fstream>
 #include <iostream>
@@ -51,6 +48,4 @@ struct SceneFalkoBase : public SceneBase
     std::vector<falkolib::FALKO> keypoints_list_rotated_reverse_;
 };
 
-} /* namespace laserscanutils */
-
-#endif /* SCENE_FALKO_H_ */
+} /* namespace laserscanutils */
\ No newline at end of file
diff --git a/scripts/license_header_2024.txt b/scripts/license_header_2024.txt
index 4ce85681fb046d89ac14cb43dc6caafd0a68198b..8ee8def7dedd0f3d517f212085d387b4329c46a0 100644
--- a/scripts/license_header_2024.txt
+++ b/scripts/license_header_2024.txt
@@ -1,9 +1,11 @@
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
 // (at your option) any later version.
diff --git a/scripts/license_manager.sh b/scripts/license_manager.sh
index 74f790a95133bb09f07b016ed55c3a7b67e2a9bc..888b156d3621ff51942080fd32649f0c4c8920a8 100755
--- a/scripts/license_manager.sh
+++ b/scripts/license_manager.sh
@@ -4,9 +4,7 @@
 #
 # This script is used for managing the license headers of code files (.h, .c, .cpp, .hpp)
 # This file is automatically called by the CI in gitlab.
-
-line_start_mark="//--------LICENSE_START--------"
-line_end_mark="//--------LICENSE_END--------"
+echo "==== WOLF license_manager script ===="
 
 #options
 tmp=false
@@ -14,7 +12,10 @@ mode="none"
 path=""
 exclude_folder=""
 #recursive=true
-license=""
+#license=""
+config_folder=""
+license_exclude=""
+exclude_mark="// This is not part of LaserScanUtils"
 
 for i in "$@"; do
   case $i in
@@ -26,22 +27,22 @@ for i in "$@"; do
       path="${i#*=}"
       shift # past argument=value
       ;;
-    --license-header=*)
-      license="${i#*=}"
+    --config-path=*)
+      config_folder="${i#*=}"
       shift # past argument=value
       ;;
     --add)
       mode="add"
-      if [ $mode == "update" ]; then
-        echo "Error: Script cannot be called with both options: --update or --add"
+      if [ $mode == "remove" ]; then
+        echo "Script cannot be called with both options: --remove or --add">&2
         exit 1
       fi
       shift # past argument=value
       ;;
-    --update)
-      mode="update"
+    --remove)
+      mode="remove"
       if [ $mode == "add" ]; then
-        echo "Error: Script cannot be called with both options: --update or --add"
+        echo "Script cannot be called with both options: --remove or --add">&2
         exit 1
       fi
       shift # past argument=value
@@ -56,29 +57,45 @@ for i in "$@"; do
   esac
 done
 
-# check options
+# CHECKS VALID OPTIONS =================================
 if [ "$path" == "" ]; then
-  echo 'Please, provide the path to the folder containing the code with --path=/my/folder/code'
+  echo 'Please, provide the path to the folder containing the code with --path=/my/folder/code'>&2
   exit 1
 else
   if [ -d "$path" ]; then
     echo "Valid path: ${path}"
   else
-    echo "Error: ${path} not found. Can not continue."
-  exit 1
+    echo "${path} not found. Can not continue.">&2
+    exit 1
   fi
 fi
 
-if [ "$license" == "" ]; then
-  echo 'Error: Please, provide the path to the folder containing the code with --license-header=/my/license/header/file.txt'
+if [ "$config_folder" == "" ]; then
+  echo 'Please, provide the path to the folder containing the config files (license file "license_header*.txt" and the optional "license_exclude.txt") with --config-path=/my/license/and/exclude/files/folder'>&2
   exit 1
 else
-  if [ -f "$license" ]; then
-    echo "Valid license header file: ${license} containing:"
-    cat ${license}
+  if [ -d "$config_folder" ]; then
+    echo "Valid config folder: ${config_folder}"
+
+    license=$(find $config_folder -maxdepth 1 -name 'license_header*.txt')
+    if (( ${#license[@]} != 1 )); then
+      echo "No license header file found" >&2
+    fi
+    if [ -f "$license" ]; then
+      echo "Valid license header file: ${license} containing:"
+      cat ${license}
+    else
+      echo "License header file ${license} not found.">&2
+      exit 1
+    fi
+    if [ -f "${config_folder}/license_exclude.txt" ]; then
+      echo "License_exclude file containing:"
+      cat ${config_folder}/license_exclude.txt
+      echo ""
+    fi
   else
-    echo "Error: License header file ${license} not found. Can not continue."
-  exit 1
+    echo "Config path ${config_folder} not found.">&2
+    exit 1
   fi
 fi
 
@@ -86,17 +103,30 @@ if [ "$exclude_folder" == "" ]; then
   echo "No folders will be excluded"
 else
   if [ -d "${path}/${exclude_folder}" ]; then
-    echo "Valid remove folder path: ${path}/${exclude_folder}"
+    echo "Valid exclude folder path: ${path}/${exclude_folder}"
+  else
+    echo "exclude folder ${path}/${exclude_folder} not found. Remember that it should be relative to --path.">&2
+    exit 1
   fi
 fi
 
 if [ $mode == "none" ]; then
-  echo "Error: Script should be called with one of the following options: --update or --add"
+  echo "Script should be called with one of the following options: --remove or --add">&2
   exit 1
 else
   echo "mode: ${mode}"
 fi
 
+# START SCRIPT ==========================================
+
+# DETECT FIRST AND LAST LICENSE LINES
+sed -i -e '/./,$!d' -e :a -e '/^\n*$/{$d;N;ba' -e '}' $license #remove empty lines at the beginning and at the end
+line_start_mark=$(head -n 1 $license)
+line_end_mark=$(tail -n 1 $license)
+echo "line_start: $line_start_mark"
+echo "line_end: $line_end_mark"
+echo "excluding files starting with: $exclude_mark"
+
 # PATH (AND tmp FOLDER)
 folder=$path
 if [ $tmp == true ]; then
@@ -110,35 +140,47 @@ fi
 if [ "$exclude_folder" == "" ]; then
   file_list=$(find $folder -name '*.c' -or -name '*.cpp' -or -name '*.h' -or -name '*.hpp')
 else
-  file_list=$(find $folder -path ${folder}/${exclude_folder} -prune -name '*.c' -or -name '*.cpp' -or -name '*.h' -or -name '*.hpp')
+  file_list=$(find $folder -path ${path}/${exclude_folder} -prune -name '*.c' -or -name '*.cpp' -or -name '*.h' -or -name '*.hpp')
 fi
 
+# FILTER FILES IF LICENSE EXCLUDE
+if [ -f "${config_folder}/license_exclude.txt" ]; then
+  file_list=$(grep -Ev -f ${config_folder}/license_exclude.txt <(printf "%s\n" "${file_list[@]}"))
+fi
+# printf "%s\n" "${file_list[@]}"
+
 # DETECT AND REMOVE EXISTING LICENSE
-if [ "$mode" == "update" ]; then
-  echo "Recursely removing license header from all files (.c, .cpp, .h, .hpp)"
+if [ "$mode" == "remove" ]; then
+  echo "Recursely removing license header from all files (.c, .cpp, .h, .hpp):"
   for i in $file_list
   do
-    if grep -Fxq ${line_start_mark} $i 
-    then
-      echo "  Removing license header from file ${i}"
-      line_start="$(grep -wn $line_start_mark ${i} | head -n 1 | cut -d: -f1)"
-      line_end="$(grep -wn $line_end_mark ${i} | head -n 1 | cut -d: -f1)"
-      #echo ${line_start}
-      #echo ${line_end}
+    if grep -m1 -Fxq "${line_start_mark}" $i; then
+      echo " - ${i}"
+      line_start="$(grep -Fxn "$line_start_mark" ${i} | head -n 1 | cut -d: -f1)"
+      line_end="$(grep -Fxn "$line_end_mark" ${i} | head -n 1 | cut -d: -f1)"
+      # echo ${line_start}
+      # echo ${line_end}
       awk -v m=$line_start -v n=$line_end 'm <= NR && NR <= n {next} {print}' $i > tmpfile && mv tmpfile $i 
-      #cat $i
+      # cat $i
     fi
   done
 fi
 
 # ADD CONTENT OF license-file AT THE BEGINNING OF CODE FILES
-echo "Recursively adding license header to all files (.c, .cpp, .h, .hpp)"
-for i in $file_list
-do
-  if grep -Fxq ${line_start_mark} $i; then
-    echo "skippping ${i}"
-  else
-    ( echo ${line_start_mark}$'\n//'; cat ${license}; echo $'//\n'${line_end_mark}; cat $i ) > temp_file
-    mv temp_file $i
-  fi
-done
+if [ "$mode" == "add" ]; then
+  echo "Recursively adding license header to all files (.c, .cpp, .h, .hpp):"
+  for i in $file_list
+  do
+    if grep -m1 -Fxq "${exclude_mark}" $i; then
+      echo "excluding ${i} since it contains exclude mark"
+    else
+      if grep -m1 -Fxq "${line_start_mark}" $i; then
+        :
+      else
+        echo " - ${i}"
+        ( cat ${license}; cat $i ) > temp_file
+        mv temp_file $i
+      fi
+    fi
+  done
+fi
diff --git a/src/corner_falko_2d.cpp b/src/corner_falko_2d.cpp
index 1b49e3316eaaa757e39ddda3ab15e6e461e8deee..b501a995c6233e790fddc393046727dc6e654c5d 100644
--- a/src/corner_falko_2d.cpp
+++ b/src/corner_falko_2d.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,14 +17,6 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file corner_falko_2d.cpp
- *
- *  Created on: Jan 26, 2021
- *      \author: spujol
- */
 
 #include "laser_scan_utils/corner_falko_2d.h"
 
diff --git a/src/corner_finder.cpp b/src/corner_finder.cpp
index 023b6cd817a1d140b5c5dbf481da9b26793a9459..68aaf99be7a86b43598e210c7123035fec201413 100644
--- a/src/corner_finder.cpp
+++ b/src/corner_finder.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/corner_finder.h"
 
 namespace laserscanutils
diff --git a/src/corner_finder_inscribed_angle.cpp b/src/corner_finder_inscribed_angle.cpp
index 5e8d7e4823504f8950ee685637a1b56ec49012c3..2fabedec12e61ea124373c2eb6e508a172431790 100644
--- a/src/corner_finder_inscribed_angle.cpp
+++ b/src/corner_finder_inscribed_angle.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/corner_finder_inscribed_angle.h"
 
 namespace laserscanutils
diff --git a/src/corner_point.cpp b/src/corner_point.cpp
index ebc5338616e21e0373211b7ecf95941f809aaf0b..6b82c682aec69a94ea1047dafd36ddfdc26804ed 100644
--- a/src/corner_point.cpp
+++ b/src/corner_point.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/corner_point.h"
 
 //open namespace
diff --git a/src/grid_2d.cpp b/src/grid_2d.cpp
index a9cafde5fd2d3ae32624c43bc62602949d133b31..49282c0d064a044f517b29741e5e8a1b4ac912a2 100644
--- a/src/grid_2d.cpp
+++ b/src/grid_2d.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 
 #include "laser_scan_utils/grid_2d.h"
 
diff --git a/src/grid_cluster.cpp b/src/grid_cluster.cpp
index aa129436facb83c3b02a58c923cab7b7e0e7d6f2..288a5d6289da4b8c44f1f25524162e1f5e31be58 100644
--- a/src/grid_cluster.cpp
+++ b/src/grid_cluster.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/grid_cluster.h"
 
 namespace laserscanutils
diff --git a/src/icp.cpp b/src/icp.cpp
index ba0242017742660b114d6e8fe0d7fe41a854e5a2..14f5c0185fe127f9d43095139bd4ce16d27fdec1 100644
--- a/src/icp.cpp
+++ b/src/icp.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/icp.h"
 #include <algorithm>
 #include <unistd.h>
diff --git a/src/laser_scan.cpp b/src/laser_scan.cpp
index 18a0cb2e05583856b9228f35e56c44b22bd6262b..317452f46f437728722ac236973d8adfde4e53de 100644
--- a/src/laser_scan.cpp
+++ b/src/laser_scan.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/laser_scan.h"
 
 namespace laserscanutils
diff --git a/src/laser_scan_with_params.cpp b/src/laser_scan_with_params.cpp
index 7bfe8b2c787a8d4a81ce32da6c65eba2656d1c43..5f8c0263b213612b85998567627f3507c3327e62 100644
--- a/src/laser_scan_with_params.cpp
+++ b/src/laser_scan_with_params.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 
 #include "laser_scan_utils/laser_scan_with_params.h"
 
diff --git a/src/line_finder.cpp b/src/line_finder.cpp
index 964482ab09deec7cd9f16191771a47b4ed0f3714..8df668784f341979715ca43be1243a32bfab2779 100644
--- a/src/line_finder.cpp
+++ b/src/line_finder.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/line_finder.h"
 
 namespace laserscanutils
diff --git a/src/line_finder_hough.cpp b/src/line_finder_hough.cpp
index 79a2e3c25f620b02e5a66a789804d8b3d8b94c4f..143c96a663759e0e7c6e6819674c3fc9a10beabd 100644
--- a/src/line_finder_hough.cpp
+++ b/src/line_finder_hough.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/line_finder_hough.h"
 
 namespace laserscanutils
diff --git a/src/line_finder_iterative.cpp b/src/line_finder_iterative.cpp
index bd6150c17d16b50c217bae5a1e60ee5f89454354..b59a3ae246ba0ced18fc651f5781daa317082e9d 100644
--- a/src/line_finder_iterative.cpp
+++ b/src/line_finder_iterative.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/line_finder_iterative.h"
 
 namespace laserscanutils
diff --git a/src/line_finder_jump_fit.cpp b/src/line_finder_jump_fit.cpp
index 614049c06e0e3207bc01d3f54d6e3e1d9de903ad..9e284db4fc922ad25893af272499792050c21a13 100644
--- a/src/line_finder_jump_fit.cpp
+++ b/src/line_finder_jump_fit.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/line_finder_jump_fit.h"
 
 namespace laserscanutils
diff --git a/src/line_segment.cpp b/src/line_segment.cpp
index 66d3a557f8834c6adee4b854d3af245d4320ec2f..90971f6815ee298393d1ced7a0a06f17d308f8f0 100644
--- a/src/line_segment.cpp
+++ b/src/line_segment.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/line_segment.h"
 
 namespace laserscanutils
diff --git a/src/loop_closure_base.cpp b/src/loop_closure_base.cpp
index 68c76bf53d699b2c2e4bf7f5d13b4960d9fd332f..26632d39e0df1c59b804e870b5f6fd2f19a2aa64 100644
--- a/src/loop_closure_base.cpp
+++ b/src/loop_closure_base.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,14 +17,6 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file loop_closure_base_2d.h
- *
- *  Created on: Feb 9, 2021
- *      \author: spujol
- */
 
 #include "laser_scan_utils/loop_closure_base.h"
 
diff --git a/src/point_set.cpp b/src/point_set.cpp
index 80b1eb262fb1cd99b13d8ea10879920c98d12ff1..b28171017328b749b718c968996d817a76b0e6bd 100644
--- a/src/point_set.cpp
+++ b/src/point_set.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/scan_segment.h"
 
 namespace laserscanutils
diff --git a/src/polyline.cpp b/src/polyline.cpp
index 75e1ab852b3d8c3b74bcd8056ab54d72f8027d9a..59fee5e47ef97d63afad96b783fea0c245d13aa4 100644
--- a/src/polyline.cpp
+++ b/src/polyline.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/polyline.h"
 
 namespace laserscanutils
diff --git a/src/scan_segment.cpp b/src/scan_segment.cpp
index 7abb6eabd282e940e010839b0c11d0a8350149e8..e19bc7e7471c9a40caad0ba7d63e92d3e9f0056e 100644
--- a/src/scan_segment.cpp
+++ b/src/scan_segment.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "laser_scan_utils/scan_segment.h"
 
 namespace laserscanutils
diff --git a/test/data/scan_data.h b/test/data/scan_data.h
index 4c48f052634d163bc24f6de10ca5c8a5119827ea..660bc89c624cbc78649a493453009023031cddf1 100644
--- a/test/data/scan_data.h
+++ b/test/data/scan_data.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 /**
  * FALKOLib - Fast Adaptive Laser Keypoint Orientation-invariant
  * Copyright (C) 2016 Fabjan Kallasi and Dario Lodi Rizzini.
diff --git a/test/gtest/utils_gtest.h b/test/gtest/utils_gtest.h
index 15ab2385027cb84056c986e181ca68227b48acff..0c39d4df9e34502480172d008699eaa14fc106c6 100644
--- a/test/gtest/utils_gtest.h
+++ b/test/gtest/utils_gtest.h
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,18 +17,8 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
-/**
- * \file utils_gtest.h
- * \brief Some utils for gtest
- * \author Jeremie Deray
- *  Created on: 26/09/2016
- *  Eigen macros extension by: Joan Sola on 26/04/2017
- */
 
-#ifndef GNSSUTILS_UTILS_GTEST_H
-#define GNSSUTILS_UTILS_GTEST_H
+#pragma once
 
 #include <gtest/gtest.h>
 
@@ -163,5 +153,3 @@ TEST(Test, Foo)
                C_expect, C_actual);
 
 } // namespace testing
-
-#endif /* GNSSUTILS_UTILS_GTEST_H */
diff --git a/test/gtest_example.cpp b/test/gtest_example.cpp
index 3fd271cc234acfa3854a7b7ab964a11d4b8700d9..5c5c860d4bb5f472c76382eb2b8a42b699eacca9 100644
--- a/test/gtest_example.cpp
+++ b/test/gtest_example.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "gtest/utils_gtest.h"
 
 TEST(TestTest, DummyTestExample)
diff --git a/test/gtest_icp.cpp b/test/gtest_icp.cpp
index ca66669176626d33c2021b3b88b1d4adbd153731..d4b9e668810a85e42641b0958e5e5e8bdf64dfd8 100644
--- a/test/gtest_icp.cpp
+++ b/test/gtest_icp.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "gtest/utils_gtest.h"
 #include "laser_scan_utils/laser_scan.h"
 #include "laser_scan_utils/icp.h"
diff --git a/test/gtest_loop_closure_falko.cpp b/test/gtest_loop_closure_falko.cpp
index 6225f5fa6c909f4d7de69ca15bd0775c8c5eb0d4..31d72890ba9903d336ad3376d92202b0744d1ceb 100644
--- a/test/gtest_loop_closure_falko.cpp
+++ b/test/gtest_loop_closure_falko.cpp
@@ -1,14 +1,14 @@
-//--------LICENSE_START--------
-//
-// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
-// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu)
+// LaserScanUtils - Copyright (C) 2020-2025 
+// Institut de Robòtica i Informàtica Industrial, CSIC-UPC.
+// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), 
+// Andreu Corominas Murtra (acorominas@iri.upc.edu)
 // All rights reserved.
 //
-// This file is part of laser_scan_utils
-// laser_scan_utils is free software: you can redistribute it and/or modify
+// This file is part of gnss_utils
+// gnss_utils 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 3 of the License, or
-// at your option) any later version.
+// (at your option) any later version.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +17,7 @@
 //
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-//--------LICENSE_END--------
+
 #include "gtest/utils_gtest.h"
 #include "data/scan_data.h"
 #include "laser_scan_utils/loop_closure_base.h"