diff --git a/Aircraft-yasim/747.xml b/Aircraft-yasim/747.xml
index f90899be0..4061d9dbe 100644
--- a/Aircraft-yasim/747.xml
+++ b/Aircraft-yasim/747.xml
@@ -2,19 +2,19 @@
 
 <!-- Approach configuration -->
 <approach speed="136" aoa="7">
-  <control-setting axis="/controls/throttle[0]" value="0.2"/>
-  <control-setting axis="/controls/throttle[1]" value="0.2"/>
-  <control-setting axis="/controls/flaps" value="1.0"/>
-  <control-setting axis="/controls/slats" value="1.0"/>
-  <control-setting axis="/controls/gear-down" value="1"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.2"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="0.2"/>
+  <control-setting axis="/controls/flight/flaps" value="1.0"/>
+  <control-setting axis="/controls/flight/slats" value="1.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="1"/>
 </approach>
 
 <!-- Cruise configuration -->
 <cruise speed="490" alt="36000">
-  <control-setting axis="/controls/throttle[0]" value="0.75"/>
-  <control-setting axis="/controls/throttle[1]" value="0.75"/>
-  <control-setting axis="/controls/flaps" value="0.0"/>
-  <control-setting axis="/controls/gear-down" value="0"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.75"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="0.75"/>
+  <control-setting axis="/controls/flight/flaps" value="0.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="0"/>
 </cruise>
 
 <cockpit x="19.08" y="1.81" z="15.06"/>
@@ -29,11 +29,11 @@
   <flap1 start=".64" end=".88" lift="1.3" drag="1.2"/>
   <slat start="0" end="1" aoa="2" drag="1.1"/>
   <spoiler start="0.2" end="0.6" lift="0.3" drag="2.0"/>
-  <control-input axis="/controls/flaps" control="FLAP0"/>
-  <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
-  <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
-  <control-input axis="/controls/slats" control="SLAT"/>
-  <control-input axis="/controls/spoilers" control="SPOILER"/>
+  <control-input axis="/controls/flight/flaps" control="FLAP0"/>
+  <control-input axis="/controls/flight/aileron" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/aileron-trim" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/slats" control="SLAT"/>
+  <control-input axis="/controls/flight/spoilers" control="SPOILER"/>
   <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
   <control-output control="FLAP1" side="left"
 		  prop="/surface-positions/left-aileron-pos-norm"/>
@@ -46,8 +46,8 @@
        sweep="28" dihedral="7" camber="-0.1" effectiveness="2.3">
   <stall aoa="15" width="2" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.6" drag="1.2"/>
-  <control-input axis="/controls/elevator" control="FLAP0"/>
-  <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
@@ -55,8 +55,8 @@
        sweep="33">
   <stall aoa="15" width="2" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.2" drag="1.3"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
-  <control-input axis="/controls/rudder-trim" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder-trim" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"
 		  min="1" max="-1"/>
 </vstab>
@@ -65,54 +65,54 @@
 <!-- degrees C.  Corrected to YASim's standard atmosphere temperature -->
 <!-- of 288.2 kelvins, that gives 63737 lbs of nominal thrust. -->
 <jet x="-10.43" y="16.26"  z="-1.20" mass="8000" thrust="63737">
-  <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[0]/throttle" control="THROTTLE"/>
 </jet>
 
 <jet x="-2" y="12.65"  z="-2.41" mass="8000" thrust="63737">
-  <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[0]/throttle" control="THROTTLE"/>
 </jet>
 
 <jet x="-2" y="-12.65" z="-2.41" mass="8000" thrust="63737">
-  <control-input axis="/controls/throttle[1]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[1]/throttle" control="THROTTLE"/>
 </jet>
 
 <jet x="-10.43" y="-16.26" z="-1.20" mass="8000" thrust="63737">
-  <control-input axis="/controls/throttle[1]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[1]/throttle" control="THROTTLE"/>
 </jet>
  
 <!-- nose -->
 <gear x="19.08"  y="0.00" z="-5.42"
       compression="0.75" spring="0.7" damp="4">
