diff --git a/Examples/MAX32655/Bluetooth/BLE_FreeRTOS/freertos_tickless.c b/Examples/MAX32655/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
index 2a241b2791..d4c9354954 100644
--- a/Examples/MAX32655/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
+++ b/Examples/MAX32655/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
@@ -160,7 +160,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     /* Determine if we need to snapshot the PalBb clock */
     if (schTimerActive) {
         /* Snapshot the current WUT value with the PalBb clock */
-        MXC_WUT_Store(MXC_WUT0);
+        MXC_WUT_StoreCount(MXC_WUT0);
         preCapture = MXC_WUT_GetCount(MXC_WUT0);
         schUsec = PalTimerGetExpTime();
 
@@ -176,7 +176,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
         }
     } else {
         /* Snapshot the current WUT value */
-        MXC_WUT_Edge(MXC_WUT0);
+        MXC_WUT_WaitForEdge(MXC_WUT0);
         preCapture = MXC_WUT_GetCount(MXC_WUT0);
         bleSleepTicks = 0;
         schUsec = 0;
@@ -239,7 +239,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     }
 
     /* Recalculate dsWutTicks for the FreeRTOS tick counter update */
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
     postCapture = MXC_WUT_GetCount(MXC_WUT0);
     dsWutTicks = postCapture - preCapture;
 
diff --git a/Examples/MAX32655/Bluetooth/BLE_fit_FreeRTOS/freertos_tickless.c b/Examples/MAX32655/Bluetooth/BLE_fit_FreeRTOS/freertos_tickless.c
index 6113790add..26528205fa 100644
--- a/Examples/MAX32655/Bluetooth/BLE_fit_FreeRTOS/freertos_tickless.c
+++ b/Examples/MAX32655/Bluetooth/BLE_fit_FreeRTOS/freertos_tickless.c
@@ -160,7 +160,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     /* Determine if we need to snapshot the PalBb clock */
     if (schTimerActive) {
         /* Snapshot the current WUT value with the PalBb clock */
-        MXC_WUT_Store(MXC_WUT0);
+        MXC_WUT_StoreCount(MXC_WUT0);
         preCapture = MXC_WUT_GetCount(MXC_WUT0);
         schUsec = PalTimerGetExpTime();
 
@@ -176,7 +176,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
         }
     } else {
         /* Snapshot the current WUT value */
-        MXC_WUT_Edge(MXC_WUT0);
+        MXC_WUT_WaitForEdge(MXC_WUT0);
         preCapture = MXC_WUT_GetCount(MXC_WUT0);
         bleSleepTicks = 0;
         schUsec = 0;
@@ -238,7 +238,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     }
 
     /* Recalculate dsWutTicks for the FreeRTOS tick counter update */
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
     postCapture = MXC_WUT_GetCount(MXC_WUT0);
     dsWutTicks = postCapture - preCapture;
 
diff --git a/Examples/MAX32655/Bluetooth/RF_Test/freertos_tickless.c b/Examples/MAX32655/Bluetooth/RF_Test/freertos_tickless.c
index e997be57d1..55a62dcc7e 100644
--- a/Examples/MAX32655/Bluetooth/RF_Test/freertos_tickless.c
+++ b/Examples/MAX32655/Bluetooth/RF_Test/freertos_tickless.c
@@ -135,10 +135,10 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     MXC_GPIO_OutSet(uart_rts.port, uart_rts.mask);
 
     /* Snapshot the current WUT value */
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
     pre_capture = MXC_WUT_GetCount(MXC_WUT0);
     MXC_WUT_SetCompare(MXC_WUT0, pre_capture + wut_ticks);
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
 
     LED_Off(1);
 
diff --git a/Examples/MAX32655/FreeRTOSDemo/freertos_tickless.c b/Examples/MAX32655/FreeRTOSDemo/freertos_tickless.c
index e997be57d1..55a62dcc7e 100644
--- a/Examples/MAX32655/FreeRTOSDemo/freertos_tickless.c
+++ b/Examples/MAX32655/FreeRTOSDemo/freertos_tickless.c
@@ -135,10 +135,10 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     MXC_GPIO_OutSet(uart_rts.port, uart_rts.mask);
 
     /* Snapshot the current WUT value */
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
     pre_capture = MXC_WUT_GetCount(MXC_WUT0);
     MXC_WUT_SetCompare(MXC_WUT0, pre_capture + wut_ticks);
-    MXC_WUT_Edge(MXC_WUT0);
+    MXC_WUT_WaitForEdge(MXC_WUT0);
 
     LED_Off(1);
 
diff --git a/Examples/MAX32665/Bluetooth/BLE_FreeRTOS/freertos_tickless.c b/Examples/MAX32665/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
index 6d09bf46b8..8c773a53bb 100644
--- a/Examples/MAX32665/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
+++ b/Examples/MAX32665/Bluetooth/BLE_FreeRTOS/freertos_tickless.c
@@ -250,7 +250,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     /* Determine if we need to snapshot the PalBb clock */
     if (schTimerActive) {
         /* Snapshot the current WUT value with the PalBb clock */
-        MXC_WUT_Store();
+        MXC_WUT_StoreCount();
         preCapture = MXC_WUT_GetCount();
         schUsec = PalTimerGetExpTime();
 
@@ -266,7 +266,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
         }
     } else {
         /* Snapshot the current WUT value */
-        MXC_WUT_Edge();
+        MXC_WUT_WaitForEdge();
         preCapture = MXC_WUT_GetCount();
         bleSleepTicks = 0;
         schUsec = 0;
@@ -327,7 +327,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     }
 
     /* Recalculate dsWutTicks for the FreeRTOS tick counter update */
