diff --git a/Aircraft/Generic/generic-electrical.xml b/Aircraft/Generic/generic-electrical.xml
index 0be86fb3f..4106a4539 100644
--- a/Aircraft/Generic/generic-electrical.xml
+++ b/Aircraft/Generic/generic-electrical.xml
@@ -144,7 +144,7 @@
   <connector>
     <input>Master Bus</input>
     <output>Starter 1 Power</output>
-    <switch>/controls/starter[0]</switch>
+    <switch>/controls/engines/engine[0]/starter</switch>
     <initial-state>off</initial-state>
   </connector>
 
@@ -165,7 +165,7 @@
   <connector>
     <input>Master Bus</input>
     <output>Fuel Pump Power</output>
-    <switch>/controls/fuel-pump[0]</switch>
+    <switch>/controls/engines/engine[0]/fuel-pump</switch>
   </connector>
 
   <connector>
diff --git a/Aircraft/Instruments/flap.xml b/Aircraft/Instruments/flap.xml
index a6c1caa7e..1f154fec3 100644
--- a/Aircraft/Instruments/flap.xml
+++ b/Aircraft/Instruments/flap.xml
@@ -54,7 +54,7 @@ properties' values.
   <transformations>
     <transformation>
      <type>x-shift</type>
-     <property>/controls/flaps</property>
+     <property>/controls/flight/flaps</property>
      <min>0.0</min>
      <max>1.0</max>
      <scale>17.0</scale>
@@ -62,7 +62,7 @@ properties' values.
     </transformation>
     <transformation>
      <type>y-shift</type>
-     <property>/controls/flaps</property>
+     <property>/controls/flight/flaps</property>
      <min>0.0</min>
      <max>1.0</max>
      <scale>-45.0</scale>
@@ -87,7 +87,7 @@ properties' values.
    <h>96</h>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/flaps</property>
+    <property>/controls/flight/flaps</property>
     <step>-0.34</step>
     <min>0.0</min>
     <max>1.0</max>
@@ -104,7 +104,7 @@ properties' values.
    <h>96</h>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/flaps</property>
+    <property>/controls/flight/flaps</property>
     <step>0.34</step>
     <min>0.0</min>
     <max>1.0</max>
diff --git a/Aircraft/Instruments/gear.xml b/Aircraft/Instruments/gear.xml
index 261524f5c..c9a2ebc18 100644
--- a/Aircraft/Instruments/gear.xml
+++ b/Aircraft/Instruments/gear.xml
@@ -5,7 +5,7 @@
  <h-base>100</h-base>
 
 <!-- <params>
-  <engine-throttle0-select>/controls/throttle[0]</engine-throttle0-select>
+  <engine-throttle0-select>/controls/engines/engine[0]/throttle</engine-throttle0-select>
 
 </params> -->
 
diff --git a/Aircraft/c172p/Models/c172p.xml b/Aircraft/c172p/Models/c172p.xml
index 7e2c7498c..20fae7d9f 100644
--- a/Aircraft/c172p/Models/c172p.xml
+++ b/Aircraft/c172p/Models/c172p.xml
@@ -100,7 +100,7 @@
   <type>translate</type>
   <object-name>LeftYoke</object-name>
   <object-name>RightYoke</object-name>
-  <property>/controls/elevator</property>
+  <property>/controls/flight/elevator</property>
   <factor>-0.03</factor>
   <axis>
    <x>1.0</x>
@@ -112,7 +112,7 @@
  <animation>
   <type>rotate</type>
   <object-name>LeftYoke</object-name>
-  <property>/controls/aileron</property>
+  <property>/controls/flight/aileron</property>
   <factor>-45</factor>
   <center>
    <x-m>-0.23</x-m>
@@ -129,7 +129,7 @@
  <animation>
   <type>rotate</type>
   <object-name>RightYoke</object-name>
-  <property>/controls/aileron</property>
+  <property>/controls/flight/aileron</property>
   <factor>-45</factor>
   <center>
    <x-m>-0.23</x-m>
@@ -181,7 +181,7 @@
 
  <animation>
   <type>rotate</type>
-  <property>/controls/flaps</property>
+  <property>/controls/flight/flaps</property>
   <object-name>FlapSwitchGroup</object-name>
   <factor>60</factor>
   <offset-deg>-30</offset-deg>
@@ -200,7 +200,7 @@
  <animation>
   <type>rotate</type>
   <object-name>TrimWheel</object-name>
-  <property>/controls/elevator-trim</property>
+  <property>/controls/flight/elevator-trim</property>
   <factor>-360</factor>
   <axis>
    <x>0.0</x>
@@ -623,7 +623,7 @@
  <animation>
   <type>rotate</type>
   <object-name>ElevatorTrimTab</object-name>
-  <property>/controls/elevator-trim</property>
+  <property>/controls/flight/elevator-trim</property>
   <factor>25</factor>
   <center>
    <x-m>5.06</x-m>
diff --git a/Aircraft/c182-jsbsim-set.xml b/Aircraft/c182-jsbsim-set.xml
index d3f2f160c..a1b61e2e9 100644
--- a/Aircraft/c182-jsbsim-set.xml
+++ b/Aircraft/c182-jsbsim-set.xml
@@ -63,7 +63,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
      <desc>Rudder Trim Left</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <min type="double">-1.0</min>
       <step type="double">-0.001</step>
      </binding>
