diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23a06aa382..9d3a487c00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1906,7 +1906,7 @@ set(L2_NR_SRC
   ${NR_RRC_DIR}/rrc_gNB_reconfig.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${NR_RRC_DIR}/rrc_gNB_NGAP.c
-  ${NR_RRC_DIR}/rrc_gNB_drbs.c
+  ${NR_RRC_DIR}/rrc_gNB_radio_bearers.c
   )
 
 set(L2_SRC_UE
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h b/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
index 69b726887c..dc50ca07eb 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "nr_pdcp_sdu.h"
-#include "openair2/RRC/NR/rrc_gNB_drbs.h"
+#include "openair2/RRC/NR/rrc_gNB_radio_bearers.h"
 
 typedef enum {
   NR_PDCP_DRB_AM,
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity.h b/openair2/LAYER2/nr_rlc/nr_rlc_entity.h
index 8c7e5a2f08..675f4a3e96 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity.h
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity.h
@@ -23,7 +23,7 @@
 #define _NR_RLC_ENTITY_H_
 
 #include <stdint.h>
-#include "openair2/RRC/NR/rrc_gNB_drbs.h"
+#include "openair2/RRC/NR/rrc_gNB_radio_bearers.h"
 
 #include "common/utils/time_stat.h"
 
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 228f16d9dc..b5941a5b0c 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -40,7 +40,7 @@
 #include "assertions.h"
 #include "common/ran_context.h"
 #include "asn1_conversions.h"
-#include "rrc_gNB_drbs.h"
+#include "rrc_gNB_radio_bearers.h"
 
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 #include "LAYER2/RLC/rlc.h"
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.c b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
similarity index 99%
rename from openair2/RRC/NR/rrc_gNB_drbs.c
rename to openair2/RRC/NR/rrc_gNB_radio_bearers.c
index 1cb307165f..6c8f2ecdda 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.c
+++ b/openair2/RRC/NR/rrc_gNB_radio_bearers.c
@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-#include "rrc_gNB_drbs.h"
+#include "rrc_gNB_radio_bearers.h"
 
 NR_SRB_ToAddMod_t *generateSRB2() {
   NR_SRB_ToAddMod_t *SRB2_config = NULL;
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.h b/openair2/RRC/NR/rrc_gNB_radio_bearers.h
similarity index 100%
rename from openair2/RRC/NR/rrc_gNB_drbs.h
rename to openair2/RRC/NR/rrc_gNB_radio_bearers.h