diff --git a/conf/airframes/booz2_a1.xml b/conf/airframes/booz2_a1.xml
index 4d08c97880..2aa3c8688f 100644
--- a/conf/airframes/booz2_a1.xml
+++ b/conf/airframes/booz2_a1.xml
@@ -3,8 +3,8 @@
   <servos min="0" neutral="0" max="0xff">
     <servo name="FRONT" no="0" min="0" neutral="0" max="255"/>
     <servo name="BACK"  no="1" min="0" neutral="0" max="255"/>
-    <servo name="RIGHT" no="3" min="0" neutral="0" max="255"/>
-    <servo name="LEFT"  no="2" min="0" neutral="0" max="255"/>
+    <servo name="RIGHT" no="2" min="0" neutral="0" max="255"/>
+    <servo name="LEFT"  no="3" min="0" neutral="0" max="255"/>
   </servos>
 
   <commands>
@@ -15,7 +15,7 @@
   </commands>
 
   <section name="BUSS_BLMC" prefix="BUSS_BLMC_">
-    <define name="ADDR" value="{ 0x52, 0x54, 0x58, 0x56 }"/>
+    <define name="ADDR" value="{ 0x52, 0x54, 0x56, 0x58 }"/>
   </section>
 
   <section name="SUPERVISION" prefix="SUPERVISION_">
diff --git a/conf/airframes/booz2_a2.xml b/conf/airframes/booz2_a2.xml
index 41c2a61e19..a57176250d 100644
--- a/conf/airframes/booz2_a2.xml
+++ b/conf/airframes/booz2_a2.xml
@@ -3,8 +3,8 @@
   <servos min="0" neutral="0" max="0xff">
     <servo name="PITCH" no="0" min="0" neutral="0" max="255"/>
     <servo name="ROLL"  no="1" min="0" neutral="0" max="255"/>
-    <servo name="YAW"   no="3" min="0" neutral="0" max="255"/>
-    <servo name="POWER" no="2" min="0" neutral="0" max="255"/>
+    <servo name="YAW"   no="2" min="0" neutral="0" max="255"/>
+    <servo name="POWER" no="3" min="0" neutral="0" max="255"/>
   </servos>
 
   <commands>
diff --git a/conf/airframes/booz2_j1.xml b/conf/airframes/booz2_j1.xml
index 9b7866fe49..8ae56b7046 100644
--- a/conf/airframes/booz2_j1.xml
+++ b/conf/airframes/booz2_j1.xml
@@ -3,8 +3,8 @@
   <servos min="0" neutral="0" max="0xff">
     <servo name="FRONT" no="0" min="0" neutral="0" max="255"/>
     <servo name="BACK"  no="1" min="0" neutral="0" max="255"/>
-    <servo name="RIGHT" no="3" min="0" neutral="0" max="255"/>
-    <servo name="LEFT"  no="2" min="0" neutral="0" max="255"/>
+    <servo name="RIGHT" no="2" min="0" neutral="0" max="255"/>
+    <servo name="LEFT"  no="3" min="0" neutral="0" max="255"/>
   </servos>
 
   <commands>
@@ -15,7 +15,7 @@
   </commands>
 
   <section name="BUSS_BLMC" prefix="BUSS_BLMC_">
-    <define name="ADDR" value="{ 0x52, 0x54, 0x58, 0x56 }"/>
+    <define name="ADDR" value="{ 0x52, 0x54, 0x56, 0x58 }"/>
   </section>
 
   <section name="SUPERVISION" prefix="SUPERVISION_">