-  <control-input axis="/controls/rudder" control="STEER" square="true"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/flight/rudder" control="STEER" square="true"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-4.65" y="5.42" z="-5.42" compression="1.1"> <!-- fwd left main -->
-  <control-input axis="/controls/brakes[0]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-6.82" y="1.81" z="-5.42" compression="1.1"> <!-- rear left main -->
-  <control-input axis="/controls/brakes[0]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[2]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-6.82" y="-1.81" z="-5.42" compression="1.1"> <!-- rear right main -->
-  <control-input axis="/controls/brakes[1]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[1]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[3]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
 <gear x="-4.65" y="-5.42" z="-5.42" compression="1.1"> <!-- fwd right main -->
-  <control-input axis="/controls/brakes[1]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[1]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[4]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
diff --git a/Aircraft-yasim/README.yasim b/Aircraft-yasim/README.yasim
index e342aa704..8fc2bc580 100644
--- a/Aircraft-yasim/README.yasim
+++ b/Aircraft-yasim/README.yasim
@@ -289,7 +289,7 @@ control:  This element, which can appear in two different contexts,
           translate and truncate the values.  On its way, I promise.
 
           axis:  The name of the double-valued fgfs property "axis" to
-                 use as input, such as "/controls/aileron".
+                 use as input, such as "/controls/flight/aileron".
           output: Which property to set on the objects.  It can have
                   the following values:
                   THROTTLE - The throttle on a jet or propeller.
diff --git a/Aircraft-yasim/a10cl-yasim.xml b/Aircraft-yasim/a10cl-yasim.xml
index 141ee9b6f..9168a8e8a 100644
--- a/Aircraft-yasim/a10cl-yasim.xml
+++ b/Aircraft-yasim/a10cl-yasim.xml
@@ -9,18 +9,18 @@
 
 <!-- Approach configuration -->
 <approach speed="110" aoa="8">
-  <control-setting axis="/controls/throttle[0]" value="0.5"/>
-  <control-setting axis="/controls/throttle[1]" value="0.5"/>
-  <control-setting axis="/controls/flaps" value="1.0"/>
-  <control-setting axis="/controls/gear-down" value="1"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.5"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="0.5"/>
+  <control-setting axis="/controls/flight/flaps" value="1.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="1"/>
 </approach>
 
 <!-- Cruise configuration -->
 <cruise speed="380" alt="0">
-  <control-setting axis="/controls/throttle[0]" value="1.0"/>
-  <control-setting axis="/controls/throttle[1]" value="1.0"/>
-  <control-setting axis="/controls/flaps" value="0.0"/>
-  <control-setting axis="/controls/gear-down" value="0"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="1.0"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="1.0"/>
+  <control-setting axis="/controls/flight/flaps" value="0.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="0"/>
 </cruise>
 
 <cockpit x="-3.5" y="0.0" z="1.2"/>
@@ -43,10 +43,10 @@
   <flap1 start="0.54" end="0.86" lift="1.3" drag="1.2"/>
   <spoiler start="0.54" end="0.86" lift="0.1" drag="20.0"/>
 
-  <control-input axis="/controls/flaps" control="FLAP0"/>
-  <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
-  <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
-  <control-input axis="/controls/spoilers" control="SPOILER"/>
+  <control-input axis="/controls/flight/flaps" control="FLAP0"/>
+  <control-input axis="/controls/flight/aileron" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/aileron-trim" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/spoilers" control="SPOILER"/>
 
   <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
   <control-output control="FLAP1" side="left"
@@ -67,8 +67,8 @@
        length="2.5" chord="2" sweep="0.0" dihedral="0.0" camber="0">
   <stall aoa="18" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.5" drag="1.2"/>
-  <control-input axis="/controls/elevator" control="FLAP0"/>
-  <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator" control="FLAP0"/>
+  <control-input axis="/controls/light/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
@@ -76,7 +76,7 @@
        length="2.8" chord="2.0" sweep="0.0">
   <stall aoa="16" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.3" drag="1.3"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
 </vstab>
 
@@ -84,17 +84,17 @@
        length="2.8" chord="2.0" sweep="0.0">
   <stall aoa="16" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.3" drag="1.3"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
 </vstab>
 
 <!-- Engines and tanks -->
 <jet x="-11.8" y="-1.5" z="1.0" mass="1000" thrust="9065">
-  <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[0]/throttle" control="THROTTLE"/>
 </jet>
 
 <jet x="-11.8" y="1.5" z="1.0" mass="1000" thrust="9065">
-  <control-input axis="/controls/throttle[1]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[1]/throttle" control="THROTTLE"/>
 </jet>
 
 <tank x="-8.5" y="-1.5" z="0.0" jet="true" capacity="2000"/>
@@ -104,31 +104,31 @@
 <!-- Undercarriage -->
 <!-- nose -->
 <gear x="-2.9" y="0.4" z="-2.8" retract-time="7" compression="0.7">
-  <control-input axis="/controls/rudder" control="STEER" square="true"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/flight/rudder" control="STEER" square="true"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
 </gear>
 
 <!-- left main -->
 <gear x="-9.0" y="2.5" z="-2.8" retract-time="7" compression="0.6">
-  <control-input axis="/controls/brakes[0]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
 </gear>
 
 <!-- right main -->
 <gear x="-9.0" y="-2.5" z="-2.8" retract-time="7" compression="0.6">
-  <control-input axis="/controls/brakes[1]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[1]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
 </gear>
 
 <!-- Canopy -->
 <gear x="-2.6" y="0.0" z="1.4" retract-time="7" compression="0.6">
-  <control-input axis="/controls/parking-brake" control="EXTEND"/>
+  <control-input axis="/controls/gear/parking-brake" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="5"/>
   <control-output control="EXTEND" prop="/canopy/position-norm"/>
 </gear>
diff --git a/Aircraft-yasim/a10fl-yasim.xml b/Aircraft-yasim/a10fl-yasim.xml
index e233c7432..172f8a2f4 100755
--- a/Aircraft-yasim/a10fl-yasim.xml
+++ b/Aircraft-yasim/a10fl-yasim.xml
@@ -9,18 +9,18 @@
 
 <!-- Approach configuration -->
 <approach speed="110" aoa="8">
-  <control-setting axis="/controls/throttle[0]" value="0.5"/>
-  <control-setting axis="/controls/throttle[1]" value="0.5"/>
-  <control-setting axis="/controls/flaps" value="1.0"/>
-  <control-setting axis="/controls/gear-down" value="1"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.5"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="0.5"/>
+  <control-setting axis="/controls/flight/flaps" value="1.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="1"/>
 </approach>
 
 <!-- Cruise configuration -->
 <cruise speed="380" alt="0">
-  <control-setting axis="/controls/throttle[0]" value="1.0"/>
-  <control-setting axis="/controls/throttle[1]" value="1.0"/>
-  <control-setting axis="/controls/flaps" value="0.0"/>
-  <control-setting axis="/controls/gear-down" value="0"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="1.0"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="1.0"/>
+  <control-setting axis="/controls/flight/flaps" value="0.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="0"/>
 </cruise>
 
 <cockpit x="4.5" y="0.0" z="1.2"/>
@@ -43,10 +43,10 @@
   <flap1 start="0.54" end="0.86" lift="1.3" drag="1.2"/>
   <spoiler start="0.54" end="0.86" lift="0.1" drag="20.0"/>
 
-  <control-input axis="/controls/flaps" control="FLAP0"/>
-  <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
-  <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
-  <control-input axis="/controls/spoilers" control="SPOILER"/>
+  <control-input axis="/controls/flight/flaps" control="FLAP0"/>
+  <control-input axis="/controls/flight/aileron" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/aileron-trim" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/spoilers" control="SPOILER"/>
 
   <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
   <control-output control="FLAP1" side="left"
@@ -67,8 +67,8 @@
        length="2.5" chord="2" sweep="0.0" dihedral="0.0" camber="0">
   <stall aoa="18" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.5" drag="1.2"/>
