diff --git a/lib/include/srslte/phy/fec/ldpc/base_graph.h b/lib/include/srslte/phy/fec/ldpc/base_graph.h
index 698dd5505..c068dd662 100644
--- a/lib/include/srslte/phy/fec/ldpc/base_graph.h
+++ b/lib/include/srslte/phy/fec/ldpc/base_graph.h
@@ -14,7 +14,7 @@
  * \file base_graph.h
  * \brief Declaration of the two LDPC base graphs employed in the 5G NR
  * standard.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * This file declares the dimensions of the base graphs and provides an interface
diff --git a/lib/include/srslte/phy/fec/ldpc/ldpc_common.h b/lib/include/srslte/phy/fec/ldpc/ldpc_common.h
index f9d6d245c..27b90f848 100644
--- a/lib/include/srslte/phy/fec/ldpc/ldpc_common.h
+++ b/lib/include/srslte/phy/fec/ldpc/ldpc_common.h
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_common.h
  * \brief Declaration of elements common to both the LDPC encoder and the LDPC decoder.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/ldpc/ldpc_decoder.h b/lib/include/srslte/phy/fec/ldpc/ldpc_decoder.h
index d97447aa7..21d26f48f 100644
--- a/lib/include/srslte/phy/fec/ldpc/ldpc_decoder.h
+++ b/lib/include/srslte/phy/fec/ldpc/ldpc_decoder.h
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_decoder.h
  * \brief Declaration of the LDPC decoder.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/ldpc/ldpc_encoder.h b/lib/include/srslte/phy/fec/ldpc/ldpc_encoder.h
index eb6dc3ce5..8d5d0b29c 100644
--- a/lib/include/srslte/phy/fec/ldpc/ldpc_encoder.h
+++ b/lib/include/srslte/phy/fec/ldpc/ldpc_encoder.h
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_encoder.h
  * \brief Declaration of the LDPC encoder.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/ldpc/ldpc_rm.h b/lib/include/srslte/phy/fec/ldpc/ldpc_rm.h
index ef6b1ddc3..7cd84ab03 100644
--- a/lib/include/srslte/phy/fec/ldpc/ldpc_rm.h
+++ b/lib/include/srslte/phy/fec/ldpc/ldpc_rm.h
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_rm.h
  * \brief Declaration of the LDPC RateMatcher and RateDematcher.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/polar/polar_chanalloc.h b/lib/include/srslte/phy/fec/polar/polar_chanalloc.h
