diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h
index 53b0729bac..4bafdc3d01 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h
@@ -13,7 +13,7 @@
 
 namespace AzToolsFramework
 {
-    //! The AZ::Interface of the central editor mode state tracker for all viewports.
+    //! The AZ::Interface of the central editor mode tracker for all viewports.
     class ViewportEditorModeTrackerInterface
     {
     public:
@@ -35,8 +35,6 @@ namespace AzToolsFramework
 
         //! Returns true if the specified viewport is being tracked, otherwise false.
         virtual bool IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0;
-
-    private:
     };
 } // namespace AzToolsFramework
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.h
index cdb50e30e7..caa762241c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.h
@@ -30,7 +30,7 @@ namespace AzToolsFramework
         IdType m_id = ViewportUi::DefaultViewportId; //!< The unique identifier for a given viewport.
     };
 
-    //! Interface for the editor mode state of a given viewport.
+    //! Interface for the editor modes of a given viewport.
     class ViewportEditorModesInterface
     {
     public:
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp
index 2eb8cdb9d8..511024daed 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp
@@ -61,24 +61,24 @@ namespace AzToolsFramework
 
     void ViewportEditorModeTracker::EnterMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode)
     {
-        auto& editorModeStates = m_viewportEditorModeStates[viewportEditorModeInfo.m_id];
+        auto& editorModes = m_viewportEditorModesMap[viewportEditorModeInfo.m_id];
         AZ_Warning(
-                ViewportEditorModeLogWindow, !editorModeStates.IsModeActive(mode),
+                ViewportEditorModeLogWindow, !editorModes.IsModeActive(mode),
                 AZStd::string::format(
                     "Duplicate call to EnterMode for mode '%u' on id '%i'", static_cast<AZ::u32>(mode), viewportEditorModeInfo.m_id).c_str());
-        editorModeStates.SetModeActive(mode);
+        editorModes.SetModeActive(mode);
         ViewportEditorModeNotificationsBus::Event(
-            viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeEnter, editorModeStates, mode);
+            viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeEnter, editorModes, mode);
     }
 
     void ViewportEditorModeTracker::ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode)
     {
-        ViewportEditorModes* editorModeStates = nullptr;
-        if (m_viewportEditorModeStates.count(viewportEditorModeInfo.m_id))
+        ViewportEditorModes* editorModes = nullptr;
+        if (m_viewportEditorModesMap.count(viewportEditorModeInfo.m_id))
         {
-            editorModeStates = &m_viewportEditorModeStates.at(viewportEditorModeInfo.m_id);
+            editorModes = &m_viewportEditorModesMap.at(viewportEditorModeInfo.m_id);
             AZ_Warning(
-                ViewportEditorModeLogWindow, editorModeStates->IsModeActive(mode),
+                ViewportEditorModeLogWindow, editorModes->IsModeActive(mode),
                 AZStd::string::format(
                     "Duplicate call to ExitMode for mode '%u' on id '%i'", static_cast<AZ::u32>(mode), viewportEditorModeInfo.m_id).c_str());
         }
@@ -88,20 +88,20 @@ namespace AzToolsFramework
                 ViewportEditorModeLogWindow, false, "Call to ExitMode for mode '%u' on id '%i' without precursor call to EnterMode",
                 static_cast<AZ::u32>(mode), viewportEditorModeInfo.m_id);
 
-            editorModeStates = &m_viewportEditorModeStates[viewportEditorModeInfo.m_id];
+            editorModes = &m_viewportEditorModesMap[viewportEditorModeInfo.m_id];
         }
 
-        editorModeStates->SetModeInactive(mode);
+        editorModes->SetModeInactive(mode);
         ViewportEditorModeNotificationsBus::Event(
-            viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeExit, *editorModeStates, mode);
+            viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeExit, *editorModes, mode);
     }
 
     const ViewportEditorModesInterface* ViewportEditorModeTracker::GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const
     {
-        if (auto editorModeStates = m_viewportEditorModeStates.find(viewportEditorModeInfo.m_id);
-            editorModeStates != m_viewportEditorModeStates.end())
+        if (auto editorModes = m_viewportEditorModesMap.find(viewportEditorModeInfo.m_id);
+            editorModes != m_viewportEditorModesMap.end())
         {
-            return &editorModeStates->second;
+            return &editorModes->second;
         }
         else
         {
@@ -111,11 +111,11 @@ namespace AzToolsFramework
 
     size_t ViewportEditorModeTracker::GetTrackedViewportCount() const
     {
-        return m_viewportEditorModeStates.size();
+        return m_viewportEditorModesMap.size();
     }
 
     bool ViewportEditorModeTracker::IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const
     {
-        return m_viewportEditorModeStates.count(viewportEditorModeInfo.m_id) > 0;
+        return m_viewportEditorModesMap.count(viewportEditorModeInfo.m_id) > 0;
     }
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h
index 0ec5a31ddd..222e5af829 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h
@@ -56,7 +56,7 @@ namespace AzToolsFramework
         bool IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const override;
 
     private:
-        using ViewportEditorModess = AZStd::unordered_map<typename ViewportEditorModeInfo::IdType, ViewportEditorModes>;
-        ViewportEditorModess m_viewportEditorModeStates; //!< Editor mode state per viewport.
+        using ViewportEditorModesMap = AZStd::unordered_map<typename ViewportEditorModeInfo::IdType, ViewportEditorModes>;
+        ViewportEditorModesMap m_viewportEditorModesMap; //!< Editor mode state per viewport.
     };
 } // namespace AzToolsFramework