diff --git a/lib/include/srsran/phy/phch/dci_nr.h b/lib/include/srsran/phy/phch/dci_nr.h
index eda706ace..0cbaf099e 100644
--- a/lib/include/srsran/phy/phch/dci_nr.h
+++ b/lib/include/srsran/phy/phch/dci_nr.h
@@ -228,7 +228,7 @@ typedef struct SRSRAN_API {
  * @remark Implemented according TS 38.212 section 7.3.1.0 DCI size alignment
  * @param[in,out] dci DCI object
  * @param[in] cfg NR-DCI configuration
- * @return SRSLTE_SUCCESS if the configuration is valid, SRSLTE_ERROR code otherwise
+ * @return SRSRAN_SUCCESS if the configuration is valid, SRSRAN_ERROR code otherwise
  */
 SRSRAN_API int srsran_dci_nr_set_cfg(srsran_dci_nr_t* dci, const srsran_dci_cfg_nr_t* cfg);
 
@@ -257,7 +257,7 @@ SRSRAN_API bool srsran_dci_nr_valid_direction(const srsran_dci_msg_nr_t* dci);
  * @param q NR DCI object with precomputed DCI parameters
  * @param dci DL NR DCI to pack (serialize)
  * @param[out] msg Resultant packed DCI message
- * @return SRSLTE_SUCCESS if provided arguments are valid, SRSLTE_ERROR code otherwise
+ * @return SRSRAN_SUCCESS if provided arguments are valid, SRSRAN_ERROR code otherwise
  */
 SRSRAN_API int srsran_dci_nr_dl_pack(const srsran_dci_nr_t* q, const srsran_dci_dl_nr_t* dci, srsran_dci_msg_nr_t* msg);
 
@@ -266,7 +266,7 @@ SRSRAN_API int srsran_dci_nr_dl_pack(const srsran_dci_nr_t* q, const srsran_dci_
  * @param q NR DCI object with precomputed DCI parameters
  * @param msg  DCI message to unpack (deserialize)
  * @param[out] dci Resultant unpacked DL DCI
- * @return SRSLTE_SUCCESS if provided arguments are valid, SRSLTE_ERROR code otherwise
+ * @return SRSRAN_SUCCESS if provided arguments are valid, SRSRAN_ERROR code otherwise
  */
 SRSRAN_API int srsran_dci_nr_dl_unpack(const srsran_dci_nr_t* q, srsran_dci_msg_nr_t* msg, srsran_dci_dl_nr_t* dci);
 
@@ -275,7 +275,7 @@ SRSRAN_API int srsran_dci_nr_dl_unpack(const srsran_dci_nr_t* q, srsran_dci_msg_
  * @param q NR DCI object with precomputed DCI parameters
  * @param dci UL NR DCI to pack (serialize)
  * @param[out] msg resultant DCI message
- * @return SRSLTE_SUCCESS if provided arguments are valid, SRSLTE_ERROR code otherwise
+ * @return SRSRAN_SUCCESS if provided arguments are valid, SRSRAN_ERROR code otherwise
  */
 SRSRAN_API int srsran_dci_nr_ul_pack(const srsran_dci_nr_t* q, const srsran_dci_ul_nr_t* dci, srsran_dci_msg_nr_t* msg);
 
@@ -284,7 +284,7 @@ SRSRAN_API int srsran_dci_nr_ul_pack(const srsran_dci_nr_t* q, const srsran_dci_
  * @param q NR DCI object with precomputed DCI parameters
  * @param msg  DCI message to unpack (deserialize)
  * @param[out] dci Resultant unpacked UL DCI
- * @return SRSLTE_SUCCESS if provided arguments are valid, SRSLTE_ERROR code otherwise
+ * @return SRSRAN_SUCCESS if provided arguments are valid, SRSRAN_ERROR code otherwise
  */
 SRSRAN_API int srsran_dci_nr_ul_unpack(const srsran_dci_nr_t* q, srsran_dci_msg_nr_t* msg, srsran_dci_ul_nr_t* dci);
 
diff --git a/lib/include/srsran/phy/utils/re_pattern.h b/lib/include/srsran/phy/utils/re_pattern.h
index 00ab2a865..2ac9b331c 100644
--- a/lib/include/srsran/phy/utils/re_pattern.h
+++ b/lib/include/srsran/phy/utils/re_pattern.h
@@ -79,7 +79,7 @@ SRSRAN_API int srsran_re_pattern_merge(srsran_re_pattern_list_t* list, const srs
  * @brief Checks collision between a RE pattern list and a RE pattern
  * @param list Provides pattern list
  * @param p Provides a pattern
- * @return SRSLTE_SUCCESS if no collision is detected, SRSLTE_ERROR code otherwise
+ * @return SRSRAN_SUCCESS if no collision is detected, SRSRAN_ERROR code otherwise
  */
 SRSRAN_API int srsran_re_pattern_check_collision(const srsran_re_pattern_list_t* list, const srsran_re_pattern_t* p);
 
diff --git a/srsue/hdr/stack/mac_nr/demux_nr.h b/srsue/hdr/stack/mac_nr/demux_nr.h
index d14d24999..533a4b616 100644
--- a/srsue/hdr/stack/mac_nr/demux_nr.h
+++ b/srsue/hdr/stack/mac_nr/demux_nr.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef SRSLTE_DEMUX_NR_H
-#define SRSLTE_DEMUX_NR_H
+#ifndef SRSRAN_DEMUX_NR_H
+#define SRSRAN_DEMUX_NR_H
 
 #include "mac_nr_interfaces.h"
 #include "srsran/common/block_queue.h"
@@ -57,4 +57,4 @@ private:
 
 } // namespace srsue
 
-#endif // SRSLTE_DEMUX_NR_H
+#endif // SRSRAN_DEMUX_NR_H
diff --git a/srsue/hdr/stack/mac_nr/dl_harq_nr.h b/srsue/hdr/stack/mac_nr/dl_harq_nr.h
index e0834264f..9754cb6a6 100644
--- a/srsue/hdr/stack/mac_nr/dl_harq_nr.h
+++ b/srsue/hdr/stack/mac_nr/dl_harq_nr.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef SRSLTE_DL_HARQ_NR_H
-#define SRSLTE_DL_HARQ_NR_H
+#ifndef SRSRAN_DL_HARQ_NR_H
+#define SRSRAN_DL_HARQ_NR_H
 
 #include "srsran/interfaces/mac_interface_types.h"
 #include "srsran/interfaces/ue_nr_interfaces.h"
@@ -105,4 +105,4 @@ typedef std::array<dl_harq_entity_nr_ptr, SRSRAN_MAX_CARRIERS> dl_harq_entity_nr
 
 } // namespace srsue
 
-#endif // SRSLTE_DL_HARQ_NR_H
+#endif // SRSRAN_DL_HARQ_NR_H