diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
index 6fa0f1adfa..138532be0f 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
@@ -34,8 +34,8 @@
 #include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
 #include <ScriptCanvas/Components/EditorGraph.h>
 
-#include <Editor/View/Windows/Tools/UpgradeTool/ui_Controller.h>
-#include <Editor/View/Windows/Tools/UpgradeTool/moc_Controller.cpp>
+#include <Editor/View/Windows/Tools/UpgradeTool/ui_View.h>
+// #include <Editor/View/Windows/Tools/UpgradeTool/moc_View.cpp>
 
 namespace ScriptCanvasEditor
 {
@@ -43,7 +43,7 @@ namespace ScriptCanvasEditor
     {
         Controller::Controller(QWidget* parent)
             : AzQtComponents::StyledDialog(parent)
-            , m_view(new Ui::Controller())
+            , m_view(new Ui::View())
         {
             m_view->setupUi(this);
             m_view->tableWidget->horizontalHeader()->setVisible(false);
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.h
index ac18ff6cf5..298f755d56 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.h
@@ -11,6 +11,7 @@
 #if !defined(Q_MOC_RUN)
 #include <AzCore/Component/EntityId.h>
 #include <AzCore/PlatformDef.h>
+#include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzQtComponents/Components/StyledDialog.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h>
 #include <ISystem.h>
@@ -26,7 +27,7 @@ class QTableWidgetItem;
 
 namespace Ui
 {
-    class Controller;
+    class View;
 }
 
 namespace AzQtComponents
@@ -58,7 +59,7 @@ namespace ScriptCanvasEditor
             static constexpr int ColumnBrowse = 2;
             static constexpr int ColumnStatus = 3;
 
-            AZStd::unique_ptr<Ui::Controller> m_view;
+            AZStd::unique_ptr<Ui::View> m_view;
             int m_handledAssetCount = 0;
 
             void AddLogEntries();
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Model.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Model.h
index 58ad9877be..ab0f710870 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Model.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Model.h
@@ -21,7 +21,7 @@ namespace ScriptCanvasEditor
 {
     namespace VersionExplorer
     {
-        //!Scoped utility to set and restore the "ed_KeepEditorActive" CVar in order to allow
+        //! Scoped utility to set and restore the "ed_KeepEditorActive" CVar in order to allow
         //! the upgrade tool to work even if the editor is not in the foreground
         class EditorKeepAlive
         {
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp
index 6f856b9d4c..c1faedc3a3 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp
@@ -8,11 +8,6 @@
 
 #include <Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h>
 
-namespace LoggerCpp
-{
-
-}
-
 namespace ScriptCanvasEditor
 {
     namespace VersionExplorer
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.ui b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/View.ui
similarity index 99%
rename from Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.ui
rename to Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/View.ui
index fdeb701f33..f549c821d6 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.ui
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/View.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Controller</class>
- <widget class="QWidget" name="Controller">
+ <class>View</class>
+ <widget class="QWidget" name="View">
   <property name="windowModality">
    <enum>Qt::WindowModal</enum>
   </property>
diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
index b12c608fe5..609f7cd454 100644
--- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
+++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
@@ -261,7 +261,6 @@ set(FILES
     Editor/View/Windows/ScriptCanvasEditorResources.qrc
     Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
     Editor/View/Windows/Tools/UpgradeTool/Controller.h
-    Editor/View/Windows/Tools/UpgradeTool/Controller.ui
     Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
     Editor/View/Windows/Tools/UpgradeTool/FileSaver.h
     Editor/View/Windows/Tools/UpgradeTool/LogTraits.h
@@ -277,6 +276,7 @@ set(FILES
     Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.ui
     Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp
     Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h
+    Editor/View/Windows/Tools/UpgradeTool/View.ui
     Editor/Framework/ScriptCanvasGraphUtilities.inl
     Editor/Framework/ScriptCanvasGraphUtilities.h
     Editor/Framework/ScriptCanvasTraceUtilities.h