-  <control-input axis="/controls/elevator" control="FLAP0"/>
-  <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
@@ -76,7 +76,7 @@
        length="2.8" chord="2.0" sweep="0.0">
   <stall aoa="16" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.3" drag="1.3"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
 </vstab>
 
@@ -84,17 +84,17 @@
        length="2.8" chord="2.0" sweep="0.0">
   <stall aoa="16" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.3" drag="1.3"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
 </vstab>
 
 <!-- Engines and tanks -->
 <jet x="-3.8" y="-1.5" z="1.0" mass="1000" thrust="9065">
-  <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[0]/throttle" control="THROTTLE"/>
 </jet>
 
 <jet x="-3.8" y="1.5" z="1.0" mass="1000" thrust="9065">
-  <control-input axis="/controls/throttle[1]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[1]/throttle" control="THROTTLE"/>
 </jet>
 
 <tank x="-0.5" y="-1.5" z="0.0" jet="true" capacity="2000"/>
@@ -108,31 +108,31 @@
 <!-- Undercarriage -->
 <!-- nose -->
 <gear x="5.1" y="0.4" z="-2.8" retract-time="7" compression="0.7">
-  <control-input axis="/controls/rudder" control="STEER" square="true"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/flight/rudder" control="STEER" square="true"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
 </gear>
 
 <!-- left main -->
 <gear x="-1.0" y="2.5" z="-2.8" retract-time="7" compression="0.6">
-  <control-input axis="/controls/brakes[0]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
 </gear>
 
 <!-- right main -->
 <gear x="-1.0" y="-2.5" z="-2.8" retract-time="7" compression="0.6">
-  <control-input axis="/controls/brakes[1]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[1]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
 </gear>
 
 <!-- Canopy -->
 <gear x="5.4" y="0.0" z="1.4" retract-time="7" compression="0.6">
-  <control-input axis="/controls/parking-brake" control="EXTEND"/>
+  <control-input axis="/controls/gear/parking-brake" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="5"/>
   <control-output control="EXTEND" prop="/canopy/position-norm"/>
 </gear>
diff --git a/Aircraft-yasim/a10wl-yasim.xml b/Aircraft-yasim/a10wl-yasim.xml
index 62c3ad7f9..4a3220159 100644
--- a/Aircraft-yasim/a10wl-yasim.xml
+++ b/Aircraft-yasim/a10wl-yasim.xml
@@ -9,18 +9,18 @@
 
 <!-- Approach configuration -->
 <approach speed="110" aoa="8">
-  <control-setting axis="/controls/throttle[0]" value="0.5"/>
-  <control-setting axis="/controls/throttle[1]" value="0.5"/>
-  <control-setting axis="/controls/flaps" value="1.0"/>
-  <control-setting axis="/controls/gear-down" value="1"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.5"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="0.5"/>
+  <control-setting axis="/controls/flight/flaps" value="1.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="1"/>
 </approach>
 
 <!-- Cruise configuration -->
 <cruise speed="380" alt="0">
-  <control-setting axis="/controls/throttle[0]" value="1.0"/>
-  <control-setting axis="/controls/throttle[1]" value="1.0"/>
-  <control-setting axis="/controls/flaps" value="0.0"/>
-  <control-setting axis="/controls/gear-down" value="0"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="1.0"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="1.0"/>
+  <control-setting axis="/controls/flight/flaps" value="0.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="0"/>
 </cruise>
 
 <cockpit x="-3.5" y="0.0" z="1.2"/>
@@ -43,10 +43,10 @@
   <flap1 start="0.54" end="0.86" lift="1.3" drag="1.2"/>
   <spoiler start="0.54" end="0.86" lift="0.1" drag="20.0"/>
 
-  <control-input axis="/controls/flaps" control="FLAP0"/>
-  <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
-  <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
-  <control-input axis="/controls/spoilers" control="SPOILER"/>
+  <control-input axis="/controls/flight/flaps" control="FLAP0"/>
+  <control-input axis="/controls/flight/aileron" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/aileron-trim" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/spoilers" control="SPOILER"/>
 
   <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
   <control-output control="FLAP1" side="left"
