diff --git a/APMrover2/wscript b/APMrover2/wscript
index a08a68894f..a8c4aefefb 100644
--- a/APMrover2/wscript
+++ b/APMrover2/wscript
@@ -5,8 +5,8 @@ def build(bld):
     vehicle = bld.path.name
     bld.ap_stlib(
         name=vehicle + '_libs',
-        vehicle=vehicle,
-        libraries=bld.ap_common_vehicle_libraries() + [
+        ap_vehicle=vehicle,
+        ap_libraries=bld.ap_common_vehicle_libraries() + [
             'APM_Control',
             'AP_Arming',
             'AP_Camera',
diff --git a/AntennaTracker/wscript b/AntennaTracker/wscript
index 1db0b23acc..aa403b3e12 100644
--- a/AntennaTracker/wscript
+++ b/AntennaTracker/wscript
@@ -5,8 +5,8 @@ def build(bld):
     vehicle = bld.path.name
     bld.ap_stlib(
         name=vehicle + '_libs',
-        vehicle=vehicle,
-        libraries=bld.ap_common_vehicle_libraries() + [
+        ap_vehicle=vehicle,
+        ap_libraries=bld.ap_common_vehicle_libraries() + [
             'AC_PID',
         ],
         use='mavlink',
diff --git a/ArduCopter/wscript b/ArduCopter/wscript
index 2b7f39dccc..f8c218803d 100644
--- a/ArduCopter/wscript
+++ b/ArduCopter/wscript
@@ -5,8 +5,8 @@ def build(bld):
     vehicle = bld.path.name
     bld.ap_stlib(
         name=vehicle + '_libs',
-        vehicle=vehicle,
-        libraries=bld.ap_common_vehicle_libraries() + [
+        ap_vehicle=vehicle,
+        ap_libraries=bld.ap_common_vehicle_libraries() + [
             'AP_ADSB',
             'AC_AttitudeControl',
             'AC_InputManager',
diff --git a/ArduPlane/wscript b/ArduPlane/wscript
index 038ce8a6b4..9480a089a2 100644
--- a/ArduPlane/wscript
+++ b/ArduPlane/wscript
@@ -5,8 +5,8 @@ def build(bld):
     vehicle = bld.path.name
     bld.ap_stlib(
         name=vehicle + '_libs',
-        vehicle=vehicle,
-        libraries=bld.ap_common_vehicle_libraries() + [
+        ap_vehicle=vehicle,
+        ap_libraries=bld.ap_common_vehicle_libraries() + [
             'APM_Control',
             'APM_OBC',
             'AP_ADSB',
diff --git a/Tools/Replay/wscript b/Tools/Replay/wscript
index 520ff2aeea..e0bee5c961 100644
--- a/Tools/Replay/wscript
+++ b/Tools/Replay/wscript
@@ -11,8 +11,8 @@ def build(bld):
 
     bld.ap_stlib(
         name=vehicle + '_libs',
-        vehicle=vehicle,
-        libraries=bld.ap_common_vehicle_libraries() + [
+        ap_vehicle=vehicle,
+        ap_libraries=bld.ap_common_vehicle_libraries() + [
             'AP_InertialNav',
         ],
         use='mavlink',
diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index 4313ba9b98..5d321d0967 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -166,13 +166,13 @@ def unique_list(items):
 def ap_stlib(bld, **kw):
     if 'name' not in kw:
         bld.fatal('Missing name for ap_stlib')
-    if 'vehicle' not in kw:
-        bld.fatal('Missing vehicle for ap_stlib')
-    if 'libraries' not in kw:
-        bld.fatal('Missing libraries for ap_stlib')
+    if 'ap_vehicle' not in kw:
+        bld.fatal('Missing ap_vehicle for ap_stlib')
+    if 'ap_libraries' not in kw:
+        bld.fatal('Missing ap_libraries for ap_stlib')
 
     sources = []
-    libraries = unique_list(kw['libraries'] + bld.env.AP_LIBRARIES)
+    libraries = unique_list(kw['ap_libraries'] + bld.env.AP_LIBRARIES)
 
     for lib_name in libraries:
         lib_node = bld.srcnode.find_dir('libraries/' + lib_name)
@@ -185,7 +185,7 @@ def ap_stlib(bld, **kw):
     kw['features'] = kw.get('features', []) + bld.env.AP_STLIB_FEATURES
     kw['source'] = sources
     kw['target'] = kw['name']
-    kw['defines'] = _get_legacy_defines(kw['vehicle'])
+    kw['defines'] = _get_legacy_defines(kw['ap_vehicle'])
     kw['idx'] = _get_next_idx()
 
     bld.stlib(**kw)
diff --git a/wscript b/wscript
index d9c23e742a..3edf2144cc 100644
--- a/wscript
+++ b/wscript
@@ -263,8 +263,8 @@ def _build_common_taskgens(bld):
     # split into smaller pieces with well defined boundaries.
     bld.ap_stlib(
         name='ap',
-        vehicle='UNKNOWN',
-        libraries=bld.ap_get_all_libraries(),
+        ap_vehicle='UNKNOWN',
+        ap_libraries=bld.ap_get_all_libraries(),
         use='mavlink',
     )