diff --git a/extended/test_bios_update.robot b/extended/test_bios_update.robot
index af734f4..a688043 100644
--- a/extended/test_bios_update.robot
+++ b/extended/test_bios_update.robot
@@ -10,7 +10,7 @@
 Resource                ../lib/openbmc_ffdc.robot
 Resource                ../lib/state_manager.robot
 
-Test Teardown           Test Bios Teardown
+Test Teardown           Test Teardown Execution
 
 Force Tags  BIOS_Code_Update
 
@@ -76,7 +76,7 @@
     ...  \ targ_file_path=${EXECDIR}${/}logs${/}SOL.log
     Run Key  ${keyword_buf}
 
-Test Bios Teardown
+Test Teardown Execution
     [Documentation]  Log FFDC if test suite fails and collect SOL log for
     ...              debugging purposes.
 
diff --git a/extended/test_esel.robot b/extended/test_esel.robot
index 437d30f..a3e4046 100644
--- a/extended/test_esel.robot
+++ b/extended/test_esel.robot
@@ -9,8 +9,8 @@
 Resource            ../lib/utils.robot
 Resource            ../lib/boot_utils.robot
 
-Suite Setup         eSEL Test SetUp
-Suite Teardown      Test Cleanup On Exit
+Suite Setup         Suite Setup Execution
+Suite Teardown      Suite Teardown Execution
 Test Teardown       FFDC On Test Case Fail
 Test Setup          Delete All Error Logs
 
@@ -147,7 +147,7 @@
     Should Be Equal  ${entry_id}
     ...  xyz.openbmc_project.Logging.Entry.Level.Error
 
-Test Cleanup On Exit
+Suite Teardown Execution
     [Documentation]  Cleanup test logs and connection.
     Close All Connections
 
@@ -172,7 +172,7 @@
     ...        return_stdout=True  return_stderr=True  return_rc=True
     [Return]  ${stderr}
 
-eSEL Test SetUp
+Suite Setup Execution
     [Documentation]  Validates input parameters & check if HOST OS is up.
 
     Should Not Be Empty
diff --git a/extended/test_host_network.robot b/extended/test_host_network.robot
index 2038bd6..7de46be 100644
--- a/extended/test_host_network.robot
+++ b/extended/test_host_network.robot
@@ -9,7 +9,7 @@
 Library             ../lib/utilities.py
 
 Test Setup          Open Connection And Log In
-Test Teardown       Post Test Execution
+Test Teardown       Test Teardown Execution
 
 Force Tags          Host_Network_Test
 
@@ -74,7 +74,7 @@
 
 *** Keywords ***
 
-Post Test Execution
+Test Teardown Execution
     [Documentation]  Do the post test teardown.
 
     FFDC On Test Case Fail
diff --git a/extended/test_network.robot b/extended/test_network.robot
index 60ff804..f0c151e 100644
--- a/extended/test_network.robot
+++ b/extended/test_network.robot
@@ -10,7 +10,7 @@
 Library  String
 Library  SSHLibrary
 
-Test Setup     Test Init Setup
+Test Setup     Test Setup Execution
 Test Teardown  Close All Connections
 
 *** Variables ***
@@ -391,7 +391,7 @@
 
 *** Keywords ***
 
-Test Init Setup
+Test Setup Execution
     [Documentation]  Network setup.
     Open Connection And Login
 
diff --git a/extended/test_network_nping.robot b/extended/test_network_nping.robot
index 071f0a8..de0a92e 100644
--- a/extended/test_network_nping.robot
+++ b/extended/test_network_nping.robot
@@ -6,7 +6,7 @@
 Library  OperatingSystem
 Library  String
 
-Suite Setup  Validate Setup
+Suite Setup  Suite Setup Execution
 
 Force Tags  Network_Nping
 
@@ -30,7 +30,7 @@
 
 *** Keywords ***
 
-Validate Setup
+Suite Setup Execution
     [Documentation]  Validate the setup.
 
     Should Not Be Empty  ${OPENBMC_HOST}  msg=BMC IP address not provided.
diff --git a/extended/test_os_reboot.robot b/extended/test_os_reboot.robot
index d6b0c4d..9d46f9e 100644
--- a/extended/test_os_reboot.robot
+++ b/extended/test_os_reboot.robot
@@ -5,7 +5,7 @@
 Resource    ../extended/obmc_boot_test_resource.robot
 
 Suite Setup     Run Key  Start SOL Console Logging
-Test Teardown   Post Test Case Execution
+Test Teardown   Test Teardown Execution
 
 *** Variables ***
 
@@ -32,7 +32,7 @@
 
 *** Keywords ***
 
-Post Test Case Execution
+Test Teardown Execution
     [Documentation]  Do the post test teardown.
     # 1. Capture FFDC on test failure.
     # 2. Stop SOL logging.
diff --git a/extended/test_slp.robot b/extended/test_slp.robot
index deee965..c2b33c2 100644
--- a/extended/test_slp.robot
+++ b/extended/test_slp.robot
@@ -7,7 +7,7 @@
 Resource        ../lib/utils.robot
 
 # Get the SLP services available, make it suite global.
-Suite Setup     Get Service Types Output
+Suite Setup     Suite Setup Execution
 
 Force Tags  SLP_Service_Test
 
@@ -35,7 +35,7 @@
 
 *** Keywords ***
 
-Get Service Types Output
+Suite Setup Execution
     [Documentation]  Get SLP services.
     ${output}=  Run  which slptool
     Should Not Be Empty  ${output}
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.