diff --git a/TESTS/mbed_drivers/timeout/timeout_tests.h b/TESTS/mbed_drivers/timeout/timeout_tests.h
index 2920e8c243..8c2ccb45b3 100644
--- a/TESTS/mbed_drivers/timeout/timeout_tests.h
+++ b/TESTS/mbed_drivers/timeout/timeout_tests.h
@@ -276,7 +276,7 @@ void test_sleep(void)
     timeout.detach();
 }
 
-#if DEVICE_LOWPOWERTIMER
+#if DEVICE_LPTICKER
 /** Template for tests: timeout during deepsleep
  *
  * Test timeout during deepsleep
diff --git a/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp b/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
index 37a8dffe8c..4f688799ba 100644
--- a/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
@@ -17,7 +17,7 @@
 #error [NOT_SUPPORTED] Tickless mode not supported for this target.
 #endif
 
-#if !DEVICE_LOWPOWERTIMER
+#if !DEVICE_LPTICKER
 #error [NOT_SUPPORTED] Current SysTimer implementation requires lp ticker support.
 #endif
 
@@ -280,7 +280,7 @@ void test_sleep(void)
     TEST_ASSERT_UINT64_WITHIN(DELAY_DELTA_US, DELAY_US, timer.read_high_resolution_us());
 }
 
-#if DEVICE_LOWPOWERTIMER
+#if DEVICE_LPTICKER
 /** Test wake up from deepsleep
  *
  * Given a SysTimer with a tick scheduled in the future
@@ -334,7 +334,7 @@ Case cases[] = {
     Case("Handler called once", test_handler_called_once),
 #if DEVICE_SLEEP
     Case("Wake up from sleep", test_sleep),
-#if DEVICE_LOWPOWERTIMER
+#if DEVICE_LPTICKER
     Case("Wake up from deep sleep", test_deepsleep),
 #endif
 #endif
diff --git a/features/unsupported/tests/utest/lp_ticker/lp_ticker.cpp b/features/unsupported/tests/utest/lp_ticker/lp_ticker.cpp
index cdac572144..61a569f9f1 100644
--- a/features/unsupported/tests/utest/lp_ticker/lp_ticker.cpp
+++ b/features/unsupported/tests/utest/lp_ticker/lp_ticker.cpp
@@ -21,7 +21,7 @@
 /* Low power timer test.
  */
 
-#if !DEVICE_LOWPOWERTIMER
+#if !DEVICE_LPTICKER
 #error This test unit requires low power to be defined for a target
 #endif
 
diff --git a/rtos/TARGET_CORTEX/SysTimer.cpp b/rtos/TARGET_CORTEX/SysTimer.cpp
index 1eece6c501..8d09532bf7 100644
--- a/rtos/TARGET_CORTEX/SysTimer.cpp
+++ b/rtos/TARGET_CORTEX/SysTimer.cpp
@@ -21,7 +21,7 @@
  */
 #include "rtos/TARGET_CORTEX/SysTimer.h"
 
-#if DEVICE_LOWPOWERTIMER
+#if DEVICE_LPTICKER
 
 #include "hal/lp_ticker_api.h"
 #include "mbed_critical.h"
diff --git a/rtos/TARGET_CORTEX/SysTimer.h b/rtos/TARGET_CORTEX/SysTimer.h
index 267714c907..dd6b30cf33 100644
--- a/rtos/TARGET_CORTEX/SysTimer.h
+++ b/rtos/TARGET_CORTEX/SysTimer.h
@@ -22,7 +22,7 @@
 #ifndef MBED_SYS_TIMER_H
 #define MBED_SYS_TIMER_H
 
-#if defined(DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
+#if defined(DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)
 
 #include "platform/NonCopyable.h"
 #include "drivers/TimerEvent.h"