From be0f69d081a5643a7c298f84eb4f256709c05092 Mon Sep 17 00:00:00 2001
From: zsolleci <zsolleci@amazon.com>
Date: Fri, 7 May 2021 11:47:39 -0500
Subject: [PATCH] updated files to fit name convention

---
 ...ugger_HappyPath_TargetMultipleEntities.py} |   4 +-
 ...ebugger_HappyPath_TargetMultipleGraphs.py} |   4 +-
 ...doRedo.py => EditMenu_Default_UndoRedo.py} |   4 +-
 ...ity_HappyPath_AddScriptCanvasComponent.py} |   4 +-
 ...Open.py => FileMenu_Default_NewAndOpen.py} |   4 +-
 ...pt.py => GraphClose_Default_SavePrompt.py} |   4 +-
 ...ut.py => Graph_HappyPath_ZoomInZoomOut.py} |   4 +-
 ...entButton_HappyPath_ContainsSCCategory.py} |   0
 ...odeInspector_HappyPath_VariableRenames.py} |   4 +-
 ...=> NodePalette_HappyPath_CanSelectNode.py} |   4 +-
 ...> NodePalette_HappyPath_ClearSelection.py} |   4 +-
 ...atedDeactivated_HappyPath_PrintMessage.py} |   4 +-
 ...t.py => Pane_Default_RetainOnSCRestart.py} |   4 +-
 ...ane.py => Pane_HappyPath_DocksProperly.py} |   4 +-
 ...> Pane_HappyPath_OpenCloseSuccessfully.py} |   4 +-
 ...e.py => Pane_HappyPath_ResizesProperly.py} |   4 +-
 ...py => Pane_Undocked_ClosesSuccessfully.py} |   4 +-
 ...iptCanvasTools_Toggle_OpenCloseSuccess.py} |   4 +-
 ...tCanvas_ChangingAssets_ComponentStable.py} |   4 +-
 ...vas_TwoComponents_InteractSuccessfully.py} |   4 +-
 ...ptCanvas_TwoEntities_UseSimultaneously.py} |   4 +-
 ...iptEvent_HappyPath_CreatedWithoutError.py} |   0
 ...Events_Default_SendReceiveSuccessfully.py} |   4 +-
 ...ts_HappyPath_SendReceiveAcrossMultiple.py} |   4 +-
 .../PythonTests/scripting/TestSuite_Active.py | 104 +++++++++---------
 ...riableManager_Default_CreateDeleteVars.py} |   4 +-
 26 files changed, 98 insertions(+), 98 deletions(-)
 rename AutomatedTesting/Gem/PythonTests/scripting/{Debugging_TargetMultipleEntities.py => Debugger_HappyPath_TargetMultipleEntities.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{Debugging_TargetMultipleGraphs.py => Debugger_HappyPath_TargetMultipleGraphs.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{EditMenu_UndoRedo.py => EditMenu_Default_UndoRedo.py} (98%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{Entity_AddScriptCanvasComponent.py => Entity_HappyPath_AddScriptCanvasComponent.py} (96%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{FileMenu_New_Open.py => FileMenu_Default_NewAndOpen.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{GraphClose_SavePrompt.py => GraphClose_Default_SavePrompt.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{Graph_ZoomInZoomOut.py => Graph_HappyPath_ZoomInZoomOut.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{AssetEditor_NewScriptEvent.py => NewScriptEventButton_HappyPath_ContainsSCCategory.py} (100%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{NodeInspector_RenameVariable.py => NodeInspector_HappyPath_VariableRenames.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{NodePalette_SelectNode.py => NodePalette_HappyPath_CanSelectNode.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{NodePalette_ClearSelection.py => NodePalette_HappyPath_ClearSelection.py} (96%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{OnEntityActivatedDeactivated_PrintMessage.py => OnEntityActivatedDeactivated_HappyPath_PrintMessage.py} (98%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{Pane_RetainOnSCRestart.py => Pane_Default_RetainOnSCRestart.py} (98%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{Docking_Pane.py => Pane_HappyPath_DocksProperly.py} (97%)
 mode change 100755 => 100644
 rename AutomatedTesting/Gem/PythonTests/scripting/{Opening_Closing_Pane.py => Pane_HappyPath_OpenCloseSuccessfully.py} (97%)
 mode change 100755 => 100644
 rename AutomatedTesting/Gem/PythonTests/scripting/{Resizing_Pane.py => Pane_HappyPath_ResizesProperly.py} (97%)
 mode change 100755 => 100644
 rename AutomatedTesting/Gem/PythonTests/scripting/{UnDockedPane_CloseSCWindow.py => Pane_Undocked_ClosesSuccessfully.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{Toggle_ScriptCanvasTools.py => ScriptCanvasTools_Toggle_OpenCloseSuccess.py} (98%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{ScriptCanvas_ChangingAssets.py => ScriptCanvas_ChangingAssets_ComponentStable.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{ScriptCanvas_TwoComponents.py => ScriptCanvas_TwoComponents_InteractSuccessfully.py} (96%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{ScriptCanvas_TwoEntities.py => ScriptCanvas_TwoEntities_UseSimultaneously.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{AssetEditor_CreateScriptEventFile.py => ScriptEvent_HappyPath_CreatedWithoutError.py} (100%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{ScriptEvents_SendReceiveSuccessfully.py => ScriptEvents_Default_SendReceiveSuccessfully.py} (96%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{ScriptEvents_SendReceiveAcrossMultiple.py => ScriptEvents_HappyPath_SendReceiveAcrossMultiple.py} (97%)
 rename AutomatedTesting/Gem/PythonTests/scripting/{VariableManager_CreateDeleteVars.py => VariableManager_Default_CreateDeleteVars.py} (97%)

diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleEntities.py b/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleEntities.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleEntities.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleEntities.py
index 71e24139f4..2c36062acf 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleEntities.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleEntities.py
@@ -21,7 +21,7 @@ class Tests():
 GENERAL_WAIT = 0.5  # seconds
 
 
-def Debugging_TargetMultipleEntities():
+def Debugger_HappyPath_TargetMultipleEntities():
     """
     Summary:
      Multiple Entities can be targeted in the Debugger tool
@@ -135,4 +135,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(Debugging_TargetMultipleEntities)
+    Report.start_test(Debugger_HappyPath_TargetMultipleEntities)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleGraphs.py b/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleGraphs.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleGraphs.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleGraphs.py
index 342f8f3cd4..906c198d43 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Debugging_TargetMultipleGraphs.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Debugger_HappyPath_TargetMultipleGraphs.py
@@ -19,7 +19,7 @@ class Tests():
 GENERAL_WAIT = 0.5  # seconds
 
 
-def Debugging_TargetMultipleGraphs():
+def Debugger_HappyPath_TargetMultipleGraphs():
     """
     Summary:
      Multiple Graphs can be targeted in the Debugger tool
@@ -103,4 +103,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(Debugging_TargetMultipleGraphs)
+    Report.start_test(Debugger_HappyPath_TargetMultipleGraphs)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_UndoRedo.py b/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_Default_UndoRedo.py
similarity index 98%
rename from AutomatedTesting/Gem/PythonTests/scripting/EditMenu_UndoRedo.py
rename to AutomatedTesting/Gem/PythonTests/scripting/EditMenu_Default_UndoRedo.py
index 246a8894ba..34345cf36b 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_UndoRedo.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/EditMenu_Default_UndoRedo.py
@@ -18,7 +18,7 @@ class Tests():
 # fmt: on
 
 
-def EditMenu_UndoRedo():
+def EditMenu_Default_UndoRedo():
     """
     Summary:
      Edit > Undo undoes the last action
@@ -110,4 +110,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(EditMenu_UndoRedo)
+    Report.start_test(EditMenu_Default_UndoRedo)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Entity_AddScriptCanvasComponent.py b/AutomatedTesting/Gem/PythonTests/scripting/Entity_HappyPath_AddScriptCanvasComponent.py
similarity index 96%
rename from AutomatedTesting/Gem/PythonTests/scripting/Entity_AddScriptCanvasComponent.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Entity_HappyPath_AddScriptCanvasComponent.py
index 4e8576d892..22530c90c1 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Entity_AddScriptCanvasComponent.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Entity_HappyPath_AddScriptCanvasComponent.py
@@ -20,7 +20,7 @@ class Tests():
 # fmt: on
 
 
-def Entity_AddScriptCanvasComponent():
+def Entity_HappyPath_AddScriptCanvasComponent():
     """
     Summary:
      Script Canvas Component can be added to an entity
@@ -80,4 +80,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(Entity_AddScriptCanvasComponent)
+    Report.start_test(Entity_HappyPath_AddScriptCanvasComponent)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_New_Open.py b/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_Default_NewAndOpen.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/FileMenu_New_Open.py
rename to AutomatedTesting/Gem/PythonTests/scripting/FileMenu_Default_NewAndOpen.py
index 094598e51d..4771a95ab7 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_New_Open.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/FileMenu_Default_NewAndOpen.py
@@ -26,7 +26,7 @@ class Tests():
 GENERAL_WAIT = 0.5  # seconds
 
 
-class TestFileMenuNewOpen:
+class TestFileMenuDefaultNewOpen:
     """
     Summary:
      When clicked on File->New, new script opens
@@ -86,5 +86,5 @@ class TestFileMenuNewOpen:
         general.close_pane("Script Canvas")
 
 
-test = TestFileMenuNewOpen()
+test = TestFileMenuDefaultNewOpen()
 test.run_test()
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_SavePrompt.py b/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_Default_SavePrompt.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/GraphClose_SavePrompt.py
rename to AutomatedTesting/Gem/PythonTests/scripting/GraphClose_Default_SavePrompt.py
index b2a4b22056..9720c846c7 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_SavePrompt.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/GraphClose_Default_SavePrompt.py
@@ -29,7 +29,7 @@ class Tests():
 GENERAL_WAIT = 0.5  # seconds
 
 
-class TestGraphCloseSavePrompt:
+class TestGraphClose_Default_SavePrompt:
     """
     Summary:
      The graph is closed when x button is clicked.
@@ -98,5 +98,5 @@ class TestGraphCloseSavePrompt:
         general.close_pane("Script Canvas")
 
 
-test = TestGraphCloseSavePrompt()
+test = TestGraphClose_Default_SavePrompt()
 test.run_test()
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Graph_ZoomInZoomOut.py b/AutomatedTesting/Gem/PythonTests/scripting/Graph_HappyPath_ZoomInZoomOut.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/Graph_ZoomInZoomOut.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Graph_HappyPath_ZoomInZoomOut.py
index 754a0ae686..11c83bb779 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Graph_ZoomInZoomOut.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Graph_HappyPath_ZoomInZoomOut.py
@@ -20,7 +20,7 @@ class Tests():
 GENERAL_WAIT = 0.5  # seconds
 
 
-def Graph_ZoomInZoomOut():
+def Graph_HappyPath_ZoomInZoomOut():
     """
     Summary:
      The graph can be zoomed in and zoomed out.
@@ -108,4 +108,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(Graph_ZoomInZoomOut)
+    Report.start_test(Graph_HappyPath_ZoomInZoomOut)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_NewScriptEvent.py b/AutomatedTesting/Gem/PythonTests/scripting/NewScriptEventButton_HappyPath_ContainsSCCategory.py
similarity index 100%
rename from AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_NewScriptEvent.py
rename to AutomatedTesting/Gem/PythonTests/scripting/NewScriptEventButton_HappyPath_ContainsSCCategory.py
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_RenameVariable.py b/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_HappyPath_VariableRenames.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_RenameVariable.py
rename to AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_HappyPath_VariableRenames.py
index 7351e45212..c235db6256 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_RenameVariable.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodeInspector_HappyPath_VariableRenames.py
@@ -21,7 +21,7 @@ class Tests():
 GENERAL_WAIT = 0.5  # seconds
 
 
-def NodeInspector_RenameVariable():
+def NodeInspector_HappyPath_VariableRenames():
     """
     Summary:
      Renaming variables in the Node Inspector, renames the actual variable.
@@ -123,4 +123,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(NodeInspector_RenameVariable)
+    Report.start_test(NodeInspector_HappyPath_VariableRenames)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SelectNode.py b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_CanSelectNode.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SelectNode.py
rename to AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_CanSelectNode.py
index dfe1064a92..2fb1830b8f 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_SelectNode.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_CanSelectNode.py
@@ -20,7 +20,7 @@ class Tests():
 GENERAL_WAIT = 0.5  # seconds
 
 
-def NodePalette_SelectNode():
+def NodePalette_HappyPath_CanSelectNode():
     """
     Summary:
      Categories and Nodes can be selected
@@ -97,4 +97,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(NodePalette_SelectNode)
+    Report.start_test(NodePalette_HappyPath_CanSelectNode)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_ClearSelection.py b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_ClearSelection.py
similarity index 96%
rename from AutomatedTesting/Gem/PythonTests/scripting/NodePalette_ClearSelection.py
rename to AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_ClearSelection.py
index 87a08346d0..93254dd377 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_ClearSelection.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/NodePalette_HappyPath_ClearSelection.py
@@ -17,7 +17,7 @@ class Tests():
 # fmt: on
 
 
-def NodePalette_ClearSelection():
+def NodePalette_HappyPath_ClearSelection():
     """
     Summary:
      Clicking the X button on the Search Box clears the currently entered string
@@ -85,4 +85,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(NodePalette_ClearSelection)
+    Report.start_test(NodePalette_HappyPath_ClearSelection)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_PrintMessage.py b/AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_HappyPath_PrintMessage.py
similarity index 98%
rename from AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_PrintMessage.py
rename to AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_HappyPath_PrintMessage.py
index c331157e82..721ab53d8e 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_PrintMessage.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/OnEntityActivatedDeactivated_HappyPath_PrintMessage.py
@@ -23,7 +23,7 @@ class Tests():
 # fmt: on
 
 
-def OnEntityActivatedDeactivated_PrintMessage():
+def OnEntityActivatedDeactivated_HappyPath_PrintMessage():
     """
     Summary:
      Verify that the On Entity Activated/On Entity Deactivated nodes are working as expected
@@ -189,4 +189,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(OnEntityActivatedDeactivated_PrintMessage)
+    Report.start_test(OnEntityActivatedDeactivated_HappyPath_PrintMessage)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Pane_RetainOnSCRestart.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_Default_RetainOnSCRestart.py
similarity index 98%
rename from AutomatedTesting/Gem/PythonTests/scripting/Pane_RetainOnSCRestart.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Pane_Default_RetainOnSCRestart.py
index 746efa500c..626b1cf0bd 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Pane_RetainOnSCRestart.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_Default_RetainOnSCRestart.py
@@ -23,7 +23,7 @@ class Tests():
 # fmt: on
 
 
-def Pane_RetainOnSCRestart():
+def Pane_Default_RetainOnSCRestart():
     """
     Summary:
      The Script Canvas window is opened to verify if Script canvas panes can retain its visibility, size and location
@@ -154,4 +154,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(Pane_RetainOnSCRestart)
+    Report.start_test(Pane_Default_RetainOnSCRestart)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_DocksProperly.py
old mode 100755
new mode 100644
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_DocksProperly.py
index da9dc125bc..2186a8a54a
--- a/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_DocksProperly.py
@@ -17,7 +17,7 @@ class Tests():
 # fmt: on
 
 
-def Docking_Pane():
+def Pane_HappyPath_DocksProperly():
     """
     Summary:
      The Script Canvas window is opened to verify if Script canvas panes can be docked into every
@@ -103,4 +103,4 @@ if __name__ == "__main__":
     imports.init()
     from editor_python_test_tools.utils import Report
 
-    Report.start_test(Docking_Pane)
+    Report.start_test(Pane_HappyPath_DocksProperly)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_OpenCloseSuccessfully.py
old mode 100755
new mode 100644
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_OpenCloseSuccessfully.py
index a72a302760..cedd68cd87
--- a/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_OpenCloseSuccessfully.py
@@ -18,7 +18,7 @@ class Tests():
 # fmt: on
 
 
-def Opening_Closing_Pane():
+def Pane_HappyPath_OpenCloseSuccessfully():
     """
     Summary:
      The Script Canvas window is opened to verify if Script Canvas panes can be opened and closed.
@@ -112,4 +112,4 @@ if __name__ == "__main__":
     imports.init()
     from editor_python_test_tools.utils import Report
 
-    Report.start_test(Opening_Closing_Pane)
+    Report.start_test(Pane_HappyPath_OpenCloseSuccessfully)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_ResizesProperly.py
old mode 100755
new mode 100644
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_ResizesProperly.py
index a870bea86f..36d734049d
--- a/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_HappyPath_ResizesProperly.py
@@ -17,7 +17,7 @@ class Tests():
 # fmt: on
 
 
-def Resizing_Pane():
+def Pane_HappyPath_ResizesProperly():
     """
     Summary:
      The Script Canvas window is opened to verify if Script Canvas panes can be resized and scaled
@@ -105,4 +105,4 @@ if __name__ == "__main__":
     imports.init()
     from editor_python_test_tools.utils import Report
 
-    Report.start_test(Resizing_Pane)
+    Report.start_test(Pane_HappyPath_ResizesProperly)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/UnDockedPane_CloseSCWindow.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_Undocked_ClosesSuccessfully.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/UnDockedPane_CloseSCWindow.py
rename to AutomatedTesting/Gem/PythonTests/scripting/Pane_Undocked_ClosesSuccessfully.py
index fbdba8fb38..0ddbe7e34f 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/UnDockedPane_CloseSCWindow.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_Undocked_ClosesSuccessfully.py
@@ -18,7 +18,7 @@ class Tests():
 # fmt: on
 
 
-def UnDockedPane_CloseSCWindow():
+def Pane_Undocked_ClosesSuccessfully():
     """
     Summary:
      The Script Canvas window is opened with one of the pane undocked.
@@ -118,4 +118,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(UnDockedPane_CloseSCWindow)
+    Report.start_test(Pane_Undocked_ClosesSuccessfully)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Toggle_ScriptCanvasTools.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasTools_Toggle_OpenCloseSuccess.py
similarity index 98%
rename from AutomatedTesting/Gem/PythonTests/scripting/Toggle_ScriptCanvasTools.py
rename to AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasTools_Toggle_OpenCloseSuccess.py
index 2b935a74b3..a105f1ef18 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Toggle_ScriptCanvasTools.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasTools_Toggle_OpenCloseSuccess.py
@@ -27,7 +27,7 @@ class Tests():
 # fmt: on
 
 
-def Toggle_ScriptCanvasTools():
+def ScriptCanvasTools_Toggle_OpenCloseSuccess():
     """
     Summary:
      Toggle Node Palette, Node Inspector, Bookmarks and Variable Manager in Script Canvas.
@@ -121,4 +121,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(Toggle_ScriptCanvasTools)
+    Report.start_test(ScriptCanvasTools_Toggle_OpenCloseSuccess)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets_ComponentStable.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets.py
rename to AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets_ComponentStable.py
index a1e177f5ec..d39c3d2590 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_ChangingAssets_ComponentStable.py
@@ -20,7 +20,7 @@ class Tests():
 # fmt: on
 
 
-def ScriptCanvas_ChangingAssets():
+def ScriptCanvas_ChangingAssets_ComponentStable():
     """
     Summary:
      Changing the assigned Script Canvas Asset on an entity properly updates level functionality
@@ -106,4 +106,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(ScriptCanvas_ChangingAssets)
+    Report.start_test(ScriptCanvas_ChangingAssets_ComponentStable)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents_InteractSuccessfully.py
similarity index 96%
rename from AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents.py
rename to AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents_InteractSuccessfully.py
index 5117069b64..9bbda9bdbd 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoComponents_InteractSuccessfully.py
@@ -23,7 +23,7 @@ class LogLines:
     expected_lines = ["Greetings from the first script", "Greetings from the second script"]
 
 
-def ScriptCanvas_TwoComponents():
+def ScriptCanvas_TwoComponents_InteractSuccessfully():
     """
     Summary:
      A test entity contains two Script Canvas components with different unique script canvas files.
@@ -111,4 +111,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(ScriptCanvas_TwoComponents)
+    Report.start_test(ScriptCanvas_TwoComponents_InteractSuccessfully)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities_UseSimultaneously.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities.py
rename to AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities_UseSimultaneously.py
index 53b3951c1a..d25ef64c4a 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvas_TwoEntities_UseSimultaneously.py
@@ -19,7 +19,7 @@ class Tests():
 # fmt: on
 
 
-def ScriptCanvas_TwoEntities():
+def ScriptCanvas_TwoEntities_UseSimultaneously():
     """
     Summary:
      Two Entities can use the same Graph asset successfully at RunTime. The script canvas asset
@@ -101,4 +101,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(ScriptCanvas_TwoEntities)
+    Report.start_test(ScriptCanvas_TwoEntities_UseSimultaneously)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_CreateScriptEventFile.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_HappyPath_CreatedWithoutError.py
similarity index 100%
rename from AutomatedTesting/Gem/PythonTests/scripting/AssetEditor_CreateScriptEventFile.py
rename to AutomatedTesting/Gem/PythonTests/scripting/ScriptEvent_HappyPath_CreatedWithoutError.py
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_Default_SendReceiveSuccessfully.py
similarity index 96%
rename from AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveSuccessfully.py
rename to AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_Default_SendReceiveSuccessfully.py
index 3f343221b0..e0730b284c 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveSuccessfully.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_Default_SendReceiveSuccessfully.py
@@ -20,7 +20,7 @@ class Tests():
 # fmt: on
 
 
-def ScriptEvents_SendReceiveSuccessfully():
+def ScriptEvents_Default_SendReceiveSuccessfully():
     """
     Summary:
      An entity exists in the level that contains a Script Canvas component. In the graph is both a Send Event
@@ -102,4 +102,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(ScriptEvents_SendReceiveSuccessfully)
+    Report.start_test(ScriptEvents_Default_SendReceiveSuccessfully)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveAcrossMultiple.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_HappyPath_SendReceiveAcrossMultiple.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveAcrossMultiple.py
rename to AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_HappyPath_SendReceiveAcrossMultiple.py
index f58d6007a1..be2665899f 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_SendReceiveAcrossMultiple.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptEvents_HappyPath_SendReceiveAcrossMultiple.py
@@ -21,7 +21,7 @@ class Tests():
 # fmt: on
 
 
-def ScriptEvents_SendReceiveAcrossMultiple():
+def ScriptEvents_HappyPath_SendReceiveAcrossMultiple():
     """
     Summary:
      EntityA and EntityB will be created in a level. Attached to both will be a Script Canvas component.
@@ -113,4 +113,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(ScriptEvents_SendReceiveAcrossMultiple)
+    Report.start_test(ScriptEvents_HappyPath_SendReceiveAcrossMultiple)
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Active.py
index 24e8eeda11..a225ebd845 100755
--- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Active.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Active.py
@@ -29,67 +29,67 @@ TEST_DIRECTORY = os.path.dirname(__file__)
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(TestAutomationBase):
-    def test_Opening_Closing_Pane(self, request, workspace, editor, launcher_platform):
-        from . import Opening_Closing_Pane as test_module
+    def test_Pane_HappyPath_OpenCloseSuccessfully(self, request, workspace, editor, launcher_platform):
+        from . import Pane_HappyPath_OpenCloseSuccessfully as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_Docking_Pane(self, request, workspace, editor, launcher_platform):
-        from . import Docking_Pane as test_module
+    def test_Pane_HappyPath_DocksProperly(self, request, workspace, editor, launcher_platform):
+        from . import Pane_HappyPath_DocksProperly as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_Resizing_Pane(self, request, workspace, editor, launcher_platform):
-        from . import Resizing_Pane as test_module
+    def test_Pane_HappyPath_ResizesProperly(self, request, workspace, editor, launcher_platform):
+        from . import Pane_HappyPath_ResizesProperly as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
-    def test_ScriptCanvas_TwoComponents(self, request, workspace, editor, launcher_platform, level):
+    def test_ScriptCanvas_TwoComponents_InteractSuccessfully(self, request, workspace, editor, launcher_platform, level):
         def teardown():
             file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
-        from . import ScriptCanvas_TwoComponents as test_module
+        from . import ScriptCanvas_TwoComponents_InteractSuccessfully as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
-    def test_ScriptCanvas_ChangingAssets(self, request, workspace, editor, launcher_platform, project, level):
+    def test_ScriptCanvas_ChangingAssets_ComponentStable(self, request, workspace, editor, launcher_platform, project, level):
         def teardown():
             file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
-        from . import ScriptCanvas_ChangingAssets as test_module
+        from . import ScriptCanvas_ChangingAssets_ComponentStable as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_Graph_ZoomInZoomOut(self, request, workspace, editor, launcher_platform):
-        from . import Graph_ZoomInZoomOut as test_module
+    def test_Graph_HappyPath_ZoomInZoomOut(self, request, workspace, editor, launcher_platform):
+        from . import Graph_HappyPath_ZoomInZoomOut as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_NodePalette_SelectNode(self, request, workspace, editor, launcher_platform):
-        from . import NodePalette_SelectNode as test_module
+    def test_NodePalette_HappyPath_CanSelectNode(self, request, workspace, editor, launcher_platform):
+        from . import NodePalette_HappyPath_CanSelectNode as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
-    def test_OnEntityActivatedDeactivated_PrintMessage(self, request, workspace, editor, launcher_platform, project, level):
+    def test_OnEntityActivatedDeactivated_HappyPath_PrintMessage(self, request, workspace, editor, launcher_platform, project, level):
         def teardown():
             file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
-        from . import OnEntityActivatedDeactivated_PrintMessage as test_module
+        from . import OnEntityActivatedDeactivated_HappyPath_PrintMessage as test_module
         self._run_test(request, workspace, editor, test_module)
-    
-    def test_NodePalette_ClearSelection(self, request, workspace, editor, launcher_platform, project):
-        from . import NodePalette_ClearSelection as test_module
+
+    def test_NodePalette_HappyPath_ClearSelection(self, request, workspace, editor, launcher_platform, project):
+        from . import NodePalette_HappyPath_ClearSelection as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
-    def test_ScriptCanvas_TwoEntities(self, request, workspace, editor, launcher_platform, project, level):
+    def test_ScriptCanvas_TwoEntities_UseSimultaneously(self, request, workspace, editor, launcher_platform, project, level):
         def teardown():
             file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
-        from . import ScriptCanvas_TwoEntities as test_module
+        from . import ScriptCanvas_TwoEntities_UseSimultaneously as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_AssetEditor_CreateScriptEventFile(self, request, workspace, editor, launcher_platform, project):
+    def test_ScriptEvent_HappyPath_CreatedWithoutError(self, request, workspace, editor, launcher_platform, project):
         def teardown():
             file_system.delete(
                 [os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True
@@ -98,67 +98,67 @@ class TestAutomation(TestAutomationBase):
         file_system.delete(
             [os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True
         )
-        from . import AssetEditor_CreateScriptEventFile as test_module
+        from . import ScriptEvent_HappyPath_CreatedWithoutError as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_Toggle_ScriptCanvasTools(self, request, workspace, editor, launcher_platform):
-        from . import Toggle_ScriptCanvasTools as test_module
+    def test_ScriptCanvasTools_Toggle_OpenCloseSuccess(self, request, workspace, editor, launcher_platform):
+        from . import ScriptCanvasTools_Toggle_OpenCloseSuccess as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_NodeInspector_RenameVariable(self, request, workspace, editor, launcher_platform, project):
-        from . import NodeInspector_RenameVariable as test_module
+    def test_NodeInspector_HappyPath_VariableRenames(self, request, workspace, editor, launcher_platform, project):
+        from . import NodeInspector_HappyPath_VariableRenames as test_module
         self._run_test(request, workspace, editor, test_module)
-        
-    def test_Debugging_TargetMultipleGraphs(self, request, workspace, editor, launcher_platform, project):
-        from . import Debugging_TargetMultipleGraphs as test_module
+
+    def test_Debugger_HappyPath_TargetMultipleGraphs(self, request, workspace, editor, launcher_platform, project):
+        from . import Debugger_HappyPath_TargetMultipleGraphs as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
-    def test_Debugging_TargetMultipleEntities(self, request, workspace, editor, launcher_platform, project, level):
+    def test_Debugger_HappyPath_TargetMultipleEntities(self, request, workspace, editor, launcher_platform, project, level):
         def teardown():
             file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
-        from . import Debugging_TargetMultipleEntities as test_module
+        from . import Debugger_HappyPath_TargetMultipleEntities as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_EditMenu_UndoRedo(self, request, workspace, editor, launcher_platform, project):
-        from . import EditMenu_UndoRedo as test_module
+    def test_EditMenu_Default_UndoRedo(self, request, workspace, editor, launcher_platform, project):
+        from . import EditMenu_Default_UndoRedo as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_UnDockedPane_CloseSCWindow(self, request, workspace, editor, launcher_platform):
-        from . import UnDockedPane_CloseSCWindow as test_module
+    def test_Pane_Undocked_ClosesSuccessfully(self, request, workspace, editor, launcher_platform):
+        from . import Pane_Undocked_ClosesSuccessfully as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
-    def test_Entity_AddScriptCanvasComponent(self, request, workspace, editor, launcher_platform, project, level):
+    def test_Entity_HappyPath_AddScriptCanvasComponent(self, request, workspace, editor, launcher_platform, project, level):
         def teardown():
             file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
-        from . import Entity_AddScriptCanvasComponent as test_module
+        from . import Entity_HappyPath_AddScriptCanvasComponent as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    def test_Pane_RetainOnSCRestart(self, request, workspace, editor, launcher_platform):
-        from . import Pane_RetainOnSCRestart as test_module
+    def test_Pane_Default_RetainOnSCRestart(self, request, workspace, editor, launcher_platform):
+        from . import Pane_Default_RetainOnSCRestart as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
-    def test_ScriptEvents_SendReceiveAcrossMultiple(self, request, workspace, editor, launcher_platform, project, level):
+    def test_ScriptEvents_HappyPath_SendReceiveAcrossMultiple(self, request, workspace, editor, launcher_platform, project, level):
         def teardown():
             file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
-        from . import ScriptEvents_SendReceiveAcrossMultiple as test_module
+        from . import ScriptEvents_HappyPath_SendReceiveAcrossMultiple as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.parametrize("level", ["tmp_level"])
-    def test_ScriptEvents_SendReceiveSuccessfully(self, request, workspace, editor, launcher_platform, project, level):
+    def test_ScriptEvents_Default_SendReceiveSuccessfully(self, request, workspace, editor, launcher_platform, project, level):
         def teardown():
             file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
         request.addfinalizer(teardown)
         file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
-        from . import ScriptEvents_SendReceiveSuccessfully as test_module
+        from . import ScriptEvents_Default_SendReceiveSuccessfully as test_module
         self._run_test(request, workspace, editor, test_module)
 
 # NOTE: We had to use hydra_test_utils.py, as TestAutomationBase run_test method
@@ -171,16 +171,16 @@ class TestScriptCanvasTests(object):
     The following tests use hydra_test_utils.py to launch the editor and validate the results.
     """
 
-    def test_FileMenu_New_Open(self, request, editor, launcher_platform):
+    def test_FileMenu_Default_NewAndOpen(self, request, editor, launcher_platform):
         expected_lines = [
             "File->New action working as expected: True",
             "File->Open action working as expected: True",
         ]
         hydra.launch_and_validate_results(
-            request, TEST_DIRECTORY, editor, "FileMenu_New_Open.py", expected_lines, auto_test_mode=False, timeout=60,
+            request, TEST_DIRECTORY, editor, "FileMenu_Default_NewAndOpen.py", expected_lines, auto_test_mode=False, timeout=60,
         )
 
-    def test_AssetEditor_NewScriptEvent(self, request, editor, launcher_platform):
+    def test_NewScriptEventButton_HappyPath_ContainsSCCategory(self, request, editor, launcher_platform):
         expected_lines = [
             "New Script event action found: True",
             "Asset Editor opened: True",
@@ -191,13 +191,13 @@ class TestScriptCanvasTests(object):
             request,
             TEST_DIRECTORY,
             editor,
-            "AssetEditor_NewScriptEvent.py",
+            "NewScriptEventButton_HappyPath_ContainsSCCategory.py",
             expected_lines,
             auto_test_mode=False,
             timeout=60,
         )
 
-    def test_GraphClose_SavePrompt(self, request, editor, launcher_platform):
+    def test_GraphClose_Default_SavePrompt(self, request, editor, launcher_platform):
         expected_lines = [
             "New graph created: True",
             "Save prompt opened as expected: True",
@@ -207,13 +207,13 @@ class TestScriptCanvasTests(object):
             request,
             TEST_DIRECTORY,
             editor,
-            "GraphClose_SavePrompt.py",
+            "GraphClose_Default_SavePrompt.py",
             expected_lines,
             auto_test_mode=False,
             timeout=60,
         )
 
-    def test_VariableManager_CreateDeleteVars(self, request, editor, launcher_platform):
+    def test_VariableManager_Default_CreateDeleteVars(self, request, editor, launcher_platform):
         var_types = ["Boolean", "Color", "EntityID", "Number", "String", "Transform", "Vector2", "Vector3", "Vector4"]
         expected_lines = [f"Success: {var_type} variable is created" for var_type in var_types]
         expected_lines.extend([f"Success: {var_type} variable is deleted" for var_type in var_types])
@@ -221,7 +221,7 @@ class TestScriptCanvasTests(object):
             request,
             TEST_DIRECTORY,
             editor,
-            "VariableManager_CreateDeleteVars.py",
+            "VariableManager_Default_CreateDeleteVars.py",
             expected_lines,
             auto_test_mode=False,
             timeout=60,
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_CreateDeleteVars.py b/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_Default_CreateDeleteVars.py
similarity index 97%
rename from AutomatedTesting/Gem/PythonTests/scripting/VariableManager_CreateDeleteVars.py
rename to AutomatedTesting/Gem/PythonTests/scripting/VariableManager_Default_CreateDeleteVars.py
index 8f7557c01e..e53939172e 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_CreateDeleteVars.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/VariableManager_Default_CreateDeleteVars.py
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
 
-def VariableManager_CreateDeleteVars():
+def VariableManager_Default_CreateDeleteVars():
     """
     Summary:
      Creating and deleting each type of variable in the Variable Manager pane
@@ -111,4 +111,4 @@ if __name__ == "__main__":
     imports.init()
     from utils import Report
 
-    Report.start_test(VariableManager_CreateDeleteVars)
+    Report.start_test(VariableManager_Default_CreateDeleteVars)