index ba7c445e8..1f2442308 100644
--- a/lib/include/srslte/phy/fec/polar/polar_chanalloc.h
+++ b/lib/include/srslte/phy/fec/polar/polar_chanalloc.h
@@ -22,7 +22,7 @@
 /*!
  * \file polar_chanalloc.h
  * \brief Declaration of the subchannel allocation block.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/polar/polar_code.h b/lib/include/srslte/phy/fec/polar/polar_code.h
index 104ee00f2..6a8d1593f 100644
--- a/lib/include/srslte/phy/fec/polar/polar_code.h
+++ b/lib/include/srslte/phy/fec/polar/polar_code.h
@@ -23,7 +23,7 @@
  * \file polar_code.h
  * \brief Declaration of the function that obtains
  * the polar code parameters.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/polar/polar_decoder.h b/lib/include/srslte/phy/fec/polar/polar_decoder.h
index 7992fca79..7daf6584e 100644
--- a/lib/include/srslte/phy/fec/polar/polar_decoder.h
+++ b/lib/include/srslte/phy/fec/polar/polar_decoder.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_decoder.h
  * \brief Declaration of the polar decoder.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/polar/polar_encoder.h b/lib/include/srslte/phy/fec/polar/polar_encoder.h
index 141710d5f..7a66ce0ab 100644
--- a/lib/include/srslte/phy/fec/polar/polar_encoder.h
+++ b/lib/include/srslte/phy/fec/polar/polar_encoder.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_encoder.h
  * \brief Declaration of the polar encoder.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/polar/polar_rm.h b/lib/include/srslte/phy/fec/polar/polar_rm.h
index 4467c24d4..73b63b340 100644
--- a/lib/include/srslte/phy/fec/polar/polar_rm.h
+++ b/lib/include/srslte/phy/fec/polar/polar_rm.h
@@ -22,7 +22,7 @@
 /*!
  * \file polar_rm.h
  * \brief Declaration of the polar RateMatcher and RateDematcher.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/polar/test/polar_sets.h b/lib/include/srslte/phy/fec/polar/test/polar_sets.h
index f553ebe3a..cf8ac4805 100644
--- a/lib/include/srslte/phy/fec/polar/test/polar_sets.h
+++ b/lib/include/srslte/phy/fec/polar/test/polar_sets.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_sets.h
  * \brief Declaration of the auxiliary function that reads polar index sets from a file.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/include/srslte/phy/fec/polar/test/subchannel_allocation.h b/lib/include/srslte/phy/fec/polar/test/subchannel_allocation.h
index 216657314..c7f57269e 100644
--- a/lib/include/srslte/phy/fec/polar/test/subchannel_allocation.h
+++ b/lib/include/srslte/phy/fec/polar/test/subchannel_allocation.h
@@ -13,7 +13,7 @@
 /*!
  * \file subchannel_allocation.h
  * \brief Declaration of the auxiliary subchannel allocation block.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/base_graph.c b/lib/src/phy/fec/ldpc/base_graph.c
index 5df9057a2..7b055547b 100644
--- a/lib/src/phy/fec/ldpc/base_graph.c
+++ b/lib/src/phy/fec/ldpc/base_graph.c
@@ -14,7 +14,7 @@
  * \file base_graph.c
  * \brief Definition of the two LDPC base graphs employed in the 5G NR
  * standard.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * Look-up tables defining the 51 possible Lifting Sizes (grouped into 8 sets)
diff --git a/lib/src/phy/fec/ldpc/ldpc_avx2_consts.h b/lib/src/phy/fec/ldpc/ldpc_avx2_consts.h
index 536df4807..6c7f435df 100644
--- a/lib/src/phy/fec/ldpc/ldpc_avx2_consts.h
+++ b/lib/src/phy/fec/ldpc/ldpc_avx2_consts.h
@@ -15,7 +15,7 @@
  * \brief Declaration of constants and masks for the AVX2-based implementation
  *   of the LDPC encoder and decoder.
  *
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_all.h b/lib/src/phy/fec/ldpc/ldpc_dec_all.h
index 5da0ae954..145f89db9 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_all.h
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_all.h
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_dec_all.h
  * \brief Declaration of the LDPC decoder inner functions.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_c.c b/lib/src/phy/fec/ldpc/ldpc_dec_c.c
index 3a41c90d8..5a5f015c3 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_c.c
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_c.c
@@ -19,7 +19,7 @@
  * variable-to-check messages are actually represented with 7 bits, the
  * remaining bit is used to represent infinity.
  *
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2.c b/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2.c
index a165e04fa..1bb973feb 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2.c
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2.c
@@ -19,7 +19,7 @@
  * variable-to-check messages are actually represented with 7 bits, the
  * remaining bit is used to represent infinity.
  *
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2_flood.c b/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2_flood.c
index b47262ebd..0ee5f1fdb 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2_flood.c
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2_flood.c
@@ -19,7 +19,7 @@
  * variable-to-check messages are actually represented with 7 bits, the
  * remaining bit is used to represent infinity.
  *
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long.c b/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long.c
index 3d7b88a37..9626ae3a0 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long.c
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long.c
@@ -19,7 +19,7 @@
  * variable-to-check messages are actually represented with 7 bits, the
  * remaining bit is used to represent infinity.
  *
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long_flood.c b/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long_flood.c
index 329c13059..d50389b36 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long_flood.c
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_c_avx2long_flood.c
@@ -19,7 +19,7 @@
  * variable-to-check messages are actually represented with 7 bits, the
  * remaining bit is used to represent infinity.
  *
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_c_flood.c b/lib/src/phy/fec/ldpc/ldpc_dec_c_flood.c
index 2283112c6..b72564931 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_c_flood.c
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_c_flood.c
@@ -19,7 +19,7 @@
  * variable-to-check messages are actually represented with 7 bits, the
  * remaining bit is used to represent infinity.
  *
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_f.c b/lib/src/phy/fec/ldpc/ldpc_dec_f.c
index fb0d10e33..285ccafee 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_f.c
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_f.c
@@ -14,7 +14,7 @@
  * \file ldpc_dec_f.c
  * \brief Definition of the LDPC decoder inner functions working
  *    with float-valued LLRs.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_dec_s.c b/lib/src/phy/fec/ldpc/ldpc_dec_s.c
index b901fdd7a..d77a93bf6 100644
--- a/lib/src/phy/fec/ldpc/ldpc_dec_s.c
+++ b/lib/src/phy/fec/ldpc/ldpc_dec_s.c
@@ -19,7 +19,7 @@
  * variable-to-check messages are actually represented with 15 bits, the
  * remaining bit is used to represent infinity.
  *
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_decoder.c b/lib/src/phy/fec/ldpc/ldpc_decoder.c
index 3ba081264..61456ee1e 100644
--- a/lib/src/phy/fec/ldpc/ldpc_decoder.c
+++ b/lib/src/phy/fec/ldpc/ldpc_decoder.c
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_decoder.c
  * \brief Definition of the LDPC decoder.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_enc_all.h b/lib/src/phy/fec/ldpc/ldpc_enc_all.h
index 372d4f089..d4c5c969c 100644
--- a/lib/src/phy/fec/ldpc/ldpc_enc_all.h
+++ b/lib/src/phy/fec/ldpc/ldpc_enc_all.h
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_enc_all.h
  * \brief Declaration of the LDPC encoder inner functions.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_enc_avx2.c b/lib/src/phy/fec/ldpc/ldpc_enc_avx2.c
index 2dc3e06ef..35f8c8546 100644
--- a/lib/src/phy/fec/ldpc/ldpc_enc_avx2.c
+++ b/lib/src/phy/fec/ldpc/ldpc_enc_avx2.c
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_enc_avx2.c
  * \brief Definition of the LDPC encoder inner functions (AVX2 version, small lifting size).
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_enc_avx2long.c b/lib/src/phy/fec/ldpc/ldpc_enc_avx2long.c
index e4ff0ecd7..7704e9a49 100644
--- a/lib/src/phy/fec/ldpc/ldpc_enc_avx2long.c
+++ b/lib/src/phy/fec/ldpc/ldpc_enc_avx2long.c
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_enc_avx2long.c
  * \brief Definition of the LDPC encoder inner functions (AVX2 version, large lifting size).
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
@@ -48,12 +48,12 @@ typedef union bg_node_t {
  */
 struct ldpc_enc_avx2long {
   bg_node_t* codeword;           /*!< \brief Contains the entire codeword, before puncturing. */
-  bg_node_t* codeword_to_free;   /*!< \brief Auxiliary pointer with a free memory of size CTTC_AVX2_B_SIZE previous to
+  bg_node_t* codeword_to_free;   /*!< \brief Auxiliary pointer with a free memory of size SRSLTE_AVX2_B_SIZE previous to
                                     codeword */
   __m256i* aux;                  /*!< \brief Auxiliary register. */
   __m256i* rotated_node;         /*!< \brief To store rotated versions of the nodes. */
   __m256i* rotated_node_to_free; /*!< \brief Auxiliary pointer to store rotated versions of the nodes with extra free
-                                    memory of size CTTC_AVX2_B_SIZE previous to rotated_node */
+                                    memory of size SRSLTE_AVX2_B_SIZE previous to rotated_node */
   uint8_t n_subnodes;            /*!< \brief Number of subnodes. */
 };
 
