diff --git a/build/test_master_unsigned.xsl b/build/test_master_unsigned.xsl
index 60aad9ff..3bf9eb45 100644
--- a/build/test_master_unsigned.xsl
+++ b/build/test_master_unsigned.xsl
@@ -16,7 +16,7 @@
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:mdxDates="xalan://uk.ac.sdss.xalan.md.Dates"
@@ -89,20 +89,20 @@
 	</xsl:template>
 	
 	<!--
-		Pass through certain uklabel namespace elements.
+		Pass through certain ukfedlabel namespace elements.
 	-->
-	<xsl:template match="uklabel:UKFederationMember |
-		uklabel:SDSSPolicy |
-		uklabel:AccountableUsers">
+	<xsl:template match="ukfedlabel:UKFederationMember |
+		ukfedlabel:SDSSPolicy |
+		ukfedlabel:AccountableUsers">
 		<xsl:copy>
 			<xsl:apply-templates select="node()|@*"/>
 		</xsl:copy>
 	</xsl:template>
 	
 	<!--
-		Strip all other uklabel namespace elements entirely.
+		Strip all other ukfedlabel namespace elements entirely.
 	-->
-	<xsl:template match="uklabel:*">
+	<xsl:template match="ukfedlabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 	
diff --git a/build/uk_master_back.xsl b/build/uk_master_back.xsl
index 7bb97bbd..defae568 100644
--- a/build/uk_master_back.xsl
+++ b/build/uk_master_back.xsl
@@ -20,7 +20,7 @@
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:exsl="http://exslt.org/common"
@@ -92,7 +92,7 @@
 		
 		In general, at this stage in the flow we pass through any Extensions unaltered.
 		However, certain changes (such as the filtering we perform on extensions in the
-		uklabel namespace) may cause the Extensions element to become empty, which is not
+		ukfedlabel namespace) may cause the Extensions element to become empty, which is not
 		permitted by the schema.  We therefore precompute the resulting Extensions element
 		and suppress it entirely if it would have no child elements.
 	-->
@@ -110,20 +110,20 @@
 	</xsl:template>
 	
 	<!--
-		Pass through certain uklabel namespace elements.
+		Pass through certain ukfedlabel namespace elements.
 	-->
-	<xsl:template match="uklabel:UKFederationMember |
-		uklabel:SDSSPolicy |
-		uklabel:AccountableUsers">
+	<xsl:template match="ukfedlabel:UKFederationMember |
+		ukfedlabel:SDSSPolicy |
+		ukfedlabel:AccountableUsers">
 		<xsl:copy>
 			<xsl:apply-templates select="node()|@*"/>
 		</xsl:copy>
 	</xsl:template>
 	
 	<!--
-		Strip all other uklabel namespace elements entirely.
+		Strip all other ukfedlabel namespace elements entirely.
 	-->
-	<xsl:template match="uklabel:*">
+	<xsl:template match="ukfedlabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 	
diff --git a/build/uk_master_export.xsl b/build/uk_master_export.xsl
index a825d97e..322c3409 100644
--- a/build/uk_master_export.xsl
+++ b/build/uk_master_export.xsl
@@ -18,7 +18,7 @@
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:exsl="http://exslt.org/common"
@@ -109,7 +109,7 @@
 		
 		In general, at this stage in the flow we pass through any Extensions unaltered.
 		However, certain changes (such as the filtering we perform on extensions in the
-		uklabel namespace) may cause the Extensions element to become empty, which is not
+		ukfedlabel namespace) may cause the Extensions element to become empty, which is not
 		permitted by the schema.  We therefore precompute the resulting Extensions element
 		and suppress it entirely if it would have no child elements.
 	-->
@@ -153,24 +153,24 @@
 		There must be at least one of these, or the output will
 		not be schema-valid.
 	-->
-	<xsl:template match="md:EntityDescriptor[not(md:Extensions/uklabel:ExportOptIn)]">
+	<xsl:template match="md:EntityDescriptor[not(md:Extensions/ukfedlabel:ExportOptIn)]">
 		<!-- do nothing -->
 	</xsl:template>
 	
 	<!--
