diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
index 5ec2f649d9..4bbe6cac54 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
@@ -103,8 +103,8 @@ NR_gNB_ULSCH_t *new_gNB_ulsch(uint8_t max_ldpc_iterations,uint8_t N_RB_UL, uint8
   uint8_t exit_flag = 0,i,r;
   uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS;  //number of segments to be allocated
 
-  if (N_RB != 273) {
-    a_segments = a_segments*N_RB;
+  if (N_RB_UL != 273) {
+    a_segments = a_segments*N_RB_UL;
     a_segments = a_segments/273;
   }  
 
@@ -412,8 +412,8 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
 
   uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS;  //number of segments to be allocated
 
-  if (N_RB != 273) {
-    a_segments = a_segments*N_RB;
+  if (nb_rb != 273) {
+    a_segments = a_segments*nb_rb;
     a_segments = a_segments/273;
   }  
 
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
index ab22fcc2eb..8292174615 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
@@ -105,8 +105,8 @@ NR_UE_DLSCH_t *new_nr_ue_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint
 
   uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS;  //number of segments to be allocated
 
-  if (N_RB != 273) {
-    a_segments = a_segments*N_RB;
+  if (N_RB_DL != 273) {
+    a_segments = a_segments*N_RB_DL;
     a_segments = a_segments/273;
   }  
 
@@ -378,8 +378,8 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
 
   uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS;  //number of segments to be allocated
 
-  if (N_RB != 273) {
-    a_segments = a_segments*N_RB;
+  if (nb_rb != 273) {
+    a_segments = a_segments*nb_rb;
     a_segments = a_segments/273;
   }  
 
@@ -904,8 +904,8 @@ uint32_t  nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
 
   uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS;  //number of segments to be allocated
 
-  if (N_RB != 273) {
-    a_segments = a_segments*N_RB;
+  if (nb_rb != 273) {
+    a_segments = a_segments*nb_rb;
     a_segments = a_segments/273;
   }  
 
@@ -1478,8 +1478,8 @@ void *nr_dlsch_decoding_process(void *arg)
   /*
   uint16_t a_segments = MAX_NUM_NR_DLSCH_SEGMENTS;  //number of segments to be allocated
 
-  if (N_RB != 273) {
-    a_segments = a_segments*N_RB;
+  if (nb_rb != 273) {
+    a_segments = a_segments*nb_rb;
     a_segments = a_segments/273;
   }  
 
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
index fed0405076..5d13cf7fc2 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
@@ -94,8 +94,8 @@ NR_UE_ULSCH_t *new_nr_ue_ulsch(unsigned char N_RB_UL,
   unsigned char exit_flag = 0,i,r;
   uint16_t a_segments = MAX_NUM_NR_ULSCH_SEGMENTS;  //number of segments to be allocated
 
-  if (N_RB != 273) {
-    a_segments = a_segments*N_RB;
+  if (N_RB_UL != 273) {
+    a_segments = a_segments*N_RB_UL;
     a_segments = a_segments/273;
   }