diff --git a/Input/Joysticks/Saitek/Pro-Flight-Cessna-Yoke.xml b/Input/Joysticks/Saitek/Pro-Flight-Cessna-Yoke.xml
index c85dcf767..916dbb9cb 100644
--- a/Input/Joysticks/Saitek/Pro-Flight-Cessna-Yoke.xml
+++ b/Input/Joysticks/Saitek/Pro-Flight-Cessna-Yoke.xml
@@ -32,6 +32,7 @@
     <name>Pro Flight Cessna Yoke</name>
     
     <axis n="0">
+	<name>Yoke left/right</name>
         <desc>Aileron</desc>
         <binding>
             <command>property-scale</command>
@@ -39,6 +40,7 @@
         </binding>
     </axis>
     <axis n="1">
+	<name>Yoke forward/backwards</name>
         <desc>Elevator</desc>
         <binding>
             <command>property-scale</command>
@@ -48,6 +50,7 @@
     </axis>
     <!-- Throttle Quadrant -->
     <axis n="2">
+	<name>Black Lever</name>
         <desc>Throttle</desc>
         <binding>
             <command>nasal</command>
@@ -59,6 +62,7 @@
             <unix>3</unix>
             <windows>4</windows>
         </number>
+	<name>Blue lever</name>
         <desc>Propellor Pitch</desc>
         <binding>
             <command>nasal</command>
@@ -70,6 +74,7 @@
             <unix>4</unix>
             <windows>3</windows>
         </number>
+	<name>Red lever</name>
         <desc>Mixture</desc>
         <binding>
             <command>nasal</command>
@@ -82,6 +87,7 @@
             <unix>5</unix>
             <windows>6</windows>
         </number>
+	<name>Coolie hat left/right</name>
         <desc>View Heading</desc>
         <low>
             <repeatable>true</repeatable>
@@ -110,6 +116,7 @@
         <number>
             <unix>6</unix>
         </number>
+	<name>Coolie hat up/down</name>
         <desc>View Elevation</desc>
         <low>
             <repeatable>true</repeatable>
@@ -138,6 +145,7 @@
         <number>
             <windows>7</windows>
         </number>
+	<name>Coolie hat up/down</name>
         <desc>View Elevation</desc>
         <low>
             <repeatable>true</repeatable>
@@ -167,11 +175,11 @@
 
     <!-- Red Button on left stalk -->
     <button n="0">
-        <name>PTT</name>
+        <name>Red button</name>
         <desc>Push To Talk (FGCom)</desc>
         <binding>
-              <command>nasal</command>
-        <script>controls.ptt(1)</script>
+            <command>nasal</command>
+            <script>controls.ptt(1)</script>
         </binding>
         <mod-up>
             <binding>
@@ -179,45 +187,48 @@
                 <script>controls.ptt(0)</script>
             </binding>
         </mod-up>
-
     </button>
 
     <!-- Black button on right stalk -->
-  <button n="1">
-    <desc>Reset view</desc>
-    <repeatable>false</repeatable>
-    <binding>
-      <command>nasal</command>
-      <script>
-        setprop("/sim/current-view/view-number", 0);
-        setprop("/sim/current-view/goal-pitch-offset-deg", getprop("/sim/view[0]/config/pitch-offset-deg"));
-        setprop("/sim/current-view/goal-heading-offset-deg", 0.0);
-        #setprop("/sim/current-view/field-of-view", getprop("/sim/view/config/default-field-of-view-deg"));
-      </script>
-    </binding>
+    <button n="1">
+	<name>Black button</name>
+	<desc>Reset view</desc>
+	<repeatable>false</repeatable>
+	<binding>
+            <command>nasal</command>
+	    <script>
+        	setprop("/sim/current-view/view-number", 0);
+	        setprop("/sim/current-view/goal-pitch-offset-deg", getprop("/sim/view[0]/config/pitch-offset-deg"));
+	        setprop("/sim/current-view/goal-heading-offset-deg", 0.0);
+        	#setprop("/sim/current-view/field-of-view", getprop("/sim/view/config/default-field-of-view-deg"));
+      	    </script>
+        </binding>
   </button>
 
     <!-- Left hand four-way switch -->
-  <button n="2">
-    <desc>View Decrease</desc>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>nasal</command>
-      <script>view.decrease(0.75)</script>
-    </binding>
-  </button>
+    <button n="2">
+	<name>Left rocker switch up</name>
+	<desc>View Decrease</desc>
+	<repeatable>true</repeatable>
+	<binding>
+      	    <command>nasal</command>
+            <script>view.decrease(0.75)</script>
+    	</binding>
+    </button>
 
-  <button n="3">
-    <desc>View Increase</desc>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>nasal</command>
-      <script>view.increase(0.75)</script>
-    </binding>
-  </button>
+    <button n="3">
+	<name>Left rocker switch down</name>	
+	<desc>View Increase</desc>
+	<repeatable>true</repeatable>
+	<binding>
+	    <command>nasal</command>
+	    <script>view.increase(0.75)</script>
+        </binding>
+    </button>
 
