diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
index 7655d10318..829d5b20e4 100644
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -256,7 +256,7 @@ void nr_ue_measurement_procedures(uint16_t l,    // symbol index of each slot [0
                        0,
                        nr_slot_rx);
 */
-			  //(nr_slot_rx*frame_parms->samples_per_tti+ue->rx_offset)%(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME)
+			  //(nr_slot_rx*frame_parms->samples_per_slot+ue->rx_offset) % frame_parms->samples_per_frame
 
 #if T_TRACER
     if(slot == 0)
@@ -1768,7 +1768,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
       }
     }
 
-  if ((frame_rx%64 == 0) && (nr_tti_rx==0)) {
+  if ((frame_rx%64 == 0) && (nr_slot_rx==0)) {
     printf("============================================\n");
     LOG_I(PHY,"Harq round stats for Downlink: %d/%d/%d/%d DLSCH errors: %d\n",ue->dl_stats[0],ue->dl_stats[1],ue->dl_stats[2],ue->dl_stats[3],ue->dl_stats[4]);
     printf("============================================\n");
diff --git a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c
index e959fb8165..7600dfb08f 100644
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c
@@ -245,7 +245,7 @@ void set_sequence_sss(PHY_VARS_NR_UE *PHY_vars_UE, int offset, int slot_offset)
 void insert_sequence_sss(PHY_VARS_NR_UE *PHY_vars_UE, int offset)
 {
   NR_DL_FRAME_PARMS *frame_parms = &(PHY_vars_UE->frame_parms);
-  int samples_for_half_frame = (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti)>>1;
+  int samples_for_half_frame = frame_parms->samples_per_frame / 2;
 
   set_sequence_sss(PHY_vars_UE, offset, 0);
 
@@ -328,7 +328,7 @@ int test_synchro_pss_sss(PHY_VARS_NR_UE *PHY_vars_UE, int position_symbol, int s
 
   int sync_pos2 = synchro_position - frame_parms->nb_prefix_samples;
 
-  int sync_pos_slot = (frame_parms->samples_per_tti>>1) - frame_parms->ofdm_symbol_size - frame_parms->nb_prefix_samples;
+  int sync_pos_slot = (frame_parms->samples_per_slot>>1) - frame_parms->ofdm_symbol_size - frame_parms->nb_prefix_samples;
 
   if (sync_pos2 >= sync_pos_slot)
     PHY_vars_UE->rx_offset = sync_pos2 - sync_pos_slot;
diff --git a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
index fa8b49842f..f3dbc78a73 100644
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
@@ -300,7 +300,7 @@ typedef enum {
 
 void set_random_rx_buffer(PHY_VARS_NR_UE *PHY_vars_UE, int amp) {
   NR_DL_FRAME_PARMS *frame_parms = &(PHY_vars_UE->frame_parms);
-  int samples_for_frame = (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti);
+  int samples_for_frame = frame_parms->samples_per_frame;
   int16_t random;
   int16_t *data_p;
   random_data_format_t data_format = SINUSOIDAL_DATA;
@@ -394,7 +394,7 @@ void set_random_rx_buffer(PHY_VARS_NR_UE *PHY_vars_UE, int amp) {
 
 int set_pss_in_rx_buffer_from_external_buffer(PHY_VARS_NR_UE *PHY_vars_UE, short *input_buffer) {
   NR_DL_FRAME_PARMS *frame_parms = &(PHY_vars_UE->frame_parms);
-  int samples_for_frame = LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_subframe; /* both i and q */
+  int samples_for_frame = frame_parms->samples_per_frame; /* both i and q */
 
   for (int aa=0; aa<PHY_vars_UE->frame_parms.nb_antennas_rx; aa++) {
     for (int i = 0; i < samples_for_frame; i++) {
diff --git a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h
index 65755b0dfb..f0929e88c0 100644
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h
@@ -69,12 +69,6 @@ typedef struct {
   int number_of_fail;
 } test_t;
 
-typedef struct {
-  uint16_t ofdm_symbol_size;
-  uint32_t samples_per_tti;
-  uint32_t samples_per_subframe;
-} save_frame_parms_t;
-
 /*************** GLOBAL VARIABLES***********************************/
 
 EXTERN PHY_VARS_eNB *PHY_vars_eNB;
diff --git a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
index b3ed37add8..aedb5729a3 100644
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
@@ -372,7 +372,7 @@ int test_srs(PHY_VARS_NR_UE *PHY_vars_UE)
   /* start test of sounding reference signals */
   default_srs_configuration(frame_parms);
 
-  txptr = calloc(frame_parms->samples_per_tti , sizeof(int32_t));
+  txptr = calloc(frame_parms->samples_per_slot , sizeof(int32_t));
   if (txptr == NULL) {
     printf("Error test_srs: memory allocation problem txptr \n");
     assert(0);