diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
index 79219f50b0..d8778a9b9d 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h
@@ -38,8 +38,8 @@ namespace AtomToolsFramework
         void SetupCameraProperies(AzFramework::CameraProps& cameraProps);
 
     private:
-        CameraListBuilder
-            m_cameraListBuilder; //!< Builder to generate a list of CameraInputs to run in the ModularViewportCameraControllerInstance.
+        //! Builder to generate a list of CameraInputs to run in the ModularViewportCameraControllerInstance.
+        CameraListBuilder m_cameraListBuilder;
         CameraPropsBuilder m_cameraPropsBuilder; //!< Builder to define custom camera properties to use for things such as rotate and
                                                  //!< translate interpolation.
     };
@@ -77,10 +77,10 @@ namespace AtomToolsFramework
         //! Encapsulates an animation (interpolation) between two transforms.
         struct CameraAnimation
         {
-            AZ::Transform m_transformStart =
-                AZ::Transform::CreateIdentity(); //!< The transform of the camera at the start of the animation.
+            //! The transform of the camera at the start of the animation.
+            AZ::Transform m_transformStart = AZ::Transform::CreateIdentity();
             AZ::Transform m_transformEnd = AZ::Transform::CreateIdentity(); //!< The transform of the camera at the end of the animation.
-            float m_animationT = 0.0f; //!< The interpolation amount between the start and end transforms (in the range 0.0-1.0).
+            float m_time = 0.0f; //!< The interpolation amount between the start and end transforms (in the range 0.0 - 1.0).
         };
 
         AzFramework::Camera m_camera; //!< The current camera state (pitch/yaw/position/look-distance).
@@ -92,9 +92,9 @@ namespace AtomToolsFramework
         CameraMode m_cameraMode = CameraMode::Control; //!< The current mode the camera is operating in.
         AZStd::optional<AZ::Vector3> m_lookAtAfterInterpolation; //!< The look at point after an interpolation has finished.
                                                                  //!< Will be cleared when the view changes (camera looks away).
-        bool m_updatingTransformInternally =
-            false; //!< Flag to prevent circular updates of the camera transform (while the viewport transform is being updated internally).
-        AZ::RPI::ViewportContext::MatrixChangedEvent::Handler
-            m_cameraViewMatrixChangeHandler; //!< Listen for camera view changes outside of the camera controller.
+        //! Flag to prevent circular updates of the camera transform (while the viewport transform is being updated internally).
+        bool m_updatingTransformInternally = false;
+        //! Listen for camera view changes outside of the camera controller.
+        AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
     };
 } // namespace AtomToolsFramework
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
index ce4c6021af..cc87ba1e46 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp
@@ -181,12 +181,12 @@ namespace AtomToolsFramework
                     return t * t * t * (t * (t * 6.0f - 15.0f) + 10.0f);
                 };
 
-                const auto& [transformStart, transformEnd, animationT] = m_cameraAnimation;
+                const auto& [transformStart, transformEnd, animationTime] = m_cameraAnimation;
 
-                const float transitionT = smootherStepFn(animationT);
+                const float transitionTime = smootherStepFn(animationTime);
                 const AZ::Transform current = AZ::Transform::CreateFromQuaternionAndTranslation(
-                    transformStart.GetRotation().Slerp(transformEnd.GetRotation(), transitionT),
-                    transformStart.GetTranslation().Lerp(transformEnd.GetTranslation(), transitionT));
+                    transformStart.GetRotation().Slerp(transformEnd.GetRotation(), transitionTime),
+                    transformStart.GetTranslation().Lerp(transformEnd.GetTranslation(), transitionTime));
 
                 const AZ::Vector3 eulerAngles = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromTransform(current));
                 m_camera.m_pitch = eulerAngles.GetX();
@@ -194,12 +194,12 @@ namespace AtomToolsFramework
                 m_camera.m_lookAt = current.GetTranslation();
                 m_targetCamera = m_camera;
 
-                if (animationT >= 1.0f)
+                if (animationTime >= 1.0f)
                 {
                     m_cameraMode = CameraMode::Control;
                 }
 
-                m_cameraAnimation.m_animationT = AZ::GetClamp(animationT + event.m_deltaTime.count(), 0.0f, 1.0f);
+                m_cameraAnimation.m_time = AZ::GetClamp(animationTime + event.m_deltaTime.count(), 0.0f, 1.0f);
 
                 viewportContext->SetCameraTransform(current);
             }