diff --git a/build.xml b/build.xml
index 577663f9..f17b1410 100644
--- a/build.xml
+++ b/build.xml
@@ -189,7 +189,7 @@
     <!--
         Signing keystore alias.
     -->
-    <property name="keystore.uk.sign.alias" value="ukfederation"/>
+    <property name="sign.uk.keyAlias" value="ukfederation"/>
 
     <!--
         Verification keystore.
@@ -656,19 +656,19 @@
                     <!--
                         If we have a PKCS#11 configuration specified, include it.
                     -->
-                    <arg if:set="keystore.pkcs11.config" value="--pkcs11Config"/>
-                    <arg if:set="keystore.pkcs11.config" value="${keystore.pkcs11.config}"/>
+                    <arg if:set="sign.uk.pkcs11Config" value="--pkcs11Config"/>
+                    <arg if:set="sign.uk.pkcs11Config" value="${sign.uk.pkcs11Config}"/>
 
                     <!--
                         If we have a non-default keystore provider specified, include it.
                     -->
-                    <arg if:set="keystore.uk.sign.provider" value="--keystoreProvider"/>
-                    <arg if:set="keystore.uk.sign.provider" value="${keystore.uk.sign.provider}"/>
+                    <arg if:set="sign.uk.keystoreProvider" value="--keystoreProvider"/>
+                    <arg if:set="sign.uk.keystoreProvider" value="${sign.uk.keystoreProvider}"/>
 
                     <arg value="--key"/>
-                    <arg value="${keystore.uk.sign.alias}"/>
+                    <arg value="${sign.uk.keyAlias}"/>
                     <arg value="--keyPassword"/>
-                    <arg value="${keystore.pass}"/>
+                    <arg value="${sign.uk.keyPassword}"/>
                     <arg value="--outFile"/>
                     <arg value="@{o}"/>
                     <arg value="--referenceIdAttributeName"/>
@@ -768,10 +768,10 @@
     -->
 
     <!--
-        Acquire the keystore password.
+        Acquire the signing keystore password.
     -->
-    <target name="get.keystore.pass" unless="keystore.pass">
-        <input addproperty="keystore.pass">
+    <target name="get.sign.uk.keyPassword" unless="sign.uk.keyPassword">
+        <input addproperty="sign.uk.keyPassword">
             Please enter the password for the keystores:
         </input>
     </target>
diff --git a/preprod.properties b/preprod.properties
index f9a06990..6c7385c2 100644
--- a/preprod.properties
+++ b/preprod.properties
@@ -7,9 +7,9 @@
 #
 # Use the PKCS#11 provider for signatures.
 #
-keystore.uk.sign.provider = sun.security.pkcs11.SunPKCS11
+sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
 
 #
 # Location of the PKCS#11 configuration file for the Thales HSM.
 #
-keystore.pkcs11.config = /opt/xmlsectool/nshield.cfg
+sign.uk.pkcs11Config = /opt/xmlsectool/nshield.cfg
diff --git a/prod-old.properties b/prod-old.properties
index a7269a06..7622fbca 100644
--- a/prod-old.properties
+++ b/prod-old.properties
@@ -10,9 +10,9 @@
 #
 # Use the PKCS#11 provider for signatures.
 #
-keystore.uk.sign.provider = sun.security.pkcs11.SunPKCS11
+sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
 
 #
 # Location of the PKCS#11 configuration file for an ACOS5 card.
 #
-keystore.pkcs11.config = C\:\\pkcs11\\sdk18\\acs.cfg
+sign.uk.pkcs11Config = C\:\\pkcs11\\sdk18\\acs.cfg
diff --git a/prod.properties b/prod.properties
index 26764173..04a57f67 100644
--- a/prod.properties
+++ b/prod.properties
@@ -7,9 +7,9 @@
 #
 # Use the PKCS#11 provider for signatures.
 #
-keystore.uk.sign.provider = sun.security.pkcs11.SunPKCS11
+sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
 
 #
 # Location of the PKCS#11 configuration file for the Thales HSM.
 #
-keystore.pkcs11.config = /opt/xmlsectool/nshield.cfg
+sign.uk.pkcs11Config = /opt/xmlsectool/nshield.cfg