diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index b50c017a92d873061302d9e18ff94af11da19d6b..ccff80a055f66dae1e8552b2b0dcc3506cecb4fb 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -260,7 +260,7 @@ endif (${ENABLE_ITTI})
 
 add_boolean_option(RTAI False "Use RTAI")
 if (${RTAI})
-  set(LOWLATENCY False)
+  set(DEADLINE_SCHEDULER False)
   set(CPU_AFFINITY False)
   add_definitions("-DENABLE_RTAI_CLOCK")
   add_definitions("-DCONFIG_RTAI_LXRT_INLINE")
@@ -605,7 +605,7 @@ endif (${TRANSP_PRO} STREQUAL "ETHERNET")
 
 include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
 
-Message("LOWLATENCY flag  is ${LOWLATENCY}")
+Message("DEADLINE_SCHEDULER flag  is ${DEADLINE_SCHEDULER}")
 Message("CPU_Affinity flag is ${CPU_AFFINITY}")
 
 ##############################################################
@@ -619,7 +619,7 @@ add_boolean_option(RRC_DEFAULT_RAB_IS_AM False "set the RLC mode to AM for the d
 
 add_boolean_option(OAI_NW_DRIVER_TYPE_ETHERNET False "????")
 add_boolean_option(DISABLE_USE_NAS False "???")
-add_boolean_option(LOWLATENCY True "Use the Linux scheduler SCHED_DEADLINE: kernel >= 3.14")
+add_boolean_option(DEADLINE_SCHEDULER True "Use the Linux scheduler SCHED_DEADLINE: kernel >= 3.14")
 add_boolean_option(CPU_AFFINITY False "Enable CPU Affinity of threads (only valid without deadline scheduler). It is enabled only with >2 CPUs")
 add_boolean_option(NAS_ADDRESS_FIX False "specific to oaisim: for nasmesh driver")
 add_boolean_option(NAS_NETLINK False "???? Must be True to compile nasmesh driver without rtai")
diff --git a/cmake_targets/autotests/010101/CMakeLists.txt b/cmake_targets/autotests/010101/CMakeLists.txt
index ed913b0fb9bbfb7844fd62069c30ec4a32f5ea0e..3c9cb70c6790a4ed2f654876e1d9681447f0796f 100644
--- a/cmake_targets/autotests/010101/CMakeLists.txt
+++ b/cmake_targets/autotests/010101/CMakeLists.txt
@@ -28,7 +28,7 @@ set ( LINUX_LIST False )
 set ( LINUX True )
 set ( LOCALIZATION False )
 set ( LOG_NO_THREAD True )
-set ( LOWLATENCY False )
+set ( DEADLINE_SCHEDULER False )
 set ( MAC_CONTEXT 1 )
 set ( MAX_NUM_CCs 1 )
 set ( MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010102/CMakeLists.txt b/cmake_targets/autotests/010102/CMakeLists.txt
index d05856ebb0e5e4b3ca11fb2b04014f61b947d40f..9ab131b7eddd21551f005e26a5f27c30cb343055 100644
--- a/cmake_targets/autotests/010102/CMakeLists.txt
+++ b/cmake_targets/autotests/010102/CMakeLists.txt
@@ -28,7 +28,7 @@ set ( LINUX_LIST False )
 set ( LINUX True )
 set ( LOCALIZATION False )
 set ( LOG_NO_THREAD True )
-set ( LOWLATENCY False )
+set ( DEADLINE_SCHEDULER False )
 set ( MAC_CONTEXT 1 )
 set ( MAX_NUM_CCs 1 )
 set ( MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010103/CMakeLists.txt b/cmake_targets/autotests/010103/CMakeLists.txt
index 9603067fe177b7d0b1e4902cace081cb21982212..930ab40d62577940a56144c61f3b5d9cc7b0c3e5 100644
--- a/cmake_targets/autotests/010103/CMakeLists.txt
+++ b/cmake_targets/autotests/010103/CMakeLists.txt
@@ -28,7 +28,7 @@ set ( LINUX False )
 set ( LINUX_LIST False )
 set ( LOCALIZATION False )
 set ( LOG_NO_THREAD True )
-set ( LOWLATENCY False )
+set ( DEADLINE_SCHEDULER False )
 set ( MAC_CONTEXT 1 )
 set ( MAX_NUM_CCs 1 )
 set ( MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010103/CMakeLists.txt.Rel10 b/cmake_targets/autotests/010103/CMakeLists.txt.Rel10
index 6af3c587628f4a4dbb952cf45fed10d41754bb31..c58b1935136092f93516266bddb1a394bca11e93 100644
--- a/cmake_targets/autotests/010103/CMakeLists.txt.Rel10
+++ b/cmake_targets/autotests/010103/CMakeLists.txt.Rel10
@@ -28,7 +28,7 @@ set ( LINUX False )
 set ( LINUX_LIST False )
 set ( LOCALIZATION False )
 set ( LOG_NO_THREAD True )
-set ( LOWLATENCY False )
+set ( DEADLINE_SCHEDULER False )
 set ( MAC_CONTEXT 1 )
 set ( MAX_NUM_CCs 1 )
 set ( MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010103/CMakeLists.txt.Rel8 b/cmake_targets/autotests/010103/CMakeLists.txt.Rel8
index dafbed61d90060c2a685d05e5dbf73650226adbb..b63274535cbe5192767bc3df512240da6cf7b530 100644
--- a/cmake_targets/autotests/010103/CMakeLists.txt.Rel8
+++ b/cmake_targets/autotests/010103/CMakeLists.txt.Rel8
@@ -28,7 +28,7 @@ set ( LINUX False )
 set ( LINUX_LIST False )
 set ( LOCALIZATION False )
 set ( LOG_NO_THREAD True )
-set ( LOWLATENCY False )
+set ( DEADLINE_SCHEDULER False )
 set ( MAC_CONTEXT 1 )
 set ( MAX_NUM_CCs 1 )
 set ( MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010103/CMakeLists.txt.USRP b/cmake_targets/autotests/010103/CMakeLists.txt.USRP
index 9603067fe177b7d0b1e4902cace081cb21982212..930ab40d62577940a56144c61f3b5d9cc7b0c3e5 100644
--- a/cmake_targets/autotests/010103/CMakeLists.txt.USRP
+++ b/cmake_targets/autotests/010103/CMakeLists.txt.USRP
@@ -28,7 +28,7 @@ set ( LINUX False )
 set ( LINUX_LIST False )
 set ( LOCALIZATION False )
 set ( LOG_NO_THREAD True )
-set ( LOWLATENCY False )
+set ( DEADLINE_SCHEDULER False )
 set ( MAC_CONTEXT 1 )
 set ( MAX_NUM_CCs 1 )
 set ( MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010106/CMakeLists.txt b/cmake_targets/autotests/010106/CMakeLists.txt
index 2b315ad411b706ee5d136490fceff909f31041e7..8b74855c8dea1515db15a1e4ec5e8f29f7afe4d0 100644
--- a/cmake_targets/autotests/010106/CMakeLists.txt
+++ b/cmake_targets/autotests/010106/CMakeLists.txt
@@ -22,7 +22,7 @@ set(LINUX_LIST False)
 set(LINUX True)
 set(LOCALIZATION False)
 set(LOG_NO_THREAD True)
-set(LOWLATENCY False)
+set(DEADLINE_SCHEDULER False)
 set(MAC_CONTEXT 1)
 set(MAX_NUM_CCs 1)
 set(MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010107/CMakeLists.txt b/cmake_targets/autotests/010107/CMakeLists.txt
index a2aa19942e0d2ea114e129f47c556d3bca187ff1..bc895766122f651f79b77dd6e7fc66bde5c504b4 100644
--- a/cmake_targets/autotests/010107/CMakeLists.txt
+++ b/cmake_targets/autotests/010107/CMakeLists.txt
@@ -28,7 +28,7 @@ set ( LINUX_LIST False )
 set ( LINUX True )
 set ( LOCALIZATION False )
 set ( LOG_NO_THREAD True )
-set ( LOWLATENCY False )
+set ( DEADLINE_SCHEDULER False )
 set ( MAC_CONTEXT 1 )
 set ( MAX_NUM_CCs 1 )
 set ( MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010108/CMakeLists.txt b/cmake_targets/autotests/010108/CMakeLists.txt
index 63bfb1066f7193a07cc598e45aad85b68bb070d4..7b7f743414bbfef42c35aaf279b4c85f2b99c2ca 100644
--- a/cmake_targets/autotests/010108/CMakeLists.txt
+++ b/cmake_targets/autotests/010108/CMakeLists.txt
@@ -22,7 +22,7 @@ set(LINUX_LIST False)
 set(LINUX True)
 set(LOCALIZATION False)
 set(LOG_NO_THREAD True)
-set(LOWLATENCY False)
+set(DEADLINE_SCHEDULER False)
 set(MAC_CONTEXT 1)
 set(MAX_NUM_CCs 1)
 set(MESSAGE_CHART_GENERATOR         False)
diff --git a/cmake_targets/autotests/010120/CMakeLists.txt b/cmake_targets/autotests/010120/CMakeLists.txt
index d05856ebb0e5e4b3ca11fb2b04014f61b947d40f..9ab131b7eddd21551f005e26a5f27c30cb343055 100644
--- a/cmake_targets/autotests/010120/CMakeLists.txt
+++ b/cmake_targets/autotests/010120/CMakeLists.txt
@@ -28,7 +28,7 @@ set ( LINUX_LIST False )
 set ( LINUX True )
 set ( LOCALIZATION False )
 set ( LOG_NO_THREAD True )
-set ( LOWLATENCY False )
+set ( DEADLINE_SCHEDULER False )
 set ( MAC_CONTEXT 1 )
 set ( MAX_NUM_CCs 1 )
 set ( MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010200/CMakeLists.template b/cmake_targets/autotests/010200/CMakeLists.template
index 1ccd57fffda1b22e705436528bbf91d662519273..be572dc6e91f5edd8c80391003bc784aa2ddd169 100644
--- a/cmake_targets/autotests/010200/CMakeLists.template
+++ b/cmake_targets/autotests/010200/CMakeLists.template
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010200/CMakeLists.txt b/cmake_targets/autotests/010200/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010200/CMakeLists.txt
+++ b/cmake_targets/autotests/010200/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010201/CMakeLists.template b/cmake_targets/autotests/010201/CMakeLists.template
index 1ccd57fffda1b22e705436528bbf91d662519273..be572dc6e91f5edd8c80391003bc784aa2ddd169 100644
--- a/cmake_targets/autotests/010201/CMakeLists.template
+++ b/cmake_targets/autotests/010201/CMakeLists.template
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010201/CMakeLists.txt b/cmake_targets/autotests/010201/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010201/CMakeLists.txt
+++ b/cmake_targets/autotests/010201/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010202/CMakeLists.txt b/cmake_targets/autotests/010202/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010202/CMakeLists.txt
+++ b/cmake_targets/autotests/010202/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010203/CMakeLists.txt b/cmake_targets/autotests/010203/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010203/CMakeLists.txt
+++ b/cmake_targets/autotests/010203/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010204/CMakeLists.txt b/cmake_targets/autotests/010204/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010204/CMakeLists.txt
+++ b/cmake_targets/autotests/010204/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010205/CMakeLists.txt b/cmake_targets/autotests/010205/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010205/CMakeLists.txt
+++ b/cmake_targets/autotests/010205/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010400/CMakeLists.txt b/cmake_targets/autotests/010400/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010400/CMakeLists.txt
+++ b/cmake_targets/autotests/010400/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010401/CMakeLists.txt b/cmake_targets/autotests/010401/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010401/CMakeLists.txt
+++ b/cmake_targets/autotests/010401/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010402/CMakeLists.txt b/cmake_targets/autotests/010402/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010402/CMakeLists.txt
+++ b/cmake_targets/autotests/010402/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/autotests/010403/CMakeLists.txt b/cmake_targets/autotests/010403/CMakeLists.txt
index e6c4bdfe476b509a37e93e9c2357f4107aacad7e..c5ab0cab02a0cf542b1d237df689f8fd9900f70f 100644
--- a/cmake_targets/autotests/010403/CMakeLists.txt
+++ b/cmake_targets/autotests/010403/CMakeLists.txt
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 3a3e8bbec357beb5d8570a72e213826394b0ea76..96adfa004099a85db33d7be6a9b967dabb362a72 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -45,8 +45,8 @@ MSC_GEN="False"
 XFORMS="True"
 PRINT_STATS="False"
 VCD_TIMING="False"
-LOWLATENCY_FLAG_USER="False"
-FORCE_LOWLATENCY_FLAG_USER=""
+DEADLINE_SCHEDULER_FLAG_USER="False"
+FORCE_DEADLINE_SCHEDULER_FLAG_USER=""
 CPU_AFFINITY_FLAG_USER="True" #Only valid when lowlatecy flag is set to False
 REL="Rel10"
 HW="None"
@@ -125,7 +125,7 @@ Options
 --disable-deadline
    Disables deadline scheduler of Linux kernel (>=3.14.x).
 --enable-deadline
-   Disables deadline scheduler of Linux kernel (>=3.14.x). 
+   Enable deadline scheduler of Linux kernel (>=3.14.x). 
 --disable-cpu-affinity
    Disables CPU Affinity between UHD/TX/RX Threads (Valid only when deadline scheduler is disabled). By defaulT, CPU Affinity is enabled when not using deadline scheduler. It is enabled only with >2 CPUs. For eNB, CPU_0-> Device library (UHD), CPU_1->TX Threads, CPU_2...CPU_MAX->Rx Threads. For UE, CPU_0->Device Library(UHD), CPU_1..CPU_MAX -> All the UE threads
 Usage (first build):
@@ -259,11 +259,11 @@ function main() {
             echo_info "Will build doxygen support"
             shift;;     
        --disable-deadline)
-            FORCE_LOWLATENCY_FLAG_USER="False"
+            FORCE_DEADLINE_SCHEDULER_FLAG_USER="False"
             echo_info "Disabling the usage of deadline scheduler"
             shift 1;;
        --enable-deadline)
-            FORCE_LOWLATENCY_FLAG_USER="True"
+            FORCE_DEADLINE_SCHEDULER_FLAG_USER="True"
             echo_info "Enabling the usage of deadline scheduler"
             shift 1;;
        --disable-cpu-affinity)
@@ -314,33 +314,33 @@ function main() {
   #By default: USRP: disable, 
   #By default: BLADERF: enable,
   #By default: EXMIMO: enable
-  if [ "$FORCE_LOWLATENCY_FLAG_USER" = "" ]; then
+  if [ "$FORCE_DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
      if [ "$HW" = "EXMIMO" ] ; then 
-        LOWLATENCY_FLAG_USER="False"
+        DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "ETHERNET" ] ; then 
-        LOWLATENCY_FLAG_USER="True"
+        DEADLINE_SCHEDULER_FLAG_USER="True"
      elif [ "$HW" = "OAI_USRP" ] ; then 
-        LOWLATENCY_FLAG_USER="False"
+        DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "OAI_BLADERF" ] ; then 
-        LOWLATENCY_FLAG_USER="False"
+        DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "OAI_LMSSDR" ] ; then 
-        LOWLATENCY_FLAG_USER="False"
+        DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "None" ] ; then 
-        LOWLATENCY_FLAG_USER="False"
+        DEADLINE_SCHEDULER_FLAG_USER="False"
      else 
         echo_error "Unknown HW type $HW. Exiting now..."
         exit 
      fi
   else
-     LOWLATENCY_FLAG_USER=$FORCE_LOWLATENCY_FLAG_USER
+     DEADLINE_SCHEDULER_FLAG_USER=$FORCE_DEADLINE_SCHEDULER_FLAG_USER
   fi
 
   #Disable CPU Affinity for deadline scheduler
-  if [ "$LOWLATENCY_FLAG_USER" = "True" ] ; then 
+  if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then 
      CPU_AFFINITY_FLAG_USER="False"
   fi
 
-  echo_info "Flags for Deadline scheduler: $LOWLATENCY_FLAG_USER"
+  echo_info "Flags for Deadline scheduler: $DEADLINE_SCHEDULER_FLAG_USER"
   echo_info "Flags for CPU Affinity: $CPU_AFFINITY_FLAG_USER"
 
   ############################################
@@ -432,7 +432,7 @@ function main() {
     echo "set ( RF_BOARD \"${HW}\")"               >>  $cmake_file
     echo "set ( TRANSP_PRO \"${TP}\")"             >>  $cmake_file
     echo "set(PACKAGE_NAME \"${lte_exec}\")"       >>  $cmake_file
-    echo "set (LOWLATENCY \"${LOWLATENCY_FLAG_USER}\" )"    >>$cmake_file
+    echo "set (DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )"    >>$cmake_file
     echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"      >>$cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
     cd  $DIR/$lte_build_dir/build
@@ -660,7 +660,7 @@ function main() {
      echo "set(RF_BOARD \"${HW}\")"               >>  $cmake_file
      echo "set(TRANSP_PRO \"${TP}\")"             >>  $cmake_file
      echo 'set(PACKAGE_NAME "\"rrh_gw\"")'        >>  $cmake_file
-     echo "set (LOWLATENCY \"${LOWLATENCY_FLAG_USER}\" )"    >>$cmake_file
+     echo "set (DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )"    >>$cmake_file
      echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"    >>$cmake_file
      echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file    
      cd $DIR/$rrh_build_dir/build
diff --git a/cmake_targets/epc_test/CMakeLists.template b/cmake_targets/epc_test/CMakeLists.template
index 8a8223e4ae66741d33bcecc4de44a98c52412068..76defbc7d7f1318602aa6c9ecbc85be4169a94ff 100644
--- a/cmake_targets/epc_test/CMakeLists.template
+++ b/cmake_targets/epc_test/CMakeLists.template
@@ -29,7 +29,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD True )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR False)
diff --git a/cmake_targets/oaisim_build_oai/CMakeLists.template b/cmake_targets/oaisim_build_oai/CMakeLists.template
index 76564d8fdd77954a80dea1a63823d3c375924a72..0a05d68d10d5d6ce758e8aa17588c444632bf700 100644
--- a/cmake_targets/oaisim_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_build_oai/CMakeLists.template
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD True )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR False)
diff --git a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
index 1035a2859958a4b9e801746529f943a6b0171851..69fa209b16d266e5a5d846facba62904bd11143b 100644
--- a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
@@ -29,7 +29,7 @@ set (  LINUX_LIST False )
 set (  LINUX False )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD False )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MIH_C_MEDIEVAL_EXTENSIONS False )
diff --git a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
index a9055101501a3c6a5ee1212e7c8f50258274dc1b..6d8fc6d26a77c3420673b341b2ebcfec22a7fe73 100644
--- a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
@@ -28,7 +28,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD 1 )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR         False )
diff --git a/cmake_targets/s1c_mme_test/CMakeLists.template b/cmake_targets/s1c_mme_test/CMakeLists.template
index 4067202df16d6036e6354b0ca4d1eff851d74576..994edf835232401dbc9f41e70ae8b8e9e47e4740 100644
--- a/cmake_targets/s1c_mme_test/CMakeLists.template
+++ b/cmake_targets/s1c_mme_test/CMakeLists.template
@@ -29,7 +29,7 @@ set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
 set (  LOG_NO_THREAD True )
-set (  LOWLATENCY False )
+set (  DEADLINE_SCHEDULER False )
 set (  MAC_CONTEXT 1 )
 set (  MAX_NUM_CCs 1 )
 set (  MESSAGE_CHART_GENERATOR False)