diff --git a/gui/gui_test/access_control_menu/test_obmc_gui_client_sessions_sub_menu.robot b/gui/gui_test/access_control_menu/test_client_sessions_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control_menu/test_obmc_gui_client_sessions_sub_menu.robot
rename to gui/gui_test/access_control_menu/test_client_sessions_sub_menu.robot
diff --git a/gui/gui_test/access_control_menu/test_obmc_gui_ldap.robot b/gui/gui_test/access_control_menu/test_ldap_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control_menu/test_obmc_gui_ldap.robot
rename to gui/gui_test/access_control_menu/test_ldap_sub_menu.robot
diff --git a/gui/gui_test/access_control_menu/test_obmc_gui_local_users.robot b/gui/gui_test/access_control_menu/test_local_user_management_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control_menu/test_obmc_gui_local_users.robot
rename to gui/gui_test/access_control_menu/test_local_user_management_sub_menu.robot
diff --git a/gui/gui_test/access_control_menu/test_obmc_gui_certificate.robot b/gui/gui_test/access_control_menu/test_ssl_certificates_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control_menu/test_obmc_gui_certificate.robot
rename to gui/gui_test/access_control_menu/test_ssl_certificates_sub_menu.robot
diff --git a/gui/gui_test/configuration_menu/test_obmc_gui_firmware_update.robot b/gui/gui_test/configuration_menu/test_firmware_sub_menu.robot
similarity index 100%
rename from gui/gui_test/configuration_menu/test_obmc_gui_firmware_update.robot
rename to gui/gui_test/configuration_menu/test_firmware_sub_menu.robot
diff --git a/gui/gui_test/configuration_menu/test_obmc_multiple_interfaces.robot b/gui/gui_test/configuration_menu/test_multiple_interfaces.robot
similarity index 100%
rename from gui/gui_test/configuration_menu/test_obmc_multiple_interfaces.robot
rename to gui/gui_test/configuration_menu/test_multiple_interfaces.robot
diff --git a/gui/gui_test/configuration_menu/test_obmc_gui_network_settings.robot b/gui/gui_test/configuration_menu/test_network_settings_sub_menu.robot
similarity index 100%
rename from gui/gui_test/configuration_menu/test_obmc_gui_network_settings.robot
rename to gui/gui_test/configuration_menu/test_network_settings_sub_menu.robot
diff --git a/gui/gui_test/control_menu/test_obmc_gui_kvm_sub_menu.robot b/gui/gui_test/control_menu/test_kvm_sub_menu.robot
similarity index 100%
rename from gui/gui_test/control_menu/test_obmc_gui_kvm_sub_menu.robot
rename to gui/gui_test/control_menu/test_kvm_sub_menu.robot
diff --git a/gui/gui_test/control_menu/test_obmc_gui_sol_console.robot b/gui/gui_test/control_menu/test_sol_console_sub_menu.robot
similarity index 100%
rename from gui/gui_test/control_menu/test_obmc_gui_sol_console.robot
rename to gui/gui_test/control_menu/test_sol_console_sub_menu.robot
diff --git a/gui/gui_test/gui_header/test_obmc_profile_settings.robot b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
similarity index 100%
rename from gui/gui_test/gui_header/test_obmc_profile_settings.robot
rename to gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
diff --git a/gui/gui_test/health_menu/test_dump_sub_menu.robot b/gui/gui_test/health_menu/test_dumps_sub_menu.robot
similarity index 100%
rename from gui/gui_test/health_menu/test_dump_sub_menu.robot
rename to gui/gui_test/health_menu/test_dumps_sub_menu.robot
diff --git a/gui/gui_test/health_menu/test_obmc_gui_hardware_status_sub_menu.robot b/gui/gui_test/health_menu/test_hardware_status_sub_menu.robot
similarity index 100%
rename from gui/gui_test/health_menu/test_obmc_gui_hardware_status_sub_menu.robot
rename to gui/gui_test/health_menu/test_hardware_status_sub_menu.robot
diff --git a/gui/gui_test/health_menu/test_obmc_gui_sensors.robot b/gui/gui_test/health_menu/test_sensors_sub_menu.robot
similarity index 100%
rename from gui/gui_test/health_menu/test_obmc_gui_sensors.robot
rename to gui/gui_test/health_menu/test_sensors_sub_menu.robot