diff --git a/Code/Editor/EditorPreferencesDialog.cpp b/Code/Editor/EditorPreferencesDialog.cpp
index 22c108ebf9..c56df15908 100644
--- a/Code/Editor/EditorPreferencesDialog.cpp
+++ b/Code/Editor/EditorPreferencesDialog.cpp
@@ -27,8 +27,8 @@
 #include "EditorPreferencesPageGeneral.h"
 #include "EditorPreferencesPageFiles.h"
 #include "EditorPreferencesPageViewportGeneral.h"
-#include "EditorPreferencesPageViewportGizmo.h"
-#include "EditorPreferencesPageViewportMovement.h"
+#include "EditorPreferencesPageViewportManipulator.h"
+#include "EditorPreferencesPageViewportCamera.h"
 #include "EditorPreferencesPageViewportDebug.h"
 #include "EditorPreferencesPageExperimentalLighting.h"
 #include "EditorPreferencesPageAWS.h"
diff --git a/Code/Editor/EditorPreferencesPageViewportCamera.cpp b/Code/Editor/EditorPreferencesPageViewportCamera.cpp
index a272b3759f..368d2769f8 100644
--- a/Code/Editor/EditorPreferencesPageViewportCamera.cpp
+++ b/Code/Editor/EditorPreferencesPageViewportCamera.cpp
@@ -8,7 +8,7 @@
 
 #include "EditorDefs.h"
 
-#include "EditorPreferencesPageViewportMovement.h"
+#include "EditorPreferencesPageViewportCamera.h"
 
 #include <AzCore/std/sort.h>
 #include <AzFramework/Input/Buses/Requests/InputDeviceRequestBus.h>
@@ -226,6 +226,11 @@ CEditorPreferencesPage_ViewportCamera::CEditorPreferencesPage_ViewportCamera()
     m_icon = QIcon(":/res/Camera.svg");
 }
 
+const char* CEditorPreferencesPage_ViewportCamera::GetCategory()
+{
+    return "Viewports";
+}
+
 const char* CEditorPreferencesPage_ViewportCamera::GetTitle()
 {
     return "Camera";
@@ -236,6 +241,16 @@ QIcon& CEditorPreferencesPage_ViewportCamera::GetIcon()
     return m_icon;
 }
 
+void CEditorPreferencesPage_ViewportCamera::OnCancel()
+{
+    // noop
+}
+
+bool CEditorPreferencesPage_ViewportCamera::OnQueryCancel()
+{
+    return true;
+}
+
 void CEditorPreferencesPage_ViewportCamera::OnApply()
 {
     SandboxEditor::SetCameraTranslateSpeed(m_cameraMovementSettings.m_translateSpeed);
diff --git a/Code/Editor/EditorPreferencesPageViewportCamera.h b/Code/Editor/EditorPreferencesPageViewportCamera.h
index 64a3702432..31a728599f 100644
--- a/Code/Editor/EditorPreferencesPageViewportCamera.h
+++ b/Code/Editor/EditorPreferencesPageViewportCamera.h
@@ -29,22 +29,12 @@ public:
     CEditorPreferencesPage_ViewportCamera();
     virtual ~CEditorPreferencesPage_ViewportCamera() = default;
 
-    virtual const char* GetCategory() override
-    {
-        return "Viewports";
-    }
-
-    virtual const char* GetTitle();
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override
-    {
-    }
-
-    virtual bool OnQueryCancel() override
-    {
-        return true;
-    }
+    const char* GetCategory() override;
+    const char* GetTitle() override;
+    QIcon& GetIcon() override;
+    void OnApply() override;
+    void OnCancel() override;
+    bool OnQueryCancel() override;
 
 private:
     void InitializeSettings();
diff --git a/Code/Editor/EditorPreferencesPageViewportManipulator.cpp b/Code/Editor/EditorPreferencesPageViewportManipulator.cpp
index d1578f4f9c..ea00d6a7f0 100644
--- a/Code/Editor/EditorPreferencesPageViewportManipulator.cpp
+++ b/Code/Editor/EditorPreferencesPageViewportManipulator.cpp
@@ -8,7 +8,7 @@
 
 #include "EditorDefs.h"
 
-#include "EditorPreferencesPageViewportGizmo.h"
+#include "EditorPreferencesPageViewportManipulator.h"
 
 // Editor
 #include "EditorViewportSettings.h"
@@ -53,11 +53,31 @@ CEditorPreferencesPage_ViewportManipulator::CEditorPreferencesPage_ViewportManip
     m_icon = QIcon(":/res/Gizmos.svg");
 }
 
