diff --git a/openair2/COMMON/platform_constants.h b/openair2/COMMON/platform_constants.h
index f2c906bf661e2aa0e93c75fa8e55f831124f0e41..c358a2a26b3b9b80d2d9708e0b260068c18d5bbf 100644
--- a/openair2/COMMON/platform_constants.h
+++ b/openair2/COMMON/platform_constants.h
@@ -31,7 +31,7 @@
 #ifdef CMAKER
 #include "asn1_constants.h"
 #else
-#include "RRC/LITE/MESSAGES/asn1_constants.h"
+#include "RRC/LTE/MESSAGES/asn1_constants.h"
 #endif
 
 #ifndef __PLATFORM_CONSTANTS_H__
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
index 7ef9a960f92fbbc687f554932abd664a652a16a0..4a0137d4b6e5ae560e0371663566adc493519d94 100644
--- a/openair2/COMMON/rrc_messages_types.h
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -35,7 +35,7 @@
 #ifdef CMAKER
 #include "SystemInformationBlockType2.h"
 #else
-#include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h"
+#include "RRC/LTE/MESSAGES/SystemInformationBlockType2.h"
 #endif
 #include "SL-OffsetIndicator-r12.h"
 #include "SubframeBitmapSL-r12.h"
diff --git a/openair2/ENB_APP/enb_config.h b/openair2/ENB_APP/enb_config.h
index aeac43ee1c7d9e52f80364dc3c7ddf544b257ec8..96156a4bc454232699f4db39ada3845e0d3aaa59 100644
--- a/openair2/ENB_APP/enb_config.h
+++ b/openair2/ENB_APP/enb_config.h
@@ -44,7 +44,7 @@
 #include "SystemInformationBlockType2.h"
 #include "rrc_messages_types.h"
 #else
-#include "RRC/LITE/MESSAGES/SystemInformationBlockType2.h"
+#include "RRC/LTE/MESSAGES/SystemInformationBlockType2.h"
 #endif
 #include "intertask_interface_types.h"
 #include "RRC/LTE/rrc_defs.h"
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.h b/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
index 6e06dd951832b93fa68366975a4eb073e78664b1..054bb5fac41505cee29c05fd4cec395a3b2da8db 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.h
@@ -500,8 +500,8 @@ rnti_t                 pdcp_UE_UE_module_id_to_rnti[MAX_MOBILES_PER_ENB];
 rnti_t                 pdcp_eNB_UE_instance_to_rnti[MAX_MOBILES_PER_ENB]; // for noS1 mode
 unsigned int           pdcp_eNB_UE_instance_to_rnti_index;
 #if (RRC_VERSION >= MAKE_VERSION(10, 0, 0))
-pdcp_mbms_t               pdcp_mbms_array_ue[MAX_MOBILES_PER_ENB][maxServiceCount][maxSessionPerPMCH];   // some constants from openair2/RRC/LITE/MESSAGES/asn1_constants.h
-pdcp_mbms_t               pdcp_mbms_array_eNB[NUMBER_OF_eNB_MAX][maxServiceCount][maxSessionPerPMCH]; // some constants from openair2/RRC/LITE/MESSAGES/asn1_constants.h
+pdcp_mbms_t               pdcp_mbms_array_ue[MAX_MOBILES_PER_ENB][maxServiceCount][maxSessionPerPMCH];   // some constants from openair2/RRC/LTE/MESSAGES/asn1_constants.h
+pdcp_mbms_t               pdcp_mbms_array_eNB[NUMBER_OF_eNB_MAX][maxServiceCount][maxSessionPerPMCH]; // some constants from openair2/RRC/LTE/MESSAGES/asn1_constants.h
 #endif
 sdu_size_t             pdcp_output_sdu_bytes_to_write;
 sdu_size_t             pdcp_output_header_bytes_to_write;
