diff --git a/openair2/RRC/NR/L2_nr_interface.c b/openair2/RRC/NR/L2_nr_interface.c
index dc883b5cf0..fbb3c8073e 100644
--- a/openair2/RRC/NR/L2_nr_interface.c
+++ b/openair2/RRC/NR/L2_nr_interface.c
@@ -73,7 +73,7 @@ nr_rrc_data_req(
     ctxt_pP->enb_flag ? MSC_PDCP_ENB : MSC_PDCP_UE,
     buffer_pP,
     sdu_sizeP,
-    MSC_AS_TIME_FMT"NR_RRC_DCCH_DATA_REQ UE %x MUI %d size %u",
+    MSC_AS_TIME_FMT"RRC_DCCH_DATA_REQ UE %x MUI %d size %u",
     MSC_AS_TIME_ARGS(ctxt_pP),
     ctxt_pP->rnti,
     muiP,
@@ -86,29 +86,29 @@ nr_rrc_data_req(
                      ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE,
                      sdu_sizeP);
   memcpy (message_buffer, buffer_pP, sdu_sizeP);
-  message_p = itti_alloc_new_message (ctxt_pP->enb_flag ? TASK_RRC_GNB : TASK_RRC_UE, NR_RRC_DCCH_DATA_REQ);
-  NR_RRC_DCCH_DATA_REQ (message_p).frame     = ctxt_pP->frame;
-  NR_RRC_DCCH_DATA_REQ (message_p).gnb_flag  = ctxt_pP->enb_flag;
-  NR_RRC_DCCH_DATA_REQ (message_p).rb_id     = rb_idP;
-  NR_RRC_DCCH_DATA_REQ (message_p).muip      = muiP;
-  NR_RRC_DCCH_DATA_REQ (message_p).confirmp  = confirmP;
-  NR_RRC_DCCH_DATA_REQ (message_p).sdu_size  = sdu_sizeP;
-  NR_RRC_DCCH_DATA_REQ (message_p).sdu_p     = message_buffer;
+  message_p = itti_alloc_new_message (ctxt_pP->enb_flag ? TASK_RRC_GNB : TASK_RRC_UE, RRC_DCCH_DATA_REQ);
+  RRC_DCCH_DATA_REQ (message_p).frame     = ctxt_pP->frame;
+  RRC_DCCH_DATA_REQ (message_p).enb_flag  = ctxt_pP->enb_flag;
+  RRC_DCCH_DATA_REQ (message_p).rb_id     = rb_idP;
+  RRC_DCCH_DATA_REQ (message_p).muip      = muiP;
+  RRC_DCCH_DATA_REQ (message_p).confirmp  = confirmP;
+  RRC_DCCH_DATA_REQ (message_p).sdu_size  = sdu_sizeP;
+  RRC_DCCH_DATA_REQ (message_p).sdu_p     = message_buffer;
   //memcpy (NR_RRC_DCCH_DATA_REQ (message_p).sdu_p, buffer_pP, sdu_sizeP);
-  NR_RRC_DCCH_DATA_REQ (message_p).mode      = modeP;
-  NR_RRC_DCCH_DATA_REQ (message_p).module_id = ctxt_pP->module_id;
-  NR_RRC_DCCH_DATA_REQ (message_p).rnti      = ctxt_pP->rnti;
-  NR_RRC_DCCH_DATA_REQ (message_p).gNB_index = ctxt_pP->eNB_index;
+  RRC_DCCH_DATA_REQ (message_p).mode      = modeP;
+  RRC_DCCH_DATA_REQ (message_p).module_id = ctxt_pP->module_id;
+  RRC_DCCH_DATA_REQ (message_p).rnti      = ctxt_pP->rnti;
+  RRC_DCCH_DATA_REQ (message_p).eNB_index = ctxt_pP->eNB_index;
   itti_send_msg_to_task (
     ctxt_pP->enb_flag ? TASK_PDCP_ENB : TASK_PDCP_UE,
     ctxt_pP->instance,
     message_p);
-  LOG_I(NR_RRC,"sent RRC_DCCH_DATA_REQ to TASK_PDCP_GNB\n");
+  LOG_I(NR_RRC,"sent RRC_DCCH_DATA_REQ to TASK_PDCP_ENB\n");
 
   /* Hack: only trigger PDCP if in CU, otherwise it is triggered by RU threads
    * Ideally, PDCP would not neet to be triggered like this but react to ITTI
    * messages automatically */
-  // if (ctxt_pP->enb_flag && NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type))
+  // if (ctxt_pP->enb_flag && NODE_IS_CU(RC.nrrrc[ctxt_pP->module_id]->node_type))
   //   pdcp_run(ctxt_pP);
 
   return TRUE; // TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway.