diff --git a/build/import.xsl b/build/import.xsl
index e91ad869..93a501fb 100644
--- a/build/import.xsl
+++ b/build/import.xsl
@@ -206,220 +206,220 @@
 	</xsl:template>
 
 	<!--
-		md:AttributeConsumingService
+		md:ArtifactResolutionService
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:AttributeConsumingService">
-		<AttributeConsumingService>
+	<xsl:template match="md:ArtifactResolutionService">
+		<ArtifactResolutionService>
 			<xsl:apply-templates select="node()|@*"/>
-		</AttributeConsumingService>
+		</ArtifactResolutionService>
 	</xsl:template>
 	
 	
 	<!--
-		md:EncryptionMethod
+		md:AssertionConsumerService
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:EncryptionMethod">
-		<EncryptionMethod>
+	<xsl:template match="md:AssertionConsumerService">
+		<AssertionConsumerService>
 			<xsl:apply-templates select="node()|@*"/>
-		</EncryptionMethod>
+		</AssertionConsumerService>
 	</xsl:template>
 	
 	
 	<!--
-		md:IDPSSODescriptor
+		md:AttributeConsumingService
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:IDPSSODescriptor">
-		<IDPSSODescriptor>
+	<xsl:template match="md:AttributeConsumingService">
+		<AttributeConsumingService>
 			<xsl:apply-templates select="node()|@*"/>
-		</IDPSSODescriptor>
+		</AttributeConsumingService>
 	</xsl:template>
 	
 	
 	<!--
-		md:RequestedAttribute
+		md:EncryptionMethod
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:RequestedAttribute">
-		<RequestedAttribute>
+	<xsl:template match="md:EncryptionMethod">
+		<EncryptionMethod>
 			<xsl:apply-templates select="node()|@*"/>
-		</RequestedAttribute>
+		</EncryptionMethod>
 	</xsl:template>
 	
 	
 	<!--
-		md:ServiceName
+		md:Extensions
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:ServiceName">
-		<ServiceName>
+	<xsl:template match="md:Extensions">
+		<Extensions>
 			<xsl:apply-templates select="node()|@*"/>
-		</ServiceName>
+		</Extensions>
 	</xsl:template>
 	
 	
 	<!--
-		md:SPSSODescriptor
+		md:IDPSSODescriptor
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:SPSSODescriptor">
-		<SPSSODescriptor>
+	<xsl:template match="md:IDPSSODescriptor">
+		<IDPSSODescriptor>
 			<xsl:apply-templates select="node()|@*"/>
-		</SPSSODescriptor>
+		</IDPSSODescriptor>
 	</xsl:template>
 	
 	
 	<!--
-		md:Extensions
+		md:KeyDescriptor
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:Extensions">
-		<Extensions>
+	<xsl:template match="md:KeyDescriptor">
+		<KeyDescriptor>
 			<xsl:apply-templates select="node()|@*"/>
-		</Extensions>
+		</KeyDescriptor>
 	</xsl:template>
 	
 	
 	<!--
-		md:KeyDescriptor
+		md:ManageNameIDService
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:KeyDescriptor">
-		<KeyDescriptor>
+	<xsl:template match="md:ManageNameIDService">
+		<ManageNameIDService>
 			<xsl:apply-templates select="node()|@*"/>
-		</KeyDescriptor>
+		</ManageNameIDService>
 	</xsl:template>
 	
 	
 	<!--
-		md:SingleLogoutService
+		md:NameIDFormat
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:SingleLogoutService">
-		<SingleLogoutService>
+	<xsl:template match="md:NameIDFormat">
+		<NameIDFormat>
 			<xsl:apply-templates select="node()|@*"/>
-		</SingleLogoutService>
+		</NameIDFormat>
 	</xsl:template>
 	
 	
-	
 	<!--
-		md:SingleSignOnService
+		md:Organization
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:SingleSignOnService">
-		<SingleSignOnService>
+	<xsl:template match="md:Organization">
+		<Organization>
 			<xsl:apply-templates select="node()|@*"/>
-		</SingleSignOnService>
+		</Organization>
 	</xsl:template>
 	
 	
-	
 	<!--
-		md:ManageNameIDService
+		md:OrganizationName
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:ManageNameIDService">
-		<ManageNameIDService>
+	<xsl:template match="md:OrganizationName">
+		<OrganizationName>
 			<xsl:apply-templates select="node()|@*"/>
-		</ManageNameIDService>
+		</OrganizationName>
 	</xsl:template>
 	
 	
 	<!--
-		md:ArtifactResolutionService
+		md:OrganizationDisplayName
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:ArtifactResolutionService">
-		<ArtifactResolutionService>
+	<xsl:template match="md:OrganizationDisplayName">
+		<OrganizationDisplayName>
 			<xsl:apply-templates select="node()|@*"/>
-		</ArtifactResolutionService>
+		</OrganizationDisplayName>
 	</xsl:template>
 	
 	
 	<!--
-		md:AssertionConsumerService
+		md:OrganizationURL
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:AssertionConsumerService">
-		<AssertionConsumerService>
+	<xsl:template match="md:OrganizationURL">
+		<OrganizationURL>
 			<xsl:apply-templates select="node()|@*"/>
-		</AssertionConsumerService>
+		</OrganizationURL>
 	</xsl:template>
 	
 	
 	<!--
-		md:NameIDFormat
+		md:RequestedAttribute
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:NameIDFormat">
-		<NameIDFormat>
+	<xsl:template match="md:RequestedAttribute">
+		<RequestedAttribute>
 			<xsl:apply-templates select="node()|@*"/>
-		</NameIDFormat>
+		</RequestedAttribute>
 	</xsl:template>
 	
 	
 	<!--
-		md:Organization
+		md:ServiceName
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:Organization">
-		<Organization>
+	<xsl:template match="md:ServiceName">
+		<ServiceName>
 			<xsl:apply-templates select="node()|@*"/>
-		</Organization>
+		</ServiceName>
 	</xsl:template>
 	
 	
 	<!--
-		md:OrganizationName
+		md:SingleLogoutService
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:OrganizationName">
-		<OrganizationName>
+	<xsl:template match="md:SingleLogoutService">
+		<SingleLogoutService>
 			<xsl:apply-templates select="node()|@*"/>
-		</OrganizationName>
+		</SingleLogoutService>
 	</xsl:template>
 	
 	
+	
 	<!--
-		md:OrganizationDisplayName
+		md:SingleSignOnService
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:OrganizationDisplayName">
-		<OrganizationDisplayName>
+	<xsl:template match="md:SingleSignOnService">
+		<SingleSignOnService>
 			<xsl:apply-templates select="node()|@*"/>
-		</OrganizationDisplayName>
+		</SingleSignOnService>
 	</xsl:template>
 	
 	
+	
 	<!--
-		md:OrganizationURL
+		md:SPSSODescriptor
 		
 		Normalise namespace prefix.
 	-->
-	<xsl:template match="md:OrganizationURL">
-		<OrganizationURL>
+	<xsl:template match="md:SPSSODescriptor">
+		<SPSSODescriptor>
 			<xsl:apply-templates select="node()|@*"/>
-		</OrganizationURL>
+		</SPSSODescriptor>
 	</xsl:template>