diff --git a/Models/Effects/Moisture.xml b/Models/Effects/Moisture.xml
index 00d20c3e..63c9e26a 100755
--- a/Models/Effects/Moisture.xml
+++ b/Models/Effects/Moisture.xml
@@ -13,7 +13,7 @@ Original code author Maggse.
 <PropertyList>
 	<particlesystem>
 		<!-- <type>trail</type>-->
-		<name>Moisture</name>
+		<name>moisture</name>
 		<texture>res/smoke.png</texture>
 		<emissive>false</emissive>
 		<lighting>false</lighting>
diff --git a/Models/Effects/contrail.xml b/Models/Effects/contrail.xml
index 4f038b98..36005fe4 100644
--- a/Models/Effects/contrail.xml
+++ b/Models/Effects/contrail.xml
@@ -3,7 +3,7 @@
 <PropertyList>
 	
 	<particlesystem>
-		<name>contrail-eng1</name>
+		<name>contrail</name>
 		<texture>res/smoke.png</texture>
 		<offsets>
 			<x-m>30</x-m>
diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml
index d5dde5e9..0214d849 100644
--- a/Models/Engines/NEO/LeapXLeft.xml
+++ b/Models/Engines/NEO/LeapXLeft.xml
@@ -48,7 +48,7 @@
 	</model>
 
 	<model>
-		<name>Contrail-eng1</name>
+		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
 			<and>
@@ -84,7 +84,7 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<name>Moisture_Left</name>
+		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
 		<condition>
 			<and>
@@ -124,7 +124,7 @@
 	<!-- Takeoff/Landing Engine spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-l</name>
+		<name>engine-spray</name>
 		<condition>
 			<and>
 				<greater-than>
@@ -166,7 +166,7 @@
 	<!-- Takeoff/Landing Engine Reverse spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-l-reverse</name>
+		<name>engine-spray-reverse</name>
 		<condition>
 			<and>
 				<greater-than>
@@ -242,10 +242,10 @@
 		</axis>
 	</animation>
 	
-	<!--effect>
+	<!-- <effect>
         <inherits-from>Aircraft/A320-family/Models/Effects/engineLEAPl</inherits-from>
         <object-name>Nacelle</object-name>
         <object-name>Reverser</object-name>
-	</effect-->
+	</effect> -->
 
 </PropertyList>
diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml
index 6e6af30b..7d148051 100644
--- a/Models/Engines/NEO/LeapXRight.xml
+++ b/Models/Engines/NEO/LeapXRight.xml
@@ -48,7 +48,7 @@
 	</model>
 
 	<model>
-		<name>Contrail-eng2</name>
+		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
 			<and>
@@ -82,37 +82,36 @@
 		</offsets>
 	</model>
 
-
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<name>Moisture_Right</name>
+		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1</property>
-					<value>60</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1</property>
+					<value>60</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>-0.5</x-m>
@@ -125,37 +124,37 @@
 	<!-- Takeoff/Landing Engine spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-r</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>65</value>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<equals>
 					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0</value>
+				</equals>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>4.875</x-m>
@@ -167,33 +166,33 @@
 	<!-- Takeoff/Landing Engine Reverse spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-r-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>60</value>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>60</value>
 				</greater-than>
 				<greater-than>
 					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0.5</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0.5</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>0.875</x-m>
@@ -214,8 +213,7 @@
             <z-m>-4.4</z-m>
             <pitch-deg>0</pitch-deg>
         </offsets>
-    </model>
-	-->
+    </model> -->
 
 	<model>
 		<name>Engine fire</name>
@@ -244,10 +242,10 @@
 		</axis>
 	</animation>
 	
-	<!--effect>
+	<!-- <effect>
         <inherits-from>Aircraft/A320-family/Models/Effects/engineLEAPr</inherits-from>
         <object-name>Nacelle</object-name>
         <object-name>Reverser</object-name>
-	</effect-->
+	</effect> -->
 
 </PropertyList>
diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml
index c279d28c..b1cc6ecb 100644
--- a/Models/Engines/NEO/PW1100GLeft.xml
+++ b/Models/Engines/NEO/PW1100GLeft.xml
@@ -35,7 +35,7 @@
 	</model>
 
 	<model>
-		<name>Contrail-eng1</name>
+		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
 			<and>
@@ -71,34 +71,34 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<name>Moisture_Left</name>
+		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1</property>
-					<value>65</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1</property>
+					<value>65</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>-0.5</x-m>
@@ -111,37 +111,37 @@
 	<!-- Takeoff/Landing Engine spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-l</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>65</value>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<equals>
 					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0</value>