@@ -67,8 +67,8 @@
        length="2.5" chord="2" sweep="0.0" dihedral="0.0" camber="0">
   <stall aoa="18" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.5" drag="1.2"/>
-  <control-input axis="/controls/elevator" control="FLAP0"/>
-  <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
@@ -76,7 +76,7 @@
        length="2.8" chord="2.0" sweep="0.0">
   <stall aoa="16" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.3" drag="1.3"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
 </vstab>
 
@@ -84,17 +84,17 @@
        length="2.8" chord="2.0" sweep="0.0">
   <stall aoa="16" width="5" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.3" drag="1.3"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
 </vstab>
 
 <!-- Engines and tanks -->
 <jet x="-11.8" y="-1.5" z="1.0" mass="1000" thrust="9065">
-  <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[0]/throttle" control="THROTTLE"/>
 </jet>
 
 <jet x="-11.8" y="1.5" z="1.0" mass="1000" thrust="9065">
-  <control-input axis="/controls/throttle[1]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[1]/throttle" control="THROTTLE"/>
 </jet>
 
 <tank x="-8.5" y="-1.5" z="0.0" jet="true" capacity="2000"/>
@@ -104,31 +104,31 @@
 <!-- Undercarriage -->
 <!-- nose -->
 <gear x="-2.9" y="0.4" z="-2.8" retract-time="7" compression="0.8">
-  <control-input axis="/controls/rudder" control="STEER" square="true"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/flight/rudder" control="STEER" square="true"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
 </gear>
 
 <!-- left main -->
 <gear x="-9.0" y="2.5" z="-2.8" retract-time="7" compression="0.6">
-  <control-input axis="/controls/brakes[0]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
 </gear>
 
 <!-- right main -->
 <gear x="-9.0" y="-2.5" z="-2.8" retract-time="7" compression="0.6">
-  <control-input axis="/controls/brakes[1]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[1]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
 </gear>
 
 <!-- Canopy -->
 <gear x="-2.6" y="0.0" z="1.4" retract-time="7" compression="0.6">
-  <control-input axis="/controls/parking-brake" control="EXTEND"/>
+  <control-input axis="/controls/gear/parking-brake" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="5"/>
   <control-output control="EXTEND" prop="/canopy/position-norm"/>
 </gear>
diff --git a/Aircraft-yasim/a4.xml b/Aircraft-yasim/a4.xml
index 4735b1f87..ba43199f1 100644
--- a/Aircraft-yasim/a4.xml
+++ b/Aircraft-yasim/a4.xml
@@ -2,16 +2,16 @@
 
 <!-- Approach configuration -->
 <approach speed="130" aoa="13.5">
-  <control-setting axis="/controls/throttle[0]" value="0.2"/>
-  <control-setting axis="/controls/flaps" value="1.0"/>
-  <control-setting axis="/controls/gear-down" value="1"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.2"/>
+  <control-setting axis="/controls/flight/flaps" value="1.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="1"/>
 </approach>
 
 <!-- Cruise configuration.  This number is for an A-4F (595mph/FL340) -->
 <cruise speed="585" alt="34000">
-  <control-setting axis="/controls/throttle[0]" value="0.8"/>
-  <control-setting axis="/controls/flaps" value="0.0"/>
-  <control-setting axis="/controls/gear-down" value="0"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.8"/>
+  <control-setting axis="/controls/flight/flaps" value="0.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="0"/>
 </cruise>
 
 <cockpit x="2.71" y="0.0" z="0.67"/>
@@ -24,9 +24,9 @@
   <stall aoa="27" width="10" peak="1.3"/>
   <flap0 start="0.0" end="0.5" lift="1.3" drag="1.2"/>
   <flap1 start="0.5" end="1.0" lift="1.2" drag="1.2"/>