-    MXC_WUT_Edge();
+    MXC_WUT_WaitForEdge();
     postCapture = MXC_WUT_GetCount();
     dsWutTicks = postCapture - preCapture;
 
diff --git a/Examples/MAX32665/Bluetooth/RF_Test/freertos_tickless.c b/Examples/MAX32665/Bluetooth/RF_Test/freertos_tickless.c
index 7af8f83779..de06b4097a 100644
--- a/Examples/MAX32665/Bluetooth/RF_Test/freertos_tickless.c
+++ b/Examples/MAX32665/Bluetooth/RF_Test/freertos_tickless.c
@@ -248,7 +248,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     /* Determine if we need to snapshot the PalBb clock */
     if (schTimerActive) {
         /* Snapshot the current WUT value with the PalBb clock */
-        MXC_WUT_Store();
+        MXC_WUT_StoreCount();
         preCapture = MXC_WUT_GetCount();
         schUsec = PalTimerGetExpTime();
 
@@ -264,7 +264,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
         }
     } else {
         /* Snapshot the current WUT value */
-        MXC_WUT_Edge();
+        MXC_WUT_WaitForEdge();
         preCapture = MXC_WUT_GetCount();
         bleSleepTicks = 0;
         schUsec = 0;
@@ -326,7 +326,7 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     }
 
     /* Recalculate dsWutTicks for the FreeRTOS tick counter update */
-    MXC_WUT_Edge();
+    MXC_WUT_WaitForEdge();
     postCapture = MXC_WUT_GetCount();
     dsWutTicks = postCapture - preCapture;
 
diff --git a/Examples/MAX32665/FreeRTOSDemo/freertos_tickless.c b/Examples/MAX32665/FreeRTOSDemo/freertos_tickless.c
index 90400009b4..f31a1d4500 100644
--- a/Examples/MAX32665/FreeRTOSDemo/freertos_tickless.c
+++ b/Examples/MAX32665/FreeRTOSDemo/freertos_tickless.c
@@ -235,10 +235,10 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     MXC_GPIO_OutSet(uart_rts.port, uart_rts.mask);
 
     /* Snapshot the current WUT value */
-    MXC_WUT_Edge();
+    MXC_WUT_WaitForEdge();
     pre_capture = MXC_WUT_GetCount();
     MXC_WUT_SetCompare(pre_capture + wut_ticks);
-    MXC_WUT_Edge();
+    MXC_WUT_WaitForEdge();
 
     LED_Off(SLEEP_LED);
 
diff --git a/Examples/MAX32680/FreeRTOSDemo/freertos_tickless.c b/Examples/MAX32680/FreeRTOSDemo/freertos_tickless.c
index b0b67a415d..3727ee9e38 100644
--- a/Examples/MAX32680/FreeRTOSDemo/freertos_tickless.c
+++ b/Examples/MAX32680/FreeRTOSDemo/freertos_tickless.c
@@ -135,10 +135,10 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     MXC_GPIO_OutSet(uart_rts.port, uart_rts.mask);
 
     /* Snapshot the current WUT value */
-    MXC_WUT_Edge(MXC_WUT);
+    MXC_WUT_WaitForEdge(MXC_WUT);
     pre_capture = MXC_WUT_GetCount(MXC_WUT);
     MXC_WUT_SetCompare(MXC_WUT, pre_capture + wut_ticks);
-    MXC_WUT_Edge(MXC_WUT);
+    MXC_WUT_WaitForEdge(MXC_WUT);
 
     LED_Off(1);
 
diff --git a/Examples/MAX78000/FreeRTOSDemo/freertos_tickless.c b/Examples/MAX78000/FreeRTOSDemo/freertos_tickless.c
index 6fc84f7cc7..8ed03566b5 100644
--- a/Examples/MAX78000/FreeRTOSDemo/freertos_tickless.c
+++ b/Examples/MAX78000/FreeRTOSDemo/freertos_tickless.c
@@ -134,10 +134,10 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     MXC_GPIO_OutSet(uart_rts.port, uart_rts.mask);
 
     /* Snapshot the current WUT value */
-    MXC_WUT_Edge();
+    MXC_WUT_WaitForEdge();
     pre_capture = MXC_WUT_GetCount();
     MXC_WUT_SetCompare(pre_capture + wut_ticks);
-    MXC_WUT_Edge();
+    MXC_WUT_WaitForEdge();
 
     LED_Off(1);
 
diff --git a/Examples/MAX78002/FreeRTOSDemo/freertos_tickless.c b/Examples/MAX78002/FreeRTOSDemo/freertos_tickless.c
index 6fc84f7cc7..8ed03566b5 100644
--- a/Examples/MAX78002/FreeRTOSDemo/freertos_tickless.c
+++ b/Examples/MAX78002/FreeRTOSDemo/freertos_tickless.c
@@ -134,10 +134,10 @@ void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime)
     MXC_GPIO_OutSet(uart_rts.port, uart_rts.mask);
 
     /* Snapshot the current WUT value */
-    MXC_WUT_Edge();
+    MXC_WUT_WaitForEdge();
     pre_capture = MXC_WUT_GetCount();
     MXC_WUT_SetCompare(pre_capture + wut_ticks);
-    MXC_WUT_Edge();
+    MXC_WUT_WaitForEdge();
 
     LED_Off(1);