diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index b2cf8ab4..071a73a1 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -216,10 +216,10 @@
         Assumes that a day is exactly 86400 seconds, which is close enough for
         these purposes.
     -->
-    <bean id="validuntil_aggregate_days" class="java.lang.Integer" factory-method="parseInt"
+    <bean id="validUntil_aggregate_days" class="java.lang.Integer" factory-method="parseInt"
         c:_="${validUntil.aggregate.days:14}"/>
-    <bean id="validuntil_aggregate_ISO" parent="String"
-        c:_="#{ now_instant.plusSeconds(86400*validuntil_aggregate_days).toString()}"/>
+    <bean id="validUntil_aggregate_ISO" parent="String"
+        c:_="#{ now_instant.plusSeconds(86400*validUntil_aggregate_days).toString()}"/>
 
     <!--
         ***********************************************
diff --git a/mdx/uk/final_tweak.xsl b/mdx/uk/final_tweak.xsl
index 5a800ce0..1f80e20d 100644
--- a/mdx/uk/final_tweak.xsl
+++ b/mdx/uk/final_tweak.xsl
@@ -63,26 +63,26 @@
     <xsl:param name="now_local_ISO"/>
 
     <!--
-        valid_until_ISO
+        validUntil_ISO
 
         This parameter is an ISO8601 representation of the UTC instant
         at which the aggregate will become invalid. This has been computed
         by the caller as now_ISO + validityDays days.
     -->
-    <xsl:param name="valid_until_ISO"/>
+    <xsl:param name="validUntil_ISO"/>
 
     <!--
         Document element.
     -->
     <xsl:template match="/md:EntitiesDescriptor">
         <xsl:call-template name="document.comment">
-            <xsl:with-param name="validUntil" select="$valid_until_ISO"/>
+            <xsl:with-param name="validUntil" select="$validUntil_ISO"/>
         </xsl:call-template>
         <EntitiesDescriptor>
             <xsl:apply-templates select="@*"/>
-            <xsl:attribute name="validUntil"><xsl:value-of select="$valid_until_ISO"/></xsl:attribute>
+            <xsl:attribute name="validUntil"><xsl:value-of select="$validUntil_ISO"/></xsl:attribute>
             <xsl:call-template name="document.comment">
-                <xsl:with-param name="validUntil" select="$valid_until_ISO"/>
+                <xsl:with-param name="validUntil" select="$validUntil_ISO"/>
             </xsl:call-template>
 
             <!--
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index dc5963f5..25f5bba2 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -281,7 +281,7 @@
                 <entry key="validityDays" value="${validUntil.aggregate.days}"/>
                 <entry key="now_ISO" value-ref="now_ISO"/>
                 <entry key="now_local_ISO" value-ref="now_local_ISO"/>
-                <entry key="valid_until_ISO" value-ref="validuntil_aggregate_ISO"/>
+                <entry key="validUntil_ISO" value-ref="validUntil_aggregate_ISO"/>
             </map>
         </property>
     </bean>
@@ -438,7 +438,7 @@
                 <entry key="validityDays" value="${validUntil.aggregate.days}"/>
                 <entry key="now_ISO" value-ref="now_ISO"/>
                 <entry key="now_local_ISO" value-ref="now_local_ISO"/>
-                <entry key="valid_until_ISO" value-ref="validuntil_aggregate_ISO"/>
+                <entry key="validUntil_ISO" value-ref="validUntil_aggregate_ISO"/>
             </map>
         </property>
     </bean>
@@ -523,7 +523,7 @@
                 <entry key="validityDays" value="${validUntil.aggregate.days}"/>
                 <entry key="now_ISO" value-ref="now_ISO"/>
                 <entry key="now_local_ISO" value-ref="now_local_ISO"/>
-                <entry key="valid_until_ISO" value-ref="validuntil_aggregate_ISO"/>
+                <entry key="validUntil_ISO" value-ref="validUntil_aggregate_ISO"/>
             </map>
         </property>
     </bean>
@@ -583,7 +583,7 @@
                 <entry key="validityDays" value="${validUntil.aggregate.days}"/>
                 <entry key="now_ISO" value-ref="now_ISO"/>
                 <entry key="now_local_ISO" value-ref="now_local_ISO"/>
-                <entry key="valid_until_ISO" value-ref="validuntil_aggregate_ISO"/>
+                <entry key="validUntil_ISO" value-ref="validUntil_aggregate_ISO"/>
             </map>
         </property>
     </bean>
@@ -641,7 +641,7 @@
                 <entry key="validityDays" value="${validUntil.aggregate.days}"/>
                 <entry key="now_ISO" value-ref="now_ISO"/>
                 <entry key="now_local_ISO" value-ref="now_local_ISO"/>
-                <entry key="valid_until_ISO" value-ref="validuntil_aggregate_ISO"/>
+                <entry key="validUntil_ISO" value-ref="validUntil_aggregate_ISO"/>
             </map>
         </property>
     </bean>