diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp
index 63e08de810..8f5438a94f 100644
--- a/ArduSub/Parameters.cpp
+++ b/ArduSub/Parameters.cpp
@@ -651,7 +651,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
     // @Path: ../libraries/RC_Channel/RC_Channels_VarInfo.h
     AP_SUBGROUPINFO(rc_channels, "RC", 17, ParametersG2, RC_Channels),
 
-#if ENABLE_SCRIPTING
+#if AP_SCRIPTING_ENABLED
     // @Group: SCR_
     // @Path: ../libraries/AP_Scripting/AP_Scripting.cpp
     AP_SUBGROUPINFO(scripting, "SCR_", 18, ParametersG2, AP_Scripting),
diff --git a/ArduSub/Parameters.h b/ArduSub/Parameters.h
index c3c45605dc..2794ce75d9 100644
--- a/ArduSub/Parameters.h
+++ b/ArduSub/Parameters.h
@@ -4,7 +4,7 @@
 
 #include <AP_Gripper/AP_Gripper.h>
 
-#if ENABLE_SCRIPTING
+#if AP_SCRIPTING_ENABLED
 #include <AP_Scripting/AP_Scripting.h>
 #endif
 
@@ -335,9 +335,9 @@ public:
     // control over servo output ranges
     SRV_Channels servo_channels;
 
-#if ENABLE_SCRIPTING
+#if AP_SCRIPTING_ENABLED
     AP_Scripting scripting;
-#endif // ENABLE_SCRIPTING
+#endif // AP_SCRIPTING_ENABLED
 
     // Airspeed
     AP_Airspeed airspeed;
diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h
index b0af035214..64d6017d1f 100644
--- a/ArduSub/Sub.h
+++ b/ArduSub/Sub.h
@@ -106,7 +106,7 @@
 #include <AP_Camera/AP_Camera.h>          // Photo or video camera
 #endif
 
-#if ENABLE_SCRIPTING
+#if AP_SCRIPTING_ENABLED
 #include <AP_Scripting/AP_Scripting.h>
 #endif
 
diff --git a/ArduSub/system.cpp b/ArduSub/system.cpp
index e6a85610fa..93d6bea262 100644
--- a/ArduSub/system.cpp
+++ b/ArduSub/system.cpp
@@ -151,9 +151,9 @@ void Sub::init_ardupilot()
 
     startup_INS_ground();
 
-#if ENABLE_SCRIPTING
+#if AP_SCRIPTING_ENABLED
     g2.scripting.init();
-#endif // ENABLE_SCRIPTING
+#endif // AP_SCRIPTING_ENABLED
 
     g2.airspeed.init();