diff --git a/include/mcc/mcc_movement_controls.h b/include/mcc/mcc_movement_controls.h
index 544739e..4bc3593 100644
--- a/include/mcc/mcc_movement_controls.h
+++ b/include/mcc/mcc_movement_controls.h
@@ -283,13 +283,13 @@ public:
     template <mcc_hardware_c HARDWARE_T,
               mcc_generic_mount_c MOUNT_T,  // MOUNT_T is mcc_telemetry_c, mcc_pzone_container_c and mcc_logger_c
                                             // (see mcc_concepts.h)
-              mcc_mount_status_c STATUS_T,
-              std::invocable<STATUS_T const&> CallbackFuncT = decltype([](STATUS_T const&) {})>
+              std::invocable<typename MOUNT_T::mount_status_t const&> CallbackFuncT =
+                  decltype([](typename MOUNT_T::mount_status_t const&) {})>
     MccSimpleMovementControls(
         HARDWARE_T* hardware,
         MOUNT_T* mount,
-        CallbackFuncT&& mode_switch_callback = [](STATUS_T const&) {})
-        : MccSimpleMovementControls(hardware, mount, mount, mode_switch_callback, *mount)
+        CallbackFuncT&& mode_switch_callback = [](typename MOUNT_T::mount_status_t const&) {})
+        : MccSimpleMovementControls(hardware, mount, mount, mode_switch_callback, mount)
     {
     }