diff --git a/lib/src/phy/fec/ldpc/ldpc_enc_c.c b/lib/src/phy/fec/ldpc/ldpc_enc_c.c
index 87d78e1a7..1650bdbc4 100644
--- a/lib/src/phy/fec/ldpc/ldpc_enc_c.c
+++ b/lib/src/phy/fec/ldpc/ldpc_enc_c.c
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_enc_c.c
  * \brief Definition of the LDPC encoder inner functions (not optimized).
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_encoder.c b/lib/src/phy/fec/ldpc/ldpc_encoder.c
index 23d388831..4f5ef7afe 100644
--- a/lib/src/phy/fec/ldpc/ldpc_encoder.c
+++ b/lib/src/phy/fec/ldpc/ldpc_encoder.c
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_encoder.c
  * \brief Definition of the LDPC encoder.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/ldpc/ldpc_rm.c b/lib/src/phy/fec/ldpc/ldpc_rm.c
index 1cf7e7bcd..1c0efd118 100644
--- a/lib/src/phy/fec/ldpc/ldpc_rm.c
+++ b/lib/src/phy/fec/ldpc/ldpc_rm.c
@@ -13,7 +13,7 @@
 /*!
  * \file ldpc_rm.c
  * \brief Definition of the LDPC Rate Matcher and Rate Demacher (float-valued, int16_t and int8_t)
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_chanalloc.c b/lib/src/phy/fec/polar/polar_chanalloc.c
index bb8139ae7..9bb37647b 100644
--- a/lib/src/phy/fec/polar/polar_chanalloc.c
+++ b/lib/src/phy/fec/polar/polar_chanalloc.c
@@ -22,7 +22,7 @@
 /*!
  * \file polar_chanalloc.c
  * \brief Definition of the subchannel allocation block.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_code.c b/lib/src/phy/fec/polar/polar_code.c
index 3bf1d9d4b..69315e04a 100644
--- a/lib/src/phy/fec/polar/polar_code.c
+++ b/lib/src/phy/fec/polar/polar_code.c
@@ -23,7 +23,7 @@
  * \file polar_code.c
  * \brief Definition of the function that computes the polar code parameters including,
  * message set (K_Set), the frozen set (F_set), and the parity check bits set (PC_Set)..
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder.c b/lib/src/phy/fec/polar/polar_decoder.c
index 6290566f7..7ea989e82 100644
--- a/lib/src/phy/fec/polar/polar_decoder.c
+++ b/lib/src/phy/fec/polar/polar_decoder.c
@@ -13,7 +13,7 @@
 /*!
  * \file polar_decoder.c
  * \brief Definition of the polar decoder.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_all.c b/lib/src/phy/fec/polar/polar_decoder_ssc_all.c
index 58900c176..2e07c351c 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_all.c
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_all.c
@@ -14,7 +14,7 @@
  * \file polar_decoder_ssc_all.c
  * \brief Definition of the SSC polar decoder functions common to all implementations
  *
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_all.h b/lib/src/phy/fec/polar/polar_decoder_ssc_all.h
index 9c6de13fe..14c6727fc 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_all.h
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_all.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_decoder_ssc_all.h
  * \brief Declaration of the SSC polar decoder functions common to all implementations
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_c.c b/lib/src/phy/fec/polar/polar_decoder_ssc_c.c
index a2dca670e..1f4a37cc3 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_c.c
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_c.c
@@ -15,7 +15,7 @@
  * \brief Definition of the SSC polar decoder inner functions working with
  * 8-bit integer-valued LLRs.
  *
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_c.h b/lib/src/phy/fec/polar/polar_decoder_ssc_c.h
index 550a3fe1c..e718cec92 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_c.h
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_c.h
@@ -14,7 +14,7 @@
  * \file polar_decoder_ssc_c.h
  * \brief Declaration of the SSC polar decoder inner functions working with
  * 8-bit integer-valued LLRs.
- * \author Jesus Gomez (CTTC) \date 2020
+ * \author Jesus Gomez \date 2020
  *
  * \copyright Software Radio Systems Limited
  *
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_c_avx2.c b/lib/src/phy/fec/polar/polar_decoder_ssc_c_avx2.c
index 6b5b5c54a..6be94df6e 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_c_avx2.c
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_c_avx2.c
@@ -15,7 +15,7 @@
  * \brief Definition of the SSC polar decoder inner functions working with
  * 8-bit integer-valued LLRs and AVX2 instructions.
  *
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_c_avx2.h b/lib/src/phy/fec/polar/polar_decoder_ssc_c_avx2.h
index e5f532fc0..903bc4264 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_c_avx2.h
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_c_avx2.h
@@ -14,7 +14,7 @@
  * \file polar_decoder_ssc_c_avx2.h
  * \brief Declaration of the SSC polar decoder inner functions working with
  * 8-bit integer-valued LLRs and AVX2 instructions
- * \author Jesus Gomez (CTTC) \date 2020
+ * \author Jesus Gomez \date 2020
  *
  * \copyright Software Radio Systems Limited
  *
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_f.c b/lib/src/phy/fec/polar/polar_decoder_ssc_f.c
index 03e923ed8..d893d15d2 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_f.c
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_f.c
@@ -15,7 +15,7 @@
  * \brief Definition of the SSC polar decoder inner functions working with
  * float-valued LLRs.
  *
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_f.h b/lib/src/phy/fec/polar/polar_decoder_ssc_f.h
index 71fd5316a..dc6bd22bd 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_f.h
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_f.h
@@ -14,7 +14,7 @@
  * \file polar_decoder_ssc_f.h
  * \brief Declaration of the SSC polar decoder inner functions working with
  * float-valued LLRs.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_s.c b/lib/src/phy/fec/polar/polar_decoder_ssc_s.c
index 0b46488b1..39fe40c30 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_s.c
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_s.c
@@ -15,7 +15,7 @@
  * \brief Definition of the SSC polar decoder inner functions working with
  * 16-bit integer-valued LLRs.
  *
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_ssc_s.h b/lib/src/phy/fec/polar/polar_decoder_ssc_s.h
index b8ad81421..3019e7f1c 100644
--- a/lib/src/phy/fec/polar/polar_decoder_ssc_s.h
+++ b/lib/src/phy/fec/polar/polar_decoder_ssc_s.h
@@ -14,7 +14,7 @@
  * \file polar_decoder_ssc_s.h
  * \brief Definition of the SSC polar decoder inner functions working with
  * 16-bit integer-valued LLRs.
- * \author Jesus Gomez (CTTC) \date 2020
+ * \author Jesus Gomez \date 2020
  *
  * \copyright Software Radio Systems Limited
  *
diff --git a/lib/src/phy/fec/polar/polar_decoder_vector.c b/lib/src/phy/fec/polar/polar_decoder_vector.c
index 4c6593aa6..fc0e29169 100644
--- a/lib/src/phy/fec/polar/polar_decoder_vector.c
+++ b/lib/src/phy/fec/polar/polar_decoder_vector.c
@@ -13,7 +13,7 @@
 /*!
  * \file polar_decoder_vector.c
  * \brief Definition of the polar decoder vectorizable functions.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_vector.h b/lib/src/phy/fec/polar/polar_decoder_vector.h
index a5e9b1523..aa6bd56f2 100644
--- a/lib/src/phy/fec/polar/polar_decoder_vector.h
+++ b/lib/src/phy/fec/polar/polar_decoder_vector.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_decoder_vector.h
  * \brief Declaration of the polar decoder vectorizable functions.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_vector_avx2.c b/lib/src/phy/fec/polar/polar_decoder_vector_avx2.c
index ba3a419f0..ea889c0ef 100644
--- a/lib/src/phy/fec/polar/polar_decoder_vector_avx2.c
+++ b/lib/src/phy/fec/polar/polar_decoder_vector_avx2.c
@@ -13,7 +13,7 @@
 /*!
  * \file polar_decoder_vector_avx2.c
  * \brief Definition of the polar decoder vectorizable functions using AVX2 instructions.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_decoder_vector_avx2.h b/lib/src/phy/fec/polar/polar_decoder_vector_avx2.h
index dbec2dd67..1a4651862 100644
--- a/lib/src/phy/fec/polar/polar_decoder_vector_avx2.h
+++ b/lib/src/phy/fec/polar/polar_decoder_vector_avx2.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_decoder_vector_avx2.h
  * \brief Declaration of the 8-bit AVX2 polar decoder vectorizable functions.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_encoder.c b/lib/src/phy/fec/polar/polar_encoder.c
index 7c047f82d..a36f6e38d 100644
--- a/lib/src/phy/fec/polar/polar_encoder.c
+++ b/lib/src/phy/fec/polar/polar_encoder.c
@@ -13,7 +13,7 @@
 /*!
  * \file polar_encoder.c
  * \brief Definition of the polar encoder.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_encoder_avx2.c b/lib/src/phy/fec/polar/polar_encoder_avx2.c
index c21238475..8474d31bb 100644
--- a/lib/src/phy/fec/polar/polar_encoder_avx2.c
+++ b/lib/src/phy/fec/polar/polar_encoder_avx2.c
@@ -13,7 +13,7 @@
 /*!
  * \file polar_encoder_avx2.c
  * \brief Definition of the AVX2 polar encoder.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_encoder_avx2.h b/lib/src/phy/fec/polar/polar_encoder_avx2.h
index 583c1a5b6..05d4f940c 100644
--- a/lib/src/phy/fec/polar/polar_encoder_avx2.h
+++ b/lib/src/phy/fec/polar/polar_encoder_avx2.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_encoder_avx2.h
  * \brief Declaration of the AVX2 polar encoder.
- * \author Jesus Gomez (CTTC) \date 2020
+ * \author Jesus Gomez \date 2020
  *
  * \copyright Software Radio Systems Limited
  *
diff --git a/lib/src/phy/fec/polar/polar_encoder_pipelined.c b/lib/src/phy/fec/polar/polar_encoder_pipelined.c
index a1f847222..7284c2c42 100644
--- a/lib/src/phy/fec/polar/polar_encoder_pipelined.c
+++ b/lib/src/phy/fec/polar/polar_encoder_pipelined.c
@@ -13,7 +13,7 @@
 /*!
  * \file polar_encoder_pipelined.c
  * \brief Definition of the pipelined polar encoder.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/polar_encoder_pipelined.h b/lib/src/phy/fec/polar/polar_encoder_pipelined.h
index eeeb0470d..4bfb2bb3e 100644
--- a/lib/src/phy/fec/polar/polar_encoder_pipelined.h
+++ b/lib/src/phy/fec/polar/polar_encoder_pipelined.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_encoder_pipelined.h
  * \brief Declaration of the pipelined polar encoder.
- * \author Jesus Gomez (CTTC) \date 2020
+ * \author Jesus Gomez \date 2020
  *
  * \copyright Software Radio Systems Limited
  *
diff --git a/lib/src/phy/fec/polar/polar_rm.c b/lib/src/phy/fec/polar/polar_rm.c
index 90dea9965..42df8d224 100644
--- a/lib/src/phy/fec/polar/polar_rm.c
+++ b/lib/src/phy/fec/polar/polar_rm.c
@@ -22,7 +22,7 @@
 /*!
  * \file polar_rm.c
  * \brief Definition of the LDPC Rate Matcher and Rate Dematcher (float-valued, int16_t and int8_t)
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/test/polar_chain_test.c b/lib/src/phy/fec/polar/test/polar_chain_test.c
index ecc78a71b..d1706a633 100644
--- a/lib/src/phy/fec/polar/test/polar_chain_test.c
+++ b/lib/src/phy/fec/polar/test/polar_chain_test.c
@@ -65,7 +65,7 @@
 #include <time.h>
 #include <unistd.h>
 
-// cttc utils lib
+// utils lib
 #include "srslte/phy/utils/vector.h"
 
 //  polar libs
diff --git a/lib/src/phy/fec/polar/test/polar_sets.c b/lib/src/phy/fec/polar/test/polar_sets.c
index 382c0eda6..28a1dad1a 100644
--- a/lib/src/phy/fec/polar/test/polar_sets.c
+++ b/lib/src/phy/fec/polar/test/polar_sets.c
@@ -13,7 +13,7 @@
 /*!
  * \file polar_sets.c
  * \brief Definition of the auxiliary function that reads polar index sets from a file.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/test/polar_sets.h b/lib/src/phy/fec/polar/test/polar_sets.h
index f553ebe3a..cf8ac4805 100644
--- a/lib/src/phy/fec/polar/test/polar_sets.h
+++ b/lib/src/phy/fec/polar/test/polar_sets.h
@@ -13,7 +13,7 @@
 /*!
  * \file polar_sets.h
  * \brief Declaration of the auxiliary function that reads polar index sets from a file.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/test/subchannel_allocation.c b/lib/src/phy/fec/polar/test/subchannel_allocation.c
index a04fe2b27..7002434f2 100644
--- a/lib/src/phy/fec/polar/test/subchannel_allocation.c
+++ b/lib/src/phy/fec/polar/test/subchannel_allocation.c
@@ -13,7 +13,7 @@
 /*!
  * \file subchannel_allocation.c
  * \brief Defiition of the auxiliary subchannel allocation block.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/polar/test/subchannel_allocation.h b/lib/src/phy/fec/polar/test/subchannel_allocation.h
index f3619b7e2..54990a0d6 100644
--- a/lib/src/phy/fec/polar/test/subchannel_allocation.h
+++ b/lib/src/phy/fec/polar/test/subchannel_allocation.h
@@ -13,7 +13,7 @@
 /*!
  * \file subchannel_allocation.h
  * \brief Declaration of the auxiliary subchannel allocation block.
- * \author Jesus Gomez (CTTC)
+ * \author Jesus Gomez
  * \date 2020
  *
  * \copyright Software Radio Systems Limited
diff --git a/lib/src/phy/fec/utils_avx2.h b/lib/src/phy/fec/utils_avx2.h
index 228f400d4..c914e51e4 100644
--- a/lib/src/phy/fec/utils_avx2.h
+++ b/lib/src/phy/fec/utils_avx2.h
@@ -13,7 +13,7 @@
 /*!
  * \file utils_avx2.h
  * \brief Declarations of AVX2-related quantities and functions.
- * \author David Gregoratti (CTTC)
+ * \author David Gregoratti
  * \date 2020
  *
  * \copyright Software Radio Systems Limited