diff --git a/openair2/LAYER2/RLC/rlc.h b/openair2/LAYER2/RLC/rlc.h
index 112215a093a3814897e91280d73303d517199ec5..5ad8a3ff39a18e7aec391f891fb3155b2e5d4602 100644
--- a/openair2/LAYER2/RLC/rlc.h
+++ b/openair2/LAYER2/RLC/rlc.h
@@ -193,10 +193,10 @@ typedef struct rlc_mbms_id_s {
 #        define maxSessionPerPMCH 1
 #    endif
 #endif
-//rlc_mbms_t           rlc_mbms_array_ue[MAX_MOBILES_PER_ENB][maxServiceCount][maxSessionPerPMCH];   // some constants from openair2/RRC/LITE/MESSAGES/asn1_constants.h
-//rlc_mbms_t           rlc_mbms_array_eNB[NUMBER_OF_eNB_MAX][maxServiceCount][maxSessionPerPMCH]; // some constants from openair2/RRC/LITE/MESSAGES/asn1_constants.h
-rlc_mbms_id_t        rlc_mbms_lcid2service_session_id_ue[MAX_MOBILES_PER_ENB][RLC_MAX_MBMS_LC];    // some constants from openair2/RRC/LITE/MESSAGES/asn1_constants.h
-rlc_mbms_id_t        rlc_mbms_lcid2service_session_id_eNB[MAX_eNB][RLC_MAX_MBMS_LC];  // some constants from openair2/RRC/LITE/MESSAGES/asn1_constants.h
+//rlc_mbms_t           rlc_mbms_array_ue[MAX_MOBILES_PER_ENB][maxServiceCount][maxSessionPerPMCH];   // some constants from openair2/RRC/LTE/MESSAGES/asn1_constants.h
+//rlc_mbms_t           rlc_mbms_array_eNB[NUMBER_OF_eNB_MAX][maxServiceCount][maxSessionPerPMCH]; // some constants from openair2/RRC/LTE/MESSAGES/asn1_constants.h
+rlc_mbms_id_t        rlc_mbms_lcid2service_session_id_ue[MAX_MOBILES_PER_ENB][RLC_MAX_MBMS_LC];    // some constants from openair2/RRC/LTE/MESSAGES/asn1_constants.h
+rlc_mbms_id_t        rlc_mbms_lcid2service_session_id_eNB[MAX_eNB][RLC_MAX_MBMS_LC];  // some constants from openair2/RRC/LTE/MESSAGES/asn1_constants.h
 
 #define rlc_mbms_enb_get_lcid_by_rb_id(Enb_mOD,rB_iD) rlc_mbms_rbid2lcid_eNB[Enb_mOD][rB_iD]
 ;
diff --git a/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.c b/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.c
index 0844593d93e787a710b2dafb8b00aeb88bfaf19f..2815ee3688e7c55490be05f26a2068f21bac0e64 100644
--- a/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.c
+++ b/openair2/RRC/L2_INTERFACE/openair_rrc_L2_interface.c
@@ -38,7 +38,7 @@
 #ifdef CELLULAR
 #include "rrc_L2_proto.h"
 #else
-#include "RRC/LITE/defs.h"
+#include "RRC/LTE/defs.h"
 #endif //CELLULAR
 #include "COMMON/mac_rrc_primitives.h"
 #include "openair_rrc_L2_interface.h"
diff --git a/openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.h b/openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.h
index 6fb073f80de30638aad1208c52a0af79edc42250..6b56be1022eb9443feb0d6ef0bd7254dc482032d 100644
--- a/openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.h
+++ b/openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.h
@@ -44,7 +44,7 @@
 #include <asn_internal.h> /* for _ASN_DEFAULT_STACK_MAX */
 
 
-#include "RRC/LITE/defs_NB_IoT.h"
+#include "RRC/LTE/defs_NB_IoT.h"
 
 /*
  * The variant of the above function which dumps the BASIC-XER (XER_F_BASIC)
diff --git a/openair2/RRC/LTE/defs_NB_IoT.h b/openair2/RRC/LTE/defs_NB_IoT.h
index 7da9c014f1c0e9b22a6757f52306ef5789846053..0cc8a37bc08ef4ce836a67f8a644dc8554eb6eea 100644
--- a/openair2/RRC/LTE/defs_NB_IoT.h
+++ b/openair2/RRC/LTE/defs_NB_IoT.h
@@ -18,7 +18,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file RRC/LITE/defs_NB_IoT.h
+/*! \file RRC/LTE/defs_NB_IoT.h
 * \brief NB-IoT RRC struct definitions and function prototypes
 * \author Navid Nikaein, Raymond Knopp and Michele Paffetti
 * \date 2010 - 2014, 2017
diff --git a/openair2/RRC/LTE/rrc_UE_ral.c b/openair2/RRC/LTE/rrc_UE_ral.c
index 0cb0943fcb67122d1e09fe45845c52aed9e7fd54..c972d280d5a577982ed8891c348b8cf588da2ab9 100644
--- a/openair2/RRC/LTE/rrc_UE_ral.c
+++ b/openair2/RRC/LTE/rrc_UE_ral.c
@@ -33,8 +33,8 @@
 #include "rrc_UE_ral.h"
 #include "assertions.h"
 #include "collection/hashtable/obj_hashtable.h"
-#include "RRC/LITE/defs.h"
-#include "RRC/LITE/extern.h"
+#include "RRC/LTE/defs.h"
+#include "RRC/LTE/extern.h"
 
 
 //-----------------------------------------------------------------------------
diff --git a/openair2/RRC/LTE/rrc_eNB_ral.c b/openair2/RRC/LTE/rrc_eNB_ral.c
index 94e25a6eebcb140a47e8032c2c7e4d22d8603949..db20eb4a28bfe587d3427a40525b11c673e5f262 100644
--- a/openair2/RRC/LTE/rrc_eNB_ral.c
+++ b/openair2/RRC/LTE/rrc_eNB_ral.c
@@ -33,8 +33,8 @@
 #include "rrc_eNB_ral.h"
 #include "assertions.h"
 #include "collection/hashtable/obj_hashtable.h"
-#include "RRC/LITE/defs.h"
-#include "RRC/LITE/extern.h"
+#include "RRC/LTE/defs.h"
+#include "RRC/LTE/extern.h"
 
 
 //-----------------------------------------------------------------------------
diff --git a/targets/SIMU/PROC/channel_sim_proc.c b/targets/SIMU/PROC/channel_sim_proc.c
index dd0adec0d2a05750b33d27f8e8c1955f7920d733..f21059234fa33abd0e0db484b7b8841337c791b1 100644
--- a/targets/SIMU/PROC/channel_sim_proc.c
+++ b/targets/SIMU/PROC/channel_sim_proc.c
@@ -43,7 +43,7 @@
 #include "LAYER2/MAC/defs.h"
 #include "LAYER2/MAC/extern.h"
 #include "UTIL/LOG/log_if.h"
-#include "RRC/LITE/extern.h"
+#include "RRC/LTE/extern.h"
 #include "PHY_INTERFACE/extern.h"
 #endif
 
diff --git a/targets/SIMU/USER/oaisim_pad.c b/targets/SIMU/USER/oaisim_pad.c
index acb4adb691a938ca3c3ea73162040b1531fa3a5f..4138e8f571eaf2c6daac3e911e620658c3b65107 100644
--- a/targets/SIMU/USER/oaisim_pad.c
+++ b/targets/SIMU/USER/oaisim_pad.c
@@ -47,7 +47,7 @@
 //#ifdef OPENAIR2
 #include "LAYER2/MAC/defs.h"
 #include "LAYER2/MAC/vars.h"
-#include "RRC/LITE/vars.h"
+#include "RRC/LTE/vars.h"
 #include "PHY_INTERFACE/vars.h"
 //#endif
 
diff --git a/targets/TEST/AT_COMMANDS/oaisim.c b/targets/TEST/AT_COMMANDS/oaisim.c
index 4420d583e3c809a50ab1a372e1399a5206b8f8ff..e14373f87fb12b4cfa4d038f74e3aa2ad091cfac 100644
--- a/targets/TEST/AT_COMMANDS/oaisim.c
+++ b/targets/TEST/AT_COMMANDS/oaisim.c
@@ -34,7 +34,7 @@
 #include "LAYER2/MAC/vars.h"
 #include "UTIL/LOG/log_if.h"
 #include "UTIL/LOG/log_extern.h"
-#include "RRC/LITE/vars.h"
+#include "RRC/LTE/vars.h"
 #include "PHY_INTERFACE/vars.h"
 #include "UTIL/OCG/OCG.h"
 #include "UTIL/AT_COMMANDS/parser.h"
diff --git a/targets/TEST/PACKET_TRACER/pt.c b/targets/TEST/PACKET_TRACER/pt.c
index 9e4077e2748c761688123ffd6a3629a6fa903f1a..030b63ab907319283059e4b8bdd74a2ceb4814cc 100644
--- a/targets/TEST/PACKET_TRACER/pt.c
+++ b/targets/TEST/PACKET_TRACER/pt.c
@@ -37,7 +37,7 @@
 #include "SCHED/vars.h"
 #include "LAYER2/MAC/defs.h"
 #include "LAYER2/MAC/vars.h"
-#include "RRC/LITE/vars.h"
+#include "RRC/LTE/vars.h"
 #include "PHY_INTERFACE/vars.h"
 #include "UTIL/LOG/log.h"
 #include "OCG_vars.h"
diff --git a/targets/TEST/PDCP/with_rlc/test_pdcp_rlc.c b/targets/TEST/PDCP/with_rlc/test_pdcp_rlc.c
index 3e1dd2ea8e16cc4373ea8584e5da508b171830a9..d3efbe139f1293b330383249a81c8890fcecdd86 100644
--- a/targets/TEST/PDCP/with_rlc/test_pdcp_rlc.c
+++ b/targets/TEST/PDCP/with_rlc/test_pdcp_rlc.c
@@ -34,7 +34,7 @@
 #include "LAYER2/MAC/vars.h"
 #include "UTIL/LOG/log_if.h"
 #include "UTIL/LOG/log_extern.h"
-#include "RRC/LITE/vars.h"
+#include "RRC/LTE/vars.h"
 #include "PHY_INTERFACE/vars.h"
 #include "UTIL/OCG/OCG.h"
 #include "LAYER2/PDCP_v10.1.0/pdcp.h"
diff --git a/targets/TEST/RLC_AM_V9.3.0/oaisim.c b/targets/TEST/RLC_AM_V9.3.0/oaisim.c
index dda91f0b1f23ac39b24da7e94860209f76cceb1e..fc2082f1df64549e8f4a8d8702b43880865a05ba 100644
--- a/targets/TEST/RLC_AM_V9.3.0/oaisim.c
+++ b/targets/TEST/RLC_AM_V9.3.0/oaisim.c
@@ -35,7 +35,7 @@
 #include "LAYER2/MAC/vars.h"
 #include "UTIL/LOG/log_if.h"
 #include "UTIL/LOG/log_extern.h"
-#include "RRC/LITE/vars.h"
+#include "RRC/LTE/vars.h"
 #include "PHY_INTERFACE/vars.h"
 #include "UTIL/OCG/OCG.h"
 
diff --git a/targets/TEST/RLC_UM_V9.3.0/oaisim.c b/targets/TEST/RLC_UM_V9.3.0/oaisim.c
index e1fce26a6f4eef0a3b065c1495c33c89090af646..c520749de333b4fda4ac80b17c50402f110d27b0 100644
--- a/targets/TEST/RLC_UM_V9.3.0/oaisim.c
+++ b/targets/TEST/RLC_UM_V9.3.0/oaisim.c
@@ -35,7 +35,7 @@
 #include "LAYER2/MAC/vars.h"
 #include "UTIL/LOG/log_if.h"
 #include "UTIL/LOG/log_extern.h"
-#include "RRC/LITE/vars.h"
+#include "RRC/LTE/vars.h"
 #include "PHY_INTERFACE/vars.h"
 #include "UTIL/OCG/OCG.h"