-  <control-input axis="/controls/flaps" control="FLAP0"/>
-  <control-input axis="/controls/aileron" control="FLAP1" split="true"/> 
-  <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/> 
+  <control-input axis="/controls/flight/flaps" control="FLAP0"/>
+  <control-input axis="/controls/flight/aileron" control="FLAP1" split="true"/> 
+  <control-input axis="/controls/flight/aileron-trim" control="FLAP1" split="true"/> 
   <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
   <control-output control="FLAP1" side="left"
 		  prop="/surface-positions/left-aileron-pos-norm"/>
@@ -39,8 +39,8 @@
        length="2.02" chord="2.02" sweep="26">
   <stall aoa="27" width="10" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.6" drag="1.2"/>
-  <control-input axis="/controls/elevator" control="FLAP0"/>
-  <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
@@ -48,8 +48,8 @@
        length="2.57" chord="3.11" sweep="28" effectiveness="1.5">
   <stall aoa="27" width="10" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.15" drag="1.2"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
-  <control-input axis="/controls/rudder-trim" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder-trim" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"
 		  min="1" max="-1"/>
 </vstab>
@@ -57,14 +57,14 @@
 <!-- P&W J52-P-6A turbojet, 8500 lbs sea level thrust -->
 <jet x="0.61" y="0" z="0.11" mass="1800" thrust="8500" n1-max="106"
      exhaust-speed="2000">
-  <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[0]/throttle" control="THROTTLE"/>
 </jet>
 
 <!-- nose -->
 <gear x="3.32" y="0" z="-2.26" retract-time="7" compression=".96">
-  <control-input axis="/controls/rudder" control="STEER" square="true"
+  <control-input axis="/controls/flight/rudder" control="STEER" square="true"
                  src0="-1" src1="1" dst0="-0.9" dst1="0.9"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
@@ -72,8 +72,8 @@
 <!-- left main -->
 <gear x="-1.39" y="1.19" z="-1.89" retract-time="7" compression=".78"
       damp="2">
-  <control-input axis="/controls/brakes[0]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-speed control="BRAKE" transition-time="2"/>
@@ -82,8 +82,8 @@
 <!-- right main -->
 <gear x="-1.39" y="-1.19" z="-1.89" retract-time="7" compression=".78"
       damp="2">
-  <control-input axis="/controls/brakes[1]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[1]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[2]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-speed control="BRAKE" transition-time="2"/>
@@ -117,4 +117,4 @@
 <weight x="-1.39" y="-3" z="-1.33" size="1" 
         mass-prop="/yasim/a4/weights/right-outboard-lbs"/>
 
-</airplane>
\ No newline at end of file
+</airplane>
diff --git a/Aircraft-yasim/b52-yasim.xml b/Aircraft-yasim/b52-yasim.xml
index 2b069cab4..fb56c0ffa 100755
--- a/Aircraft-yasim/b52-yasim.xml
+++ b/Aircraft-yasim/b52-yasim.xml
@@ -34,16 +34,16 @@ Lee Elliott. leee-fgfs@spatial.freeserve.co.uk
 
 <!-- Approach configuration -->
  <approach speed="100" aoa="0.5">
-  <control-setting axis="/controls/throttle[0]" value="0.1"/>
-  <control-setting axis="/controls/throttle[1]" value="0.1"/>
-  <control-setting axis="/controls/throttle[2]" value="0.1"/>
-  <control-setting axis="/controls/throttle[3]" value="0.1"/>
-  <control-setting axis="/controls/throttle[4]" value="0.1"/>
-  <control-setting axis="/controls/throttle[5]" value="0.1"/>
-  <control-setting axis="/controls/throttle[6]" value="0.1"/>
-  <control-setting axis="/controls/throttle[7]" value="0.1"/>
-  <control-setting axis="/controls/flaps" value="1.0"/>
-  <control-setting axis="/controls/gear-down" value="1"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.1"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="0.1"/>
+  <control-setting axis="/controls/engines/engine[2]/throttle" value="0.1"/>
+  <control-setting axis="/controls/engines/engine[3]/throttle" value="0.1"/>
+  <control-setting axis="/controls/engines/engine[4]/throttle" value="0.1"/>
+  <control-setting axis="/controls/engines/engine[5]/throttle" value="0.1"/>
+  <control-setting axis="/controls/engines/engine[6]/throttle" value="0.1"/>
+  <control-setting axis="/controls/engines/engine[7]/throttle" value="0.1"/>
+  <control-setting axis="/controls/flight/flaps" value="1.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="1"/>
  </approach>
 
 <!-- Cruise configuration -->
