diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
index 7b58d0e531..97e97ad036 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
@@ -1099,8 +1099,9 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
       const int8_t pid = sched_ctrl->feedback_dl_harq.head;
       remove_front_nr_list(&sched_ctrl->feedback_dl_harq);
       /* According to nfapi_nr_interface_scf.h, harq_value = 0 is a pass
-      (The check below was for harq_value == 1 in the develop branch) */
-      if (get_softmodem_params()->nsa)
+      (The check below was for harq_value == 1 in the develop branch) 
+      TODO: After update in develop branch, the following condition will be updated.*/
+      if (get_softmodem_params()->emulate_l1)
         handle_dl_harq(mod_id, UE_id, pid, harq_value == 0 && harq_confidence == 0);
       else
         handle_dl_harq(mod_id, UE_id, pid, harq_value == 1 && harq_confidence == 0);
diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
index 251f5cf4fd..7d19f35027 100644
--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
@@ -73,7 +73,7 @@ void handle_nr_rach(NR_UL_IND_t *UL_info)
   }
   NR_UL_IND_t UL_INFO;
   nfapi_nr_rach_indication_t *rach_ind = NULL;
-  if (get_softmodem_params()->nsa)
+  if (get_softmodem_params()->emulate_l1)
   {
     if (gnb_rach_ind_queue.num_items == 0)
       return; 
@@ -118,7 +118,7 @@ void handle_nr_rach(NR_UL_IND_t *UL_info)
                           UL_INFO.rach_ind.pdu_list[i].preamble_list[0].timing_advance);
     }
   }
-  if (get_softmodem_params()->nsa)
+  if (get_softmodem_params()->emulate_l1)
   {
     if (rach_ind && rach_ind->number_of_pdus > 0)
     {
@@ -149,7 +149,7 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
 
   NR_UL_IND_t UL_INFO;
   nfapi_nr_uci_indication_t *uci_ind = NULL;
-  if (get_softmodem_params()->nsa)
+  if (get_softmodem_params()->emulate_l1)
   {
     if (gnb_uci_ind_queue.num_items == 0)
       return; 
@@ -191,7 +191,7 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
     }
   }
 
-  if (get_softmodem_params()->nsa)
+  if (get_softmodem_params()->emulate_l1)
   {
     for (int i = 0; i < num_ucis; i++) {
       switch (uci_list[i].pdu_type) {
@@ -266,7 +266,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
   NR_UL_IND_t UL_INFO;
   nfapi_nr_rx_data_indication_t *rx_ind = NULL;
   nfapi_nr_crc_indication_t *crc_ind = NULL;
-  if (get_softmodem_params()->nsa)
+  if (get_softmodem_params()->emulate_l1)
   {
     rx_ind = get_queue(&gnb_rx_ind_queue);
     if (!rx_ind)
@@ -353,7 +353,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
         handle_nr_ul_harq(UL_INFO.CC_id, UL_INFO.module_id, UL_INFO.frame, UL_INFO.slot, crc);
         break;
       } //    for (j=0;j<UL_INFO.crc_ind.number_crcs;j++)
-      if (get_softmodem_params()->nsa)
+      if (get_softmodem_params()->emulate_l1)
       {
         int last = UL_INFO.crc_ind.number_crcs - 1;
         if (j < last)
@@ -379,7 +379,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
         }
       }
     } //   for (i=0;i<UL_INFO.rx_ind.number_of_pdus;i++)
-    if (get_softmodem_params()->nsa)
+    if (get_softmodem_params()->emulate_l1)
     {
       if (UL_INFO.crc_ind.number_crcs > 0)
       {