diff --git a/resources/rendertheme.xsd b/resources/rendertheme.xsd
index d0a931b3..ba852fa7 100644
--- a/resources/rendertheme.xsd
+++ b/resources/rendertheme.xsd
@@ -84,6 +84,7 @@
         <xs:restriction base="xs:string">
             <xs:enumeration value="ele" />
             <xs:enumeration value="addr:housenumber" />
+            <xs:enumeration value="addr_housenumber" /> <!-- Mapzen -->
             <xs:enumeration value="name" />
             <xs:enumeration value="ref" />
         </xs:restriction>
diff --git a/vtm-themes/resources/assets/vtm/mapzen.xml b/vtm-themes/resources/assets/vtm/mapzen.xml
index fe7da405..7b511e19 100644
--- a/vtm-themes/resources/assets/vtm/mapzen.xml
+++ b/vtm-themes/resources/assets/vtm/mapzen.xml
@@ -572,7 +572,7 @@
             <m zoom-min="17">
                 <caption style="bold" fill="#4040ff" k="name" priority="9" size="14"
                     stroke="#ffffff" stroke-width="2.0" />
-                <caption style="bold" fill="#606060" k="addr:housenumber" priority="10" size="12"
+                <caption style="bold" fill="#606060" k="addr_housenumber" priority="10" size="12"
                     stroke="#ffffff" stroke-width="2.0" />
             </m>
         </m>