diff --git a/src/core/system_parameters/beidou_dnav_ephemeris.cc b/src/core/system_parameters/beidou_dnav_ephemeris.cc
index bb9bcde71..3ae8335f2 100644
--- a/src/core/system_parameters/beidou_dnav_ephemeris.cc
+++ b/src/core/system_parameters/beidou_dnav_ephemeris.cc
@@ -1,12 +1,11 @@
 /*!
- * \file beidou_ephemeris.cc
+ * \file beidou_dnav_ephemeris.cc
  * \brief  Interface of a BeiDou EPHEMERIS storage and orbital model functions
- *
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -24,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_ephemeris.h b/src/core/system_parameters/beidou_dnav_ephemeris.h
index 238a0a728..2cdfcfe61 100644
--- a/src/core/system_parameters/beidou_dnav_ephemeris.h
+++ b/src/core/system_parameters/beidou_dnav_ephemeris.h
@@ -1,11 +1,11 @@
 /*!
- * \file beidou_ephemeris.h
+ * \file beidou_dnav_ephemeris.h
  * \brief  Interface of a BEIDOU EPHEMERIS storage
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -23,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_iono.cc b/src/core/system_parameters/beidou_dnav_iono.cc
index b7d4ebb7e..a0a20743b 100644
--- a/src/core/system_parameters/beidou_dnav_iono.cc
+++ b/src/core/system_parameters/beidou_dnav_iono.cc
@@ -1,12 +1,11 @@
 /*!
- * \file beidou_iono.cc
+ * \file beidou_dnav_iono.cc
  * \brief  Interface of a BEIDOU IONOSPHERIC MODEL storage
- *
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -24,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_iono.h b/src/core/system_parameters/beidou_dnav_iono.h
index b7a11faf6..2349360bc 100644
--- a/src/core/system_parameters/beidou_dnav_iono.h
+++ b/src/core/system_parameters/beidou_dnav_iono.h
@@ -1,11 +1,11 @@
 /*!
- * \file beidou_iono.h
+ * \file beidou_dnav_iono.h
  * \brief  Interface of a BEIDOU IONOSPHERIC MODEL storage
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -23,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.cc b/src/core/system_parameters/beidou_dnav_navigation_message.cc
index 68e8664e7..e280d07f8 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.cc
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.cc
@@ -1,6 +1,7 @@
 /*!
- * \file beidou_navigation_message.cc
- * \brief  Implementation of a BeiDou D1 NAV Data message decoder as described in BeiDou ICD Version 2.1
+ * \file beidou_dnav_navigation_message.cc
+ * \brief  Implementation of a BeiDou D1 NAV Data message decoder as described
+ * in BeiDou ICD Version 2.1
  *
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  * \author Damian Miralles, 2018. dmiralles2009@gmail.com
@@ -24,7 +25,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.h b/src/core/system_parameters/beidou_dnav_navigation_message.h
index 44d83ca39..97408e452 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.h
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.h
@@ -1,5 +1,5 @@
 /*!
- * \file beidou_navigation_message.h
+ * \file beidou_dnav_navigation_message.h
  * \brief  Interface of a BeiDou DNAV Data message decoder
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  * \author Damian Miralles, 2018. dmiralles2009@gmail.com
@@ -24,7 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_utc_model.cc b/src/core/system_parameters/beidou_dnav_utc_model.cc
index e56d2c1b8..1997f9276 100644
--- a/src/core/system_parameters/beidou_dnav_utc_model.cc
+++ b/src/core/system_parameters/beidou_dnav_utc_model.cc
@@ -1,5 +1,5 @@
 /*!
- * \file beidou_dnav_utc_model.c
+ * \file beidou_dnav_utc_model.cc
  * \brief  Interface of a BeiDou UTC Model storage
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com