-     <!-- Right hand vertical two-way switch -->
+    <!-- Right hand vertical two-way switch -->
     <button n="4"> 
+	<name>Right vertical rocker switch up</name>
         <desc>Elevator trim up</desc>
         <repeatable>true</repeatable>
         <binding>
@@ -226,6 +237,7 @@
         </binding>
     </button>
     <button n="5">
+	<name>Right vertical rocker switch down</name>
         <desc>Elevator trim down</desc>
         <repeatable>true</repeatable>
         <binding>
@@ -234,9 +246,9 @@
         </binding>
     </button>
 
-
-      <!-- Right hand horizontal two-way switch -->
+    <!-- Right hand horizontal two-way switch -->
     <button n="6"> 
+	<name>Right horizontal rocker switch right</name>
         <desc>Rudder trim right</desc>
         <repeatable>true</repeatable>
         <binding>
@@ -245,6 +257,7 @@
         </binding>
     </button>
     <button n="7">
+	<name>Right horizontal rocker switch left</name>
         <desc>Rudder trim left</desc>
         <repeatable>true</repeatable>
         <binding>
@@ -253,29 +266,30 @@
         </binding>
     </button>
 
-  <!-- Left four-way switch - horizontal -->
-  <button n="11">
-    <desc>View Cycle Backwards</desc>
-    <repeatable>false</repeatable>
-    <binding>
-      <command>nasal</command>
-      <script>view.stepView(-1)</script>
-    </binding>
-  </button>
-
-  <button n="12">
-    <desc>View Cycle Forwards</desc>
-    <repeatable>false</repeatable>
-    <binding>
-      <command>nasal</command>
-      <script>view.stepView(1)</script>
-    </binding>
-  </button>
-
+    <!-- Left four-way switch - horizontal -->
+    <button n="11">
+	<name>Right rocker switch left</name>
+        <desc>View Cycle Backwards</desc>
+        <repeatable>false</repeatable>
+	<binding>
+	    <command>nasal</command>
+      	    <script>view.stepView(-1)</script>
+	</binding>
+    </button>
 
+    <button n="12">
+	<name>Right rocker switch right</name>
+	<desc>View Cycle Forwards</desc>
+	<repeatable>false</repeatable>
+	<binding>
+	    <command>nasal</command>
+            <script>view.stepView(1)</script>
+	</binding>
+    </button>
  
     <!-- Buttons on the throttle Quadrant -->
     <button n="13"> <!-- Labled as T1 -->
+	<name>T1</name>
         <desc>Flaps up</desc>
         <repeatable>false</repeatable>
         <binding>
@@ -290,6 +304,7 @@
         </mod-up>
     </button>
     <button n="14"> <!-- Labled as T2 -->
+	<name>T2</name>
         <desc>Flaps down</desc>
         <repeatable>false</repeatable>
         <binding>
@@ -304,6 +319,7 @@
         </mod-up>
     </button>
     <button n="15"> <!-- Labled as T3 -->
+	<name>T3</name>
         <desc>Gear up</desc>
         <repeatable>false</repeatable>
         <binding>
@@ -318,6 +334,7 @@
         </mod-up>
     </button>
     <button n="16"> <!-- Labled as T4 -->
+	<name>T4</name>
         <desc>Gear down</desc>
         <repeatable>false</repeatable>
         <binding>
@@ -332,6 +349,7 @@
         </mod-up>
     </button>
     <button n="17"> <!-- Labled as T5 -->
+	<name>T5</name>
         <desc>Retract Spoilers</desc>
         <repeatable>false</repeatable>
         <binding>
@@ -347,6 +365,7 @@
     </button>
     
     <button n="18"> <!-- Labled as T6 -->
+	<name>T6</name>
         <desc>Deploy Spoilers</desc>
         <repeatable>false</repeatable>
         <binding>
@@ -361,7 +380,8 @@
         </mod-up>
     </button>
     <button n="22">
-        <desc>Yoke Mode 0</desc>
+	<name>Yoke mode switch left</name>
+        <desc>Coolie hat sensitivity low</desc>
         <repeatable type="bool">false</repeatable>
         <binding>
             <command>property-assign</command>
@@ -370,7 +390,8 @@
         </binding>
     </button>
     <button n="23">
-        <desc>Yoke Mode 1</desc>
+	<name>Yoke mode switch middle</name>
+        <desc>Coolie hat sensitivity medium</desc>
         <repeatable type="bool">false</repeatable>
         <binding>
             <command>property-assign</command>
@@ -379,7 +400,8 @@
         </binding>
     </button>
     <button n="24">
-        <desc>Yoke Mode 2</desc>
+        <name>Yoke mode switch right</name>
+        <desc>Coolie hat sensitivity high</desc>
         <repeatable type="bool">false</repeatable>
         <binding>
             <command>property-assign</command>