@@ -73,7 +73,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
      <desc>Rudder Trim Right</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <max type="double">1.0</max>
       <step type="double">0.001</step>
      </binding>
diff --git a/Aircraft/c310-ifr-set.xml b/Aircraft/c310-ifr-set.xml
index b594abfbc..2a01144dc 100644
--- a/Aircraft/c310-ifr-set.xml
+++ b/Aircraft/c310-ifr-set.xml
@@ -103,7 +103,7 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
      <desc>Rudder Trim Left</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <min type="double">-1.0</min>
       <step type="double">-0.001</step>
      </binding>
@@ -113,7 +113,7 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
      <desc>Rudder Trim Right</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <max type="double">1.0</max>
       <step type="double">0.001</step>
      </binding>
diff --git a/Aircraft/c310dpm-3d-set.xml b/Aircraft/c310dpm-3d-set.xml
index 80efbef0d..487d94771 100644
--- a/Aircraft/c310dpm-3d-set.xml
+++ b/Aircraft/c310dpm-3d-set.xml
@@ -97,7 +97,7 @@
      <desc>Rudder Trim Left</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <min type="double">-1.0</min>
       <step type="double">-0.001</step>
      </binding>
@@ -107,7 +107,7 @@
      <desc>Rudder Trim Right</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <max type="double">1.0</max>
       <step type="double">0.001</step>
      </binding>
diff --git a/Aircraft/c310u3a-3d-jsbsim-set.xml b/Aircraft/c310u3a-3d-jsbsim-set.xml
index fe3c488cd..23fc3ecdd 100644
--- a/Aircraft/c310u3a-3d-jsbsim-set.xml
+++ b/Aircraft/c310u3a-3d-jsbsim-set.xml
@@ -115,7 +115,7 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
      <desc>Rudder Trim Left</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <min type="double">-1.0</min>
       <step type="double">-0.001</step>
      </binding>
@@ -125,7 +125,7 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
      <desc>Rudder Trim Right</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <max type="double">1.0</max>
       <step type="double">0.001</step>
      </binding>
diff --git a/Aircraft/c310u3a-jsbsim-set.xml b/Aircraft/c310u3a-jsbsim-set.xml
index c3d6708fb..2b66de3f9 100644
--- a/Aircraft/c310u3a-jsbsim-set.xml
+++ b/Aircraft/c310u3a-jsbsim-set.xml
@@ -103,7 +103,7 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
      <desc>Rudder Trim Left</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <min type="double">-1.0</min>
       <step type="double">-0.001</step>
      </binding>
@@ -113,7 +113,7 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
      <desc>Rudder Trim Right</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <max type="double">1.0</max>
       <step type="double">0.001</step>
      </binding>
diff --git a/Aircraft/c310u3a-set.xml b/Aircraft/c310u3a-set.xml
index 3c0404051..cc7c83b54 100644
--- a/Aircraft/c310u3a-set.xml
+++ b/Aircraft/c310u3a-set.xml
@@ -103,7 +103,7 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
      <desc>Rudder Trim Left</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <min type="double">-1.0</min>
       <step type="double">-0.001</step>
      </binding>
@@ -113,7 +113,7 @@ March 2002 Jim Wilson, jimw@kelcomaine.com
      <desc>Rudder Trim Right</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <max type="double">1.0</max>
       <step type="double">0.001</step>
      </binding>
diff --git a/Aircraft/pa28-base.xml b/Aircraft/pa28-base.xml
index f487ff94f..5733d8df4 100644
--- a/Aircraft/pa28-base.xml
+++ b/Aircraft/pa28-base.xml
@@ -30,7 +30,7 @@ Common configuration for all PA28 (Piper Cherokee) aircraft.
      <desc>Rudder Trim Left</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <min type="double">-1.0</min>
       <step type="double">-0.001</step>
      </binding>
@@ -40,7 +40,7 @@ Common configuration for all PA28 (Piper Cherokee) aircraft.
      <desc>Rudder Trim Right</desc>
      <binding>
       <command>property-adjust</command>
-      <property>/controls/rudder-trim</property>
+      <property>/controls/flight/rudder-trim</property>
       <max type="double">1.0</max>
       <step type="double">0.001</step>
      </binding>
diff --git a/Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml b/Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml
index 38b47e5a5..3ec9a775f 100644
--- a/Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml
+++ b/Input/Joysticks/LewEngineering/RC-transmitter-hitecLaser4.xml
@@ -39,7 +39,7 @@
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared type="bool">false</squared>
    <factor type="double">1.1</factor>
   </binding>
@@ -49,7 +49,7 @@
    <desc>Rudder</desc>
    <binding>
     <command>property-scale</command>
-    <property>/controls/rudder</property>
+    <property>/controls/flight/rudder</property>
     <squared type="bool">false</squared>
     <factor type="double">1.0</factor>
    </binding>
@@ -59,7 +59,7 @@
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <squared type="bool">false</squared>
    <factor type="double">1.0</factor>
   </binding>
@@ -70,13 +70,13 @@
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">1.0</offset>
    <factor type="double">0.6</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">1.0</offset>
    <factor type="double">0.6</factor>
   </binding>