+				</equals>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>5.137</x-m>
@@ -153,33 +153,33 @@
 	<!-- Takeoff/Landing Engine Reverse spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-l-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>65</value>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<greater-than>
 					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0.5</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0.5</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>0.875</x-m>
@@ -187,7 +187,7 @@
 			<z-m>-2.5</z-m>
 		</offsets>
 	</model>
-	
+
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
@@ -215,11 +215,11 @@
 		</axis>
 	</animation>
 	
-	<!--effect>
+	<!-- <effect>
         <inherits-from>Aircraft/A320-family/Models/Effects/enginePW1100L</inherits-from>
         <object-name>NacellePW1100G</object-name>
         <object-name>ReverserPW1100G</object-name>
         <object-name>SpoilersPW1100G</object-name>
-	</effect-->
+	</effect> -->
 
 </PropertyList>
diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml
index 69ed7d8d..a46ff37a 100644
--- a/Models/Engines/NEO/PW1100GRight.xml
+++ b/Models/Engines/NEO/PW1100GRight.xml
@@ -35,7 +35,7 @@
 	</model>
 
 	<model>
-		<name>Contrail-eng2</name>
+		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
 			<and>
@@ -71,34 +71,34 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<name>Moisture_Right</name>
+		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1</property>
-					<value>65</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1</property>
+					<value>65</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>-0.5</x-m>
@@ -111,37 +111,37 @@
 	<!-- Takeoff/Landing Engine spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-r</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>65</value>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<equals>
 					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0</value>
+				</equals>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>5.137</x-m>
@@ -153,33 +153,33 @@
 	<!-- Takeoff/Landing Engine Reverse spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-r-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>60</value>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<greater-than>
 					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0.5</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0.5</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>0.875</x-m>
@@ -188,7 +188,6 @@
 		</offsets>
 	</model>
 
-
 	<model>
 		<name>Engine fire</name>
 		<path>Aircraft/A320-family/Models/Effects/enginefire.xml</path>
@@ -216,11 +215,11 @@
 		</axis>
 	</animation>
 	
-	<!--effect>
+	<!-- <effect>
         <inherits-from>Aircraft/A320-family/Models/Effects/enginePW1100R</inherits-from>
         <object-name>NacellePW1100G</object-name>
         <object-name>ReverserPW1100G</object-name>
         <object-name>SpoilersPW1100G</object-name>
-	</effect-->
+	</effect> -->
 
 </PropertyList>
diff --git a/Models/Engines/XMLs/a320.engine.cfm.left.xml b/Models/Engines/XMLs/a320.engine.cfm.left.xml
index feb93e5c..d00f6792 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.left.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.left.xml
@@ -37,7 +37,7 @@
 	</model>
 
 	<model>
-		<name>Contrail-eng1</name>
+		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
 			<and>
@@ -73,34 +73,34 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<name>Left</name>
+		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1</property>
-					<value>65</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1</property>
+					<value>65</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>-0.5</x-m>
@@ -113,37 +113,37 @@
 	<!-- Takeoff/Landing Engine spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-l</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>65</value>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<equals>
 					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0</value>
+				</equals>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>4.875</x-m>
@@ -155,33 +155,33 @@
 	<!-- Takeoff/Landing Engine Reverse spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-l-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>60</value>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>60</value>
 				</greater-than>
 				<greater-than>
 					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0.5</value>
+					<value>0.5</value>
 				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>0.875</x-m>
diff --git a/Models/Engines/XMLs/a320.engine.cfm.right.xml b/Models/Engines/XMLs/a320.engine.cfm.right.xml
index 73f63578..b0d29682 100644
--- a/Models/Engines/XMLs/a320.engine.cfm.right.xml
+++ b/Models/Engines/XMLs/a320.engine.cfm.right.xml
@@ -37,7 +37,7 @@
 	</model>
 
 	<model>
-		<name>Contrail-eng2</name>
+		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
 			<and>
@@ -73,7 +73,7 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<name>Right</name>
+		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
 		<condition>
 			<and>
@@ -113,7 +113,7 @@
 	<!-- Takeoff/Landing Engine spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-r</name>
+		<name>engine-spray</name>
 		<condition>
 			<and>
 				<greater-than>
@@ -155,7 +155,7 @@
 	<!-- Takeoff/Landing Engine Reverse spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-r-reverse</name>
+		<name>engine-spray-reverse</name>
 		<condition>
 			<and>
 				<greater-than>
diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml
index 7efa90f8..007aff4e 100644
--- a/Models/Engines/XMLs/a320.engine.iae.left.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.left.xml
@@ -34,7 +34,7 @@
 	</model>
 
 	<model>
-		<name>Contrail-eng1</name>
+		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
 			<and>
@@ -70,34 +70,34 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<name>Left</name>
+		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1</property>
-					<value>60</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1</property>
+					<value>65</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>-0.5</x-m>
@@ -106,41 +106,41 @@
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
-	
+
 	<!-- Takeoff/Landing Engine spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-l</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>65</value>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<equals>
 					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0</value>
+				</equals>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>4.875</x-m>
@@ -152,33 +152,33 @@
 	<!-- Takeoff/Landing Engine Reverse spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-l-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>60</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[0]/n1-actual</property>
-					<value>60</value>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>60</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[0]/n1-actual</property>
+					<value>60</value>
 				</greater-than>
 				<greater-than>
 					<property>engines/engine[0]/reverser-pos-norm</property>
-					<value>0.5</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0.5</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>0.875</x-m>
diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml
index c25b3b59..49d4bc9e 100644
--- a/Models/Engines/XMLs/a320.engine.iae.right.xml
+++ b/Models/Engines/XMLs/a320.engine.iae.right.xml
@@ -34,7 +34,7 @@
 	</model>
 
 	<model>
-		<name>Contrail-eng2</name>
+		<name>contrail</name>
 		<path>Aircraft/A320-family/Models/Effects/contrail.xml</path>
 		<condition>
 			<and>
@@ -70,34 +70,34 @@
 
 	<!-- Takeoff/Landing Engine Moisture -->
 	<model>
-		<name>Right</name>
+		<name>moisture</name>
 		<path>Aircraft/A320-family/Models/Effects/Moisture.xml</path>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/relative-humidity</property>
-					<value>45</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>75</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1</property>
-					<value>60</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/relative-humidity</property>
+					<value>45</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>75</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1</property>
+					<value>60</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>-0.5</x-m>
@@ -106,41 +106,41 @@
 			<pitch-deg>0</pitch-deg>
 		</offsets>
 	</model>
-	
+
 	<!-- Takeoff/Landing Engine spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray.xml</path>
-		<name>engine-spray-r</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>position/altitude-agl-ft</property>
-					<value>15</value>
-				</less-than-equals>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>65</value>
+		<name>engine-spray</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>position/altitude-agl-ft</property>
+					<value>15</value>
+				</less-than-equals>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>65</value>
 				</greater-than>
 				<equals>
 					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0</value>
-				</equals>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0</value>
+				</equals>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>4.875</x-m>
@@ -152,33 +152,33 @@
 	<!-- Takeoff/Landing Engine Reverse spray -->
 	<model>
 		<path>Aircraft/A320-family/Models/Effects/engine-spray-reverse.xml</path>
-		<name>engine-spray-r-reverse</name>
-		<condition>
-			<and>
-				<greater-than>
-					<property>position/altitude-agl-ft</property>
-					<value>1</value>
-				</greater-than>
-				<greater-than>
-					<property>environment/surface/wetness</property>
-					<value>0.3</value>
-				</greater-than>
-				<less-than-equals>
-					<property>sim/time/sun-angle-rad</property>
-					<value>1.63</value>
-				</less-than-equals>
-				<greater-than>
-					<property>engines/engine[1]/n1-actual</property>
-					<value>60</value>
+		<name>engine-spray-reverse</name>
+		<condition>
+			<and>
+				<greater-than>
+					<property>position/altitude-agl-ft</property>
+					<value>1</value>
+				</greater-than>
+				<greater-than>
+					<property>environment/surface/wetness</property>
+					<value>0.3</value>
+				</greater-than>
+				<less-than-equals>
+					<property>sim/time/sun-angle-rad</property>
+					<value>1.63</value>
+				</less-than-equals>
+				<greater-than>
+					<property>engines/engine[1]/n1-actual</property>
+					<value>60</value>
 				</greater-than>
 				<greater-than>
 					<property>engines/engine[1]/reverser-pos-norm</property>
-					<value>0.5</value>
-				</greater-than>
-				<!-- <not>
-					<property>sim/crashed</property>
-				</not> -->
-			</and>
+					<value>0.5</value>
+				</greater-than>
+				<!-- <not>
+					<property>sim/crashed</property>
+				</not> -->
+			</and>
 		</condition>
 		<offsets>
 			<x-m>0.875</x-m>