diff --git a/extended/test_watchdog.robot b/extended/test_watchdog.robot
index 3d65d50..409b1f6 100644
--- a/extended/test_watchdog.robot
+++ b/extended/test_watchdog.robot
@@ -8,8 +8,8 @@
 Resource               ../lib/boot_utils.robot
 Resource               ../lib/state_manager.robot
 
-Suite Setup            Watchdog Timer Test Setup
-Suite Teardown         Restore Watchdog Default Setting
+Suite Setup            Suite Setup Execution
+Suite Teardown         Suite Teardown Execution
 Test Teardown          FFDC On Test Case Fail
 
 *** Variables ***
@@ -93,7 +93,7 @@
 
 *** Keywords ***
 
-Watchdog Timer Test Setup
+Suite Setup Execution
     [Documentation]   Do test initialization setup.
     # Check input parameters & check if host OS is up.
 
@@ -107,7 +107,7 @@
     # Boot to OS.
     REST Power On
 
-Restore Watchdog Default Setting
+Suite Teardown Execution
     [Documentation]  Restore watchdog Default setting.
 
     # Boot to OS.