-		Pass through certain uklabel namespace elements.
+		Pass through certain ukfedlabel namespace elements.
 	-->
-	<xsl:template match="uklabel:UKFederationMember |
-		uklabel:AccountableUsers">
+	<xsl:template match="ukfedlabel:UKFederationMember |
+		ukfedlabel:AccountableUsers">
 		<xsl:copy>
 			<xsl:apply-templates select="node()|@*"/>
 		</xsl:copy>
 	</xsl:template>
 	
 	<!--
-		Strip all other uklabel namespace elements entirely.
+		Strip all other ukfedlabel namespace elements entirely.
 	-->
-	<xsl:template match="uklabel:*">
+	<xsl:template match="ukfedlabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 	
diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index b179195c..4120a294 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -19,7 +19,7 @@
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:exsl="http://exslt.org/common"
@@ -110,7 +110,7 @@
 		
 		In general, at this stage in the flow we pass through any Extensions unaltered.
 		However, certain changes (such as the filtering we perform on extensions in the
-		uklabel namespace) may cause the Extensions element to become empty, which is not
+		ukfedlabel namespace) may cause the Extensions element to become empty, which is not
 		permitted by the schema.  We therefore precompute the resulting Extensions element
 		and suppress it entirely if it would have no child elements.
 	-->
@@ -128,19 +128,19 @@
 	</xsl:template>
 	
 	<!--
-		Pass through certain uklabel namespace elements.
+		Pass through certain ukfedlabel namespace elements.
 	-->
-	<xsl:template match="uklabel:UKFederationMember |
-		uklabel:AccountableUsers">
+	<xsl:template match="ukfedlabel:UKFederationMember |
+		ukfedlabel:AccountableUsers">
 		<xsl:copy>
 			<xsl:apply-templates select="node()|@*"/>
 		</xsl:copy>
 	</xsl:template>
 	
 	<!--
-		Strip all other uklabel namespace elements entirely.
+		Strip all other ukfedlabel namespace elements entirely.
 	-->
-	<xsl:template match="uklabel:*">
+	<xsl:template match="ukfedlabel:*">
 		<!-- do nothing -->
 	</xsl:template>
 	
diff --git a/build/uk_master_unsigned.xsl b/build/uk_master_unsigned.xsl
index 32d38314..eb989a0f 100644
--- a/build/uk_master_unsigned.xsl
+++ b/build/uk_master_unsigned.xsl
@@ -16,7 +16,7 @@
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"
+	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:exsl="http://exslt.org/common"
@@ -86,7 +86,7 @@
 		
 		In general, at this stage in the flow we pass through any Extensions unaltered.
 		However, certain changes (such as the filtering we perform on extensions in the
-		uklabel namespace) may cause the Extensions element to become empty, which is not
+		ukfedlabel namespace) may cause the Extensions element to become empty, which is not
 		permitted by the schema.  We therefore precompute the resulting Extensions element
 		and suppress it entirely if it would have no child elements.
 	-->
@@ -104,19 +104,19 @@
 	</xsl:template>
 	
 	<!--
-		Pass through certain uklabel namespace elements.
+		Pass through certain ukfedlabel namespace elements.
 	-->
-	<xsl:template match="uklabel:UKFederationMember |
-		uklabel:AccountableUsers">
+	<xsl:template match="ukfedlabel:UKFederationMember |
+		ukfedlabel:AccountableUsers">
 		<xsl:copy>
 			<xsl:apply-templates select="node()|@*"/>
 		</xsl:copy>
 	</xsl:template>
 	
 	<!--
-		Strip all other uklabel namespace elements entirely.
+		Strip all other ukfedlabel namespace elements entirely.
 	-->
-	<xsl:template match="uklabel:*">
+	<xsl:template match="ukfedlabel:*">
 		<!-- do nothing -->
 	</xsl:template>