@@ -58,16 +58,16 @@ Lee Elliott. leee-fgfs@spatial.freeserve.co.uk
      at which a normal b52 would have disintegrated due to flutter.
 -->
  <cruise speed="554" alt="21000">
-  <control-setting axis="/controls/throttle[0]" value="0.6"/>
-  <control-setting axis="/controls/throttle[1]" value="0.6"/>
-  <control-setting axis="/controls/throttle[2]" value="0.6"/>
-  <control-setting axis="/controls/throttle[3]" value="0.6"/>
-  <control-setting axis="/controls/throttle[4]" value="0.6"/>
-  <control-setting axis="/controls/throttle[5]" value="0.6"/>
-  <control-setting axis="/controls/throttle[6]" value="0.6"/>
-  <control-setting axis="/controls/throttle[7]" value="0.6"/>
-  <control-setting axis="/controls/flaps" value="0.0"/>
-  <control-setting axis="/controls/gear-down" value="0"/>
+  <control-setting axis="/controls/engines/engine[0]/throttle" value="0.6"/>
+  <control-setting axis="/controls/engines/engine[1]/throttle" value="0.6"/>
+  <control-setting axis="/controls/engines/engine[2]/throttle" value="0.6"/>
+  <control-setting axis="/controls/engines/engine[3]/throttle" value="0.6"/>
+  <control-setting axis="/controls/engines/engine[4]/throttle" value="0.6"/>
+  <control-setting axis="/controls/engines/engine[5]/throttle" value="0.6"/>
+  <control-setting axis="/controls/engines/engine[6]/throttle" value="0.6"/>
+  <control-setting axis="/controls/engines/engine[7]/throttle" value="0.6"/>
+  <control-setting axis="/controls/flight/flaps" value="0.0"/>
+  <control-setting axis="/controls/gear/gear-down" value="0"/>
  </cruise>
 
  <cockpit x="-2.2" y="0.0" z="2.0"/>
@@ -94,9 +94,9 @@ Lee Elliott. leee-fgfs@spatial.freeserve.co.uk
   <flap1 start="0.7" end="0.78" lift="1.3" drag="1.2"/>
   <spoiler start="0.5" end="0.75" lift="0.0" drag="20.0"/>
 
-  <control-input axis="/controls/flaps" control="FLAP0"/>
-  <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
-  <control-input axis="/controls/spoilers" control="SPOILER"/>
+  <control-input axis="/controls/flight/flaps" control="FLAP0"/>
+  <control-input axis="/controls/flight/aileron" control="FLAP1" split="true"/>
+  <control-input axis="/controls/flight/spoilers" control="SPOILER"/>
 
   <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
   <control-output control="FLAP1" side="left" prop="/surface-positions/left-aileron-pos-norm"/>
@@ -116,8 +116,8 @@ Lee Elliott. leee-fgfs@spatial.freeserve.co.uk
        length="7.5" chord="7.5" sweep="40.0" dihedral="0.0">
   <stall aoa="25.0" width="3" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.5" drag="1.2"/>
-  <control-input axis="/controls/elevator" control="FLAP0"/>
-  <control-input axis="/controls/elevator-trim" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator" control="FLAP0"/>
+  <control-input axis="/controls/flight/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
   <control-speed control="FLAP0" transition-time="0.5"/>
  </hstab>
@@ -126,7 +126,7 @@ Lee Elliott. leee-fgfs@spatial.freeserve.co.uk
        length="8.5" chord="7.5" sweep="35.0">
   <stall aoa="20.0" width="3" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.15" drag="1.3"/>
-  <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
+  <control-input axis="/controls/flight/rudder" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
  </vstab>
 
