diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
index b9b74112740059407b71064c995bb98fe73a09fc..e72e6c562c56a24d3a0cf3ba1b02ccb04e112034 100644
--- a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
+++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
@@ -34,15 +34,15 @@ SetupPage {
 
             QGCPalette { id: ggcPal; colorGroupEnabled: true }
 
-            property Fact _failsafeGCSEnable:   controller.getParameterFact(-1, "FS_GCS_ENABLE")
-            property Fact _failsafeLeakEnable:  controller.getParameterFact(-1, "FS_LEAK_ENABLE")
+            property Fact _failsafeGCSEnable:      controller.getParameterFact(-1, "FS_GCS_ENABLE")
+            property Fact _failsafeLeakEnable:     controller.getParameterFact(-1, "FS_LEAK_ENABLE")
             property Fact _failsafePressureEnable: controller.getParameterFact(-1, "FS_PRESS_ENABLE")
             property Fact _failsafePressureValue:  controller.getParameterFact(-1, "FS_PRESS_MAX")
-            property Fact _failsafeTempEnable:  controller.getParameterFact(-1, "FS_TEMP_ENABLE")
-            property Fact _failsafeTempValue:   controller.getParameterFact(-1, "FS_TEMP_MAX")
+            property Fact _failsafeTempEnable:     controller.getParameterFact(-1, "FS_TEMP_ENABLE")
+            property Fact _failsafeTempValue:      controller.getParameterFact(-1, "FS_TEMP_MAX")
 
             property Fact _fenceAction: controller.getParameterFact(-1, "FENCE_ACTION")
-            property Fact _fenceAltMax: controller.getParameterFact(-1, "FENCE_ALT_MAX")
+            property Fact _fenceAltMax: controller.getParameterFact(-1, "r.FENCE_ALT_MIN")
             property Fact _fenceEnable: controller.getParameterFact(-1, "FENCE_ENABLE")
             property Fact _fenceMargin: controller.getParameterFact(-1, "FENCE_MARGIN")
             property Fact _fenceType:   controller.getParameterFact(-1, "FENCE_TYPE")
diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
index 1dfa4fdf58659db0f3e219971a66838c88fa1303..d71b7aebf7897b020c61306a01ce9f059c268c24 100644
--- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
@@ -62,6 +62,8 @@ ArduSubFirmwarePlugin::ArduSubFirmwarePlugin(void)
         remapV3_5["SERVO13_FUNCTION"] = QStringLiteral("RC13_FUNCTION");
         remapV3_5["SERVO14_FUNCTION"] = QStringLiteral("RC14_FUNCTION");
 
+        remapV3_5["FENCE_ALT_MIN"] = QStringLiteral("FENCE_DEPTH_MAX");
+
         _remapParamNameIntialized = true;
     }
 }