diff --git a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
index dec0ee804..bfebd65f3 100644
--- a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
+++ b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
@@ -107,8 +107,12 @@ ________________________________________________________________________________
 		</binding>
 	</axis>
 
-	<axis n="2">
+	<axis>
 		<desc>Rudder</desc>
+		<number>
+			<unix>2</unix>
+			<windows>3</windows>
+		</number>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/rudder</property>
@@ -118,8 +122,12 @@ ________________________________________________________________________________
 		</binding>
 	</axis>
 
-	<axis n="3">
+	<axis>
 		<desc>Throttle</desc>
+		<number>
+			<unix>3</unix>
+			<windows>2</windows>
+		</number>
 		<binding>
 			<command>nasal</command>
 			<script>controls.throttleAxis()</script>
diff --git a/Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml b/Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml
index c926d9690..318595444 100644
--- a/Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml
+++ b/Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml
@@ -102,9 +102,15 @@ ________________________________________________________________________________
 
 <PropertyList>
 	<name>THRUSTMASTER Top Gun Afterburner</name>
+	<name>ThrustMaster Top Gun AfterBurner</name>
+	<name>Thrustmaster Afterburner Force Feedback (USB)</name>
 
-	<axis n="0">
+	<axis>
 		<desc>Aileron</desc>
+		<number>
+			<unix>0</unix>
+			<windows>0</windows>
+		</number>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/aileron</property>
@@ -112,8 +118,12 @@ ________________________________________________________________________________
 		</binding>
 	</axis>
 
-	<axis n="1">
+	<axis>
 		<desc>Elevator</desc>
+		<number>
+			<unix>1</unix>
+			<windows>1</windows>
+		</number>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/elevator</property>
@@ -122,8 +132,12 @@ ________________________________________________________________________________
 		</binding>
 	</axis>
 
-	<axis n="2">
+	<axis>
 		<desc>Rudder</desc>
+		<number>
+			<unix>2</unix>
+			<windows>3</windows>
+		</number>
 		<binding>
 			<command>property-scale</command>
 			<property>/controls/flight/rudder</property>
@@ -133,7 +147,7 @@ ________________________________________________________________________________
 		</binding>
 	</axis>
 
-	<axis n="3">
+	<axis>
 		<!--
 		We have a throttle with two raster positions.
 
@@ -145,6 +159,10 @@ ________________________________________________________________________________
 		-0.73 - -1: afterburner
 		-->
 		<desc>Throttle</desc>
+		<number>
+			<unix>3</unix>
+			<windows>2</windows>
+		</number>
 		<dead-band type="double">0.0</dead-band>
 		<binding>
 			<command>nasal</command>
@@ -446,6 +464,10 @@ ________________________________________________________________________________
 
 	<axis n="5"><!-- View Direction Hat -->
 		<desc>View direction; mixture; aileron trim; rudder trim</desc>
+		<number>
+			<unix>5</unix>
+			<windows>6</windows>
+		</number>
 		<low>
 			<repeatable>true</repeatable>
 			<binding>
@@ -507,8 +529,12 @@ ________________________________________________________________________________
 		</high>
 	</axis>
 
-	<axis n="6">
+	<axis>
 		<desc>View direction; prop pitch; elevator trim</desc>
+		<number>
+			<unix>6</unix>
+			<windows>7</windows>
+		</number>
 		<low>
 			<repeatable>true</repeatable>
 			<binding>