@@ -144,28 +144,28 @@ Lee Elliott. leee-fgfs@spatial.freeserve.co.uk
  <jet x="-23.0" y="20.0" z="-1.0"
      mass="4000"
      thrust="11200">
-  <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[0]/throttle" control="THROTTLE"/>
  </jet>
 
 <!-- Left Outer Right -->
  <jet x="-23.0" y="18.0" z="-1.0"
      mass="4000"
      thrust="11200">
-  <control-input axis="/controls/throttle[1]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[1]/throttle" control="THROTTLE"/>
  </jet>
 
 <!-- Left Inner Left -->
  <jet x="-15.0" y="12.0" z="-1.0"
      mass="4000"
      thrust="11200">
-  <control-input axis="/controls/throttle[2]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[2]/throttle" control="THROTTLE"/>
  </jet>
 
 <!-- Left Inner Right -->
  <jet x="-15.0" y="10.0" z="-1.0"
      mass="4000"
      thrust="11200">
-  <control-input axis="/controls/throttle[3]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[3]/throttle" control="THROTTLE"/>
  </jet>
 
 <!-- Right wing engines -->
@@ -174,74 +174,74 @@ Lee Elliott. leee-fgfs@spatial.freeserve.co.uk
  <jet x="-15.0" y="-10.0" z="-1.0"
      mass="4000"
      thrust="11200">
-  <control-input axis="/controls/throttle[4]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[4]/throttle" control="THROTTLE"/>
  </jet>
 
 <!-- Right Inner Right -->
  <jet x="-15.0" y="-12.0" z="-1.0"
      mass="4000"
      thrust="11200">
-  <control-input axis="/controls/throttle[5]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[5]/throttle" control="THROTTLE"/>
  </jet>
 
 <!-- Right Outer Left -->
  <jet x="-23.0" y="-18.0" z="-1.0"
      mass="4000"
      thrust="11200">
-  <control-input axis="/controls/throttle[6]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[6]/throttle" control="THROTTLE"/>
  </jet>
 
 <!-- Right Outer Right -->
  <jet x="-23.0" y="-20.0" z="-1.0"
      mass="4000"
      thrust="11200">
-  <control-input axis="/controls/throttle[7]" control="THROTTLE"/>
+  <control-input axis="/controls/engines/engine[7]/throttle" control="THROTTLE"/>
  </jet>
 
 <!-- Front Left -->
  <gear x="-13.2" y="2.0" z="-2.9" retract-time="7" compression="1.0">
-  <control-input axis="/controls/rudder" control="STEER" square="true"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/flight/rudder" control="STEER" square="true"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
  </gear>
 
 <!-- Front Right -->
  <gear x="-13.2" y="-2.0" z="-2.9" retract-time="7" compression="1.0">
-  <control-input axis="/controls/rudder" control="STEER" square="true"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/flight/rudder" control="STEER" square="true"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
  </gear>
 
 <!-- Rear Left -->
  <gear x="-28.0" y="2.0" z="-2.9" retract-time="7" compression="1.0">
-  <control-input axis="/controls/brakes" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
  </gear>
 
 <!-- Rear Right -->
  <gear x="-28.0" y="-2.0" z="-2.9" retract-time="7" compression="1.0">
-  <control-input axis="/controls/brakes" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gears/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
  </gear>
 
 <!-- Left Wing -->
  <gear x="-31.0" y="23.0" z="-2.0" retract-time="7" compression="2.5">
-  <control-input axis="/controls/brakes[0]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[0]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
  </gear>
 
 <!-- Right Wing -->
  <gear x="-31.0" y="-23.0" z="-2.0" retract-time="7" compression="2.5">
-  <control-input axis="/controls/brakes[1]" control="BRAKE"/>
-  <control-input axis="/controls/gear-down" control="EXTEND"/>
+  <control-input axis="/controls/gear/wheel[1]/brake" control="BRAKE"/>
+  <control-input axis="/controls/gear/gear-down" control="EXTEND"/>
   <control-speed control="EXTEND" transition-time="7"/>
   <control-output control="EXTEND" prop="/gear/gear/position-norm"/>
  </gear>