+const char* CEditorPreferencesPage_ViewportManipulator::GetCategory()
+{
+    return "Viewports";
+}
+
+const char* CEditorPreferencesPage_ViewportManipulator::GetTitle()
+{
+    return "Manipulators";
+}
+
 QIcon& CEditorPreferencesPage_ViewportManipulator::GetIcon()
 {
     return m_icon;
 }
 
+void CEditorPreferencesPage_ViewportManipulator::OnCancel()
+{
+    // noop
+}
+
+bool CEditorPreferencesPage_ViewportManipulator::OnQueryCancel()
+{
+    return true;
+}
+
 void CEditorPreferencesPage_ViewportManipulator::OnApply()
 {
     SandboxEditor::SetManipulatorLineBoundWidth(m_manipulators.m_manipulatorLineBoundWidth);
diff --git a/Code/Editor/EditorPreferencesPageViewportManipulator.h b/Code/Editor/EditorPreferencesPageViewportManipulator.h
index 52270c3b0d..93db6a7035 100644
--- a/Code/Editor/EditorPreferencesPageViewportManipulator.h
+++ b/Code/Editor/EditorPreferencesPageViewportManipulator.h
@@ -25,26 +25,12 @@ public:
     CEditorPreferencesPage_ViewportManipulator();
     virtual ~CEditorPreferencesPage_ViewportManipulator() = default;
 
-    virtual const char* GetCategory() override
-    {
-        return "Viewports";
-    }
-
-    virtual const char* GetTitle() override
-    {
-        return "Manipulators";
-    }
-
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override
-    {
-    }
-
-    virtual bool OnQueryCancel() override
-    {
-        return true;
-    }
+    const char* GetCategory() override;
+    const char* GetTitle() override;
+    QIcon& GetIcon() override;
+    void OnApply() override;
+    void OnCancel() override;
+    bool OnQueryCancel() override;
 
 private:
     void InitializeSettings();
diff --git a/Code/Editor/PreferencesStdPages.cpp b/Code/Editor/PreferencesStdPages.cpp
index 5cee5bd8da..1dd40702a7 100644
--- a/Code/Editor/PreferencesStdPages.cpp
+++ b/Code/Editor/PreferencesStdPages.cpp
@@ -17,8 +17,8 @@
 #include "EditorPreferencesPageGeneral.h"
 #include "EditorPreferencesPageFiles.h"
 #include "EditorPreferencesPageViewportGeneral.h"
-#include "EditorPreferencesPageViewportGizmo.h"
-#include "EditorPreferencesPageViewportMovement.h"
+#include "EditorPreferencesPageViewportManipulator.h"
+#include "EditorPreferencesPageViewportCamera.h"
 #include "EditorPreferencesPageViewportDebug.h"
 #include "EditorPreferencesPageExperimentalLighting.h"
 #include "EditorPreferencesPageAWS.h"
diff --git a/Code/Editor/editor_lib_files.cmake b/Code/Editor/editor_lib_files.cmake
index 24634b245d..031ad26d76 100644
--- a/Code/Editor/editor_lib_files.cmake
+++ b/Code/Editor/editor_lib_files.cmake
@@ -554,10 +554,10 @@ set(FILES
     EditorPreferencesPageFiles.cpp
     EditorPreferencesPageViewportGeneral.h
     EditorPreferencesPageViewportGeneral.cpp
-    EditorPreferencesPageViewportGizmo.h
-    EditorPreferencesPageViewportGizmo.cpp
-    EditorPreferencesPageViewportMovement.h
-    EditorPreferencesPageViewportMovement.cpp
+    EditorPreferencesPageViewportManipulator.h
+    EditorPreferencesPageViewportManipulator.cpp
+    EditorPreferencesPageViewportCamera.h
+    EditorPreferencesPageViewportCamera.cpp
     EditorPreferencesPageViewportDebug.h
     EditorPreferencesPageViewportDebug.cpp
     EditorPreferencesPageExperimentalLighting.h