diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts
index 7b889f00..8ca8ed19 100644
--- a/styles/src/base_layers.ts
+++ b/styles/src/base_layers.ts
@@ -36,7 +36,7 @@ export function nolabels_layers(
         "any",
         [
           "in",
-          "pmap:kind",
+          "kind",
           "national_park",
           "park",
           "cemetery",
@@ -65,7 +65,7 @@ export function nolabels_layers(
       "source-layer": "landuse",
       filter: [
         "any",
-        ["in", "pmap:kind", "allotments", "village_green", "playground"],
+        ["in", "kind", "allotments", "village_green", "playground"],
       ],
       paint: {
         "fill-color": t.park_b,
@@ -77,7 +77,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "landuse",
-      filter: ["any", ["==", "pmap:kind", "hospital"]],
+      filter: ["any", ["==", "kind", "hospital"]],
       paint: {
         "fill-color": t.hospital,
       },
@@ -87,7 +87,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "landuse",
-      filter: ["any", ["==", "pmap:kind", "industrial"]],
+      filter: ["any", ["==", "kind", "industrial"]],
       paint: {
         "fill-color": t.industrial,
       },
@@ -97,7 +97,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "landuse",
-      filter: ["any", ["in", "pmap:kind", "school", "university", "college"]],
+      filter: ["any", ["in", "kind", "school", "university", "college"]],
       paint: {
         "fill-color": t.school,
       },
@@ -107,7 +107,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "landuse",
-      filter: ["any", ["in", "pmap:kind", "beach"]],
+      filter: ["any", ["in", "kind", "beach"]],
       paint: {
         "fill-color": t.beach,
       },
@@ -117,7 +117,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "landuse",
-      filter: ["any", ["in", "pmap:kind", "zoo"]],
+      filter: ["any", ["in", "kind", "zoo"]],
       paint: {
         "fill-color": t.zoo,
       },
@@ -129,7 +129,7 @@ export function nolabels_layers(
       "source-layer": "landuse",
       filter: [
         "any",
-        ["in", "pmap:kind", "military", "naval_base", "airfield"],
+        ["in", "kind", "military", "naval_base", "airfield"],
       ],
       paint: {
         "fill-color": t.zoo,
@@ -140,7 +140,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "natural",
-      filter: ["any", ["in", "pmap:kind", "wood", "nature_reserve", "forest"]],
+      filter: ["any", ["in", "kind", "wood", "nature_reserve", "forest"]],
       paint: {
         "fill-color": [
           "interpolate",
@@ -158,7 +158,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "natural",
-      filter: ["in", "pmap:kind", "scrub", "grassland", "grass"],
+      filter: ["in", "kind", "scrub", "grassland", "grass"],
       paint: {
         "fill-color": [
           "interpolate",
@@ -176,7 +176,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "natural",
-      filter: ["==", "pmap:kind", "glacier"],
+      filter: ["==", "kind", "glacier"],
       paint: {
         "fill-color": t.glacier,
       },
@@ -186,7 +186,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "natural",
-      filter: ["==", "pmap:kind", "sand"],
+      filter: ["==", "kind", "sand"],
       paint: {
         "fill-color": t.sand,
       },
@@ -196,7 +196,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "landuse",
-      filter: ["any", ["in", "pmap:kind", "aerodrome"]],
+      filter: ["any", ["in", "kind", "aerodrome"]],
       paint: {
         "fill-color": t.aerodrome,
       },
@@ -206,7 +206,7 @@ export function nolabels_layers(
       type: "line",
       source: source,
       "source-layer": "transit",
-      filter: ["any", ["in", "pmap:kind_detail", "runway"]],
+      filter: ["any", ["in", "kind_detail", "runway"]],
       paint: {
         "line-color": t.runway,
         "line-width": [
@@ -228,7 +228,7 @@ export function nolabels_layers(
       source: source,
       "source-layer": "transit",
       minzoom: 13,
-      filter: ["any", ["in", "pmap:kind_detail", "taxiway"]],
+      filter: ["any", ["in", "kind_detail", "taxiway"]],
       paint: {
         "line-color": t.runway,
         "line-width": [
@@ -252,7 +252,7 @@ export function nolabels_layers(
     //   minzoom: 14,
     //   filter: [
     //     "any",
-    //     ["in", "pmap:kind_detail", "runway", "taxiway"],
+    //     ["in", "kind_detail", "runway", "taxiway"],
     //   ],
     //   paint: {
     //     "fill-color": t.runway,
@@ -273,7 +273,7 @@ export function nolabels_layers(
       source: source,
       "source-layer": "physical_line",
       minzoom: 14,
-      filter: ["all", ["in", "pmap:kind", "stream"]],
+      filter: ["all", ["in", "kind", "stream"]],
       paint: {
         "line-color": t.water,
         "line-width": 0.5,
@@ -285,7 +285,7 @@ export function nolabels_layers(
       source: source,
       "source-layer": "physical_line",
       minzoom: 9,
-      filter: ["all", ["in", "pmap:kind", "river"]],
+      filter: ["all", ["in", "kind", "river"]],
       paint: {
         "line-color": t.water,
         "line-width": [
@@ -306,7 +306,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "landuse",
-      filter: ["any", ["==", "pmap:kind", "pedestrian"]],
+      filter: ["any", ["==", "kind", "pedestrian"]],
       paint: {
         "fill-color": t.pedestrian,
       },
@@ -316,7 +316,7 @@ export function nolabels_layers(
       type: "fill",
       source: source,
       "source-layer": "landuse",
-      filter: ["any", ["==", "pmap:kind", "pier"]],
+      filter: ["any", ["==", "kind", "pier"]],
       paint: {
         "fill-color": t.pier,
       },
@@ -328,8 +328,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["in", "pmap:kind", "other", "path"],
+        ["<", "level", 0],
+        ["in", "kind", "other", "path"],
       ],
       paint: {
         "line-color": t.tunnel_other_casing,
@@ -351,8 +351,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["==", "pmap:kind", "minor_road"],
+        ["<", "level", 0],
+        ["==", "kind", "minor_road"],
       ],
       paint: {
         "line-color": t.tunnel_minor_casing,
@@ -386,7 +386,7 @@ export function nolabels_layers(
       type: "line",
       source: source,
       "source-layer": "roads",
-      filter: ["all", ["<", "pmap:level", 0], ["==", "pmap:link", 1]],
+      filter: ["all", ["<", "level", 0], ["==", "link", 1]],
       paint: {
         "line-color": t.tunnel_link_casing,
         "line-dasharray": [3, 2],
@@ -419,8 +419,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["==", "pmap:kind", "medium_road"],
+        ["<", "level", 0],
+        ["==", "kind", "medium_road"],
       ],
       paint: {
         "line-color": t.tunnel_medium_casing,
@@ -454,8 +454,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["==", "pmap:kind", "major_road"],
+        ["<", "level", 0],
+        ["==", "kind", "major_road"],
       ],
       paint: {
         "line-color": t.tunnel_major_casing,
@@ -489,9 +489,9 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["==", "pmap:kind", "highway"],
-        ["!=", "pmap:link", 1],
+        ["<", "level", 0],
+        ["==", "kind", "highway"],
+        ["!=", "link", 1],
       ],
       paint: {
         "line-color": t.tunnel_highway_casing,
@@ -527,8 +527,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["in", "pmap:kind", "other", "path"],
+        ["<", "level", 0],
+        ["in", "kind", "other", "path"],
       ],
       paint: {
         "line-color": t.tunnel_other,
@@ -551,8 +551,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["==", "pmap:kind", "minor_road"],
+        ["<", "level", 0],
+        ["==", "kind", "minor_road"],
       ],
       paint: {
         "line-color": t.tunnel_minor,
@@ -576,7 +576,7 @@ export function nolabels_layers(
       type: "line",
       source: source,
       "source-layer": "roads",
-      filter: ["all", ["<", "pmap:level", 0], ["==", "pmap:link", 1]],
+      filter: ["all", ["<", "level", 0], ["==", "link", 1]],
       paint: {
         "line-color": t.tunnel_minor,
         "line-width": [
@@ -599,8 +599,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["==", "pmap:kind", "medium_road"],
+        ["<", "level", 0],
+        ["==", "kind", "medium_road"],
       ],
       paint: {
         "line-color": t.tunnel_medium,
@@ -626,8 +626,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["==", "pmap:kind", "major_road"],
+        ["<", "level", 0],
+        ["==", "kind", "major_road"],
       ],
       paint: {
         "line-color": t.tunnel_major,
@@ -653,9 +653,9 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["<", "pmap:level", 0],
-        ["==", "pmap:kind", "highway"],
-        ["!=", "pmap:link", 1],
+        ["<", "level", 0],
+        ["==", "kind", "highway"],
+        ["!=", "link", 1],
       ],
       paint: {
         "line-color": t.tunnel_highway,
@@ -691,7 +691,7 @@ export function nolabels_layers(
       type: "line",
       source: source,
       "source-layer": "transit",
-      filter: ["any", ["==", "pmap:kind", "pier"]],
+      filter: ["any", ["==", "kind", "pier"]],
       paint: {
         "line-color": t.transit_pier,
         "line-width": [
@@ -715,9 +715,9 @@ export function nolabels_layers(
       minzoom: 13,
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "minor_road"],
-        ["==", "pmap:kind_detail", "service"],
+        ["==", "level", 0],
+        ["==", "kind", "minor_road"],
+        ["==", "kind_detail", "service"],
       ],
       paint: {
         "line-color": t.minor_service_casing,
@@ -748,9 +748,9 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "minor_road"],
-        ["!=", "pmap:kind_detail", "service"],
+        ["==", "level", 0],
+        ["==", "kind", "minor_road"],
+        ["!=", "kind_detail", "service"],
       ],
       paint: {
         "line-color": t.minor_casing,
@@ -784,7 +784,7 @@ export function nolabels_layers(
       source: source,
       "source-layer": "roads",
       minzoom: 13,
-      filter: ["all", ["==", "pmap:link", 1]],
+      filter: ["all", ["==", "link", 1]],
       paint: {
         "line-color": t.minor_casing,
         "line-gap-width": [
@@ -816,8 +816,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "medium_road"],
+        ["==", "level", 0],
+        ["==", "kind", "medium_road"],
       ],
       paint: {
         "line-color": t.medium_casing,
@@ -853,8 +853,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "major_road"],
+        ["==", "level", 0],
+        ["==", "kind", "major_road"],
       ],
       paint: {
         "line-color": t.major_casing_late,
@@ -890,9 +890,9 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "highway"],
-        ["!=", "pmap:link", 1],
+        ["==", "level", 0],
+        ["==", "kind", "highway"],
+        ["!=", "link", 1],
       ],
       paint: {
         "line-color": t.highway_casing_late,
@@ -927,8 +927,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["in", "pmap:kind", "other", "path"],
+        ["==", "level", 0],
+        ["in", "kind", "other", "path"],
       ],
       paint: {
         "line-color": t.other,
@@ -949,7 +949,7 @@ export function nolabels_layers(
       type: "line",
       source: source,
       "source-layer": "roads",
-      filter: ["all", ["==", "pmap:link", 1]],
+      filter: ["all", ["==", "link", 1]],
       paint: {
         "line-color": t.link,
         "line-width": [
@@ -972,9 +972,9 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "minor_road"],
-        ["==", "pmap:kind_detail", "service"],
+        ["==", "level", 0],
+        ["==", "kind", "minor_road"],
+        ["==", "kind_detail", "service"],
       ],
       paint: {
         "line-color": t.minor_service,
@@ -996,9 +996,9 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "minor_road"],
-        ["!=", "pmap:kind_detail", "service"],
+        ["==", "level", 0],
+        ["==", "kind", "minor_road"],
+        ["!=", "kind_detail", "service"],
       ],
       paint: {
         "line-color": [
@@ -1032,8 +1032,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "medium_road"],
+        ["==", "level", 0],
+        ["==", "kind", "medium_road"],
       ],
       paint: {
         "line-color": t.medium,
@@ -1060,8 +1060,8 @@ export function nolabels_layers(
       maxzoom: 12,
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "major_road"],
+        ["==", "level", 0],
+        ["==", "kind", "major_road"],
       ],
       paint: {
         "line-color": t.major_casing_early,
@@ -1094,8 +1094,8 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "major_road"],
+        ["==", "level", 0],
+        ["==", "kind", "major_road"],
       ],
       paint: {
         "line-color": t.major,
@@ -1122,9 +1122,9 @@ export function nolabels_layers(
       maxzoom: 12,
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "highway"],
-        ["!=", "pmap:link", 1],
+        ["==", "level", 0],
+        ["==", "kind", "highway"],
+        ["!=", "link", 1],
       ],
       paint: {
         "line-color": t.highway_casing_early,
@@ -1157,9 +1157,9 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        ["==", "pmap:level", 0],
-        ["==", "pmap:kind", "highway"],
-        ["!=", "pmap:link", 1],
+        ["==", "level", 0],
+        ["==", "kind", "highway"],
+        ["!=", "link", 1],
       ],
       paint: {
         "line-color": t.highway,
@@ -1185,7 +1185,7 @@ export function nolabels_layers(
       type: "line",
       source: source,
       "source-layer": "transit",
-      filter: ["all", ["==", "pmap:kind", "rail"]],
+      filter: ["all", ["==", "kind", "rail"]],
       paint: {
         "line-dasharray": [0.3, 0.75],
         "line-opacity": 0.5,
@@ -1208,7 +1208,7 @@ export function nolabels_layers(
     //   type: "line",
     //   source: source,
     //   "source-layer": "transit",
-    //   filter: ["all", ["==", "pmap:kind", "rail"]],
+    //   filter: ["all", ["==", "kind", "rail"]],
     //   paint: {
     //     "line-color": t.railway_tracks,
     //     "line-width": 0.8,
@@ -1220,7 +1220,7 @@ export function nolabels_layers(
       type: "line",
       source: source,
       "source-layer": "boundaries",
-      filter: ["<=", "pmap:min_admin_level", 2],
+      filter: ["<=", "min_admin_level", 2],
       paint: {
         "line-color": t.boundaries,
         "line-width": 1,
@@ -1232,7 +1232,7 @@ export function nolabels_layers(
       type: "line",
       source: source,
       "source-layer": "boundaries",
-      filter: [">", "pmap:min_admin_level", 2],
+      filter: [">", "min_admin_level", 2],
       paint: {
         "line-color": t.boundaries,
         "line-width": 0.5,
@@ -1247,8 +1247,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["in", "pmap:kind", "other", "path"],
+        [">", "level", 0],
+        ["in", "kind", "other", "path"],
       ],
       paint: {
         "line-color": t.bridges_other_casing,
@@ -1269,7 +1269,7 @@ export function nolabels_layers(
       source: source,
       "source-layer": "roads",
       minzoom: 12,
-      filter: ["all", [">", "pmap:level", 0], ["==", "pmap:link", 1]],
+      filter: ["all", [">", "level", 0], ["==", "link", 1]],
       paint: {
         "line-color": t.bridges_minor_casing,
         "line-gap-width": [
@@ -1302,8 +1302,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["==", "pmap:kind", "minor_road"],
+        [">", "level", 0],
+        ["==", "kind", "minor_road"],
       ],
       paint: {
         "line-color": t.bridges_minor_casing,
@@ -1339,8 +1339,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["==", "pmap:kind", "medium_road"],
+        [">", "level", 0],
+        ["==", "kind", "medium_road"],
       ],
       paint: {
         "line-color": t.bridges_medium_casing,
@@ -1376,8 +1376,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["==", "pmap:kind", "major_road"],
+        [">", "level", 0],
+        ["==", "kind", "major_road"],
       ],
       paint: {
         "line-color": t.bridges_major_casing,
@@ -1409,7 +1409,7 @@ export function nolabels_layers(
     //   source: source,
     //   "source-layer": "roads",
     //   minzoom: 12,
-    //   filter: ["all", [">", "pmap:level", 0], ["==", "pmap:kind", "highway"], ["!=", "pmap:link", 1]],
+    //   filter: ["all", [">", "level", 0], ["==", "kind", "highway"], ["!=", "link", 1]],
     //   paint: {
     //     "line-color": t.bridges_highway_casing,
     //     "line-gap-width": [
@@ -1445,8 +1445,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["in", "pmap:kind", "other", "path"],
+        [">", "level", 0],
+        ["in", "kind", "other", "path"],
       ],
       paint: {
         "line-color": t.bridges_other,
@@ -1470,8 +1470,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["==", "pmap:kind", "minor_road"],
+        [">", "level", 0],
+        ["==", "kind", "minor_road"],
       ],
       paint: {
         "line-color": t.bridges_minor,
@@ -1496,7 +1496,7 @@ export function nolabels_layers(
       source: source,
       "source-layer": "roads",
       minzoom: 12,
-      filter: ["all", [">", "pmap:level", 0], ["==", "pmap:link", 1]],
+      filter: ["all", [">", "level", 0], ["==", "link", 1]],
       paint: {
         "line-color": t.bridges_minor,
         "line-width": [
@@ -1520,8 +1520,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["==", "pmap:kind", "medium_road"],
+        [">", "level", 0],
+        ["==", "kind", "medium_road"],
       ],
       paint: {
         "line-color": t.bridges_medium,
@@ -1548,8 +1548,8 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["==", "pmap:kind", "major_road"],
+        [">", "level", 0],
+        ["==", "kind", "major_road"],
       ],
       paint: {
         "line-color": t.bridges_major,
@@ -1576,9 +1576,9 @@ export function nolabels_layers(
       minzoom: 12,
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["==", "pmap:kind", "highway"],
-        ["!=", "pmap:link", 1],
+        [">", "level", 0],
+        ["==", "kind", "highway"],
+        ["!=", "link", 1],
       ],
       paint: {
         "line-color": t.bridges_highway_casing,
@@ -1613,9 +1613,9 @@ export function nolabels_layers(
       "source-layer": "roads",
       filter: [
         "all",
-        [">", "pmap:level", 0],
-        ["==", "pmap:kind", "highway"],
-        ["!=", "pmap:link", 1],
+        [">", "level", 0],
+        ["==", "kind", "highway"],
+        ["!=", "link", 1],
       ],
       paint: {
         "line-color": t.bridges_highway,
@@ -1652,7 +1652,7 @@ export function labels_layers(
       source: source,
       "source-layer": "physical_line",
       minzoom: 13,
-      filter: ["all", ["in", "pmap:kind", "river", "stream"]],
+      filter: ["all", ["in", "kind", "river", "stream"]],
       layout: {
         "symbol-placement": "line",
         "text-font": ["Noto Sans Regular"],
@@ -1672,7 +1672,7 @@ export function labels_layers(
       type: "symbol",
       source: source,
       "source-layer": "physical_point",
-      filter: ["any", ["==", "pmap:kind", "peak"]],
+      filter: ["any", ["==", "kind", "peak"]],
       layout: {
         "text-font": ["Noto Sans Italic"],
         "text-field": get_multiline_name(
@@ -1694,9 +1694,9 @@ export function labels_layers(
       source: source,
       "source-layer": "roads",
       minzoom: 15,
-      filter: ["any", ["in", "pmap:kind", "minor_road", "other", "path"]],
+      filter: ["any", ["in", "kind", "minor_road", "other", "path"]],
       layout: {
-        "symbol-sort-key": ["get", "pmap:min_zoom"],
+        "symbol-sort-key": ["get", "min_zoom"],
         "symbol-placement": "line",
         "text-font": ["Noto Sans Regular"],
         "text-field": get_multiline_name(
@@ -1720,7 +1720,7 @@ export function labels_layers(
         "any",
         [
           "in",
-          "pmap:kind",
+          "kind",
           "sea",
           "ocean",
           "lake",
@@ -1750,7 +1750,7 @@ export function labels_layers(
       type: "symbol",
       source: source,
       "source-layer": "physical_point",
-      filter: ["any", ["in", "pmap:kind", "lake", "water"]],
+      filter: ["any", ["in", "kind", "lake", "water"]],
       layout: {
         "text-font": ["Noto Sans Medium"],
         "text-field": get_multiline_name(
@@ -1773,10 +1773,10 @@ export function labels_layers(
       minzoom: 11,
       filter: [
         "any",
-        ["in", "pmap:kind", "highway", "major_road", "medium_road"],
+        ["in", "kind", "highway", "major_road", "medium_road"],
       ],
       layout: {
-        "symbol-sort-key": ["get", "pmap:min_zoom"],
+        "symbol-sort-key": ["get", "min_zoom"],
         "symbol-placement": "line",
         "text-font": ["Noto Sans Regular"],
         "text-field": get_multiline_name(
@@ -1796,9 +1796,9 @@ export function labels_layers(
       type: "symbol",
       source: source,
       "source-layer": "places",
-      filter: ["==", "pmap:kind", "neighbourhood"],
+      filter: ["==", "kind", "neighbourhood"],
       layout: {
-        "symbol-sort-key": ["get", "pmap:min_zoom"],
+        "symbol-sort-key": ["get", "min_zoom"],
         "text-field": get_multiline_name(
           lang,
           script,
@@ -1843,7 +1843,7 @@ export function labels_layers(
       type: "symbol",
       source: source,
       "source-layer": "places",
-      filter: ["==", "pmap:kind", "locality"],
+      filter: ["==", "kind", "locality"],
       layout: {
         "icon-image": ["step", ["zoom"], "townspot", 8, ""],
         "icon-size": 0.7,
@@ -1853,7 +1853,7 @@ export function labels_layers(
         ) as DataDrivenPropertyValueSpecification<string>,
         "text-font": [
           "case",
-          ["<=", ["get", "pmap:min_zoom"], 5],
+          ["<=", ["get", "min_zoom"], 5],
           ["literal", ["Noto Sans Medium"]],
           ["literal", ["Noto Sans Regular"]],
         ],
@@ -1875,54 +1875,54 @@ export function labels_layers(
           2,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 13],
+            ["<", ["get", "population_rank"], 13],
             8,
-            [">=", ["get", "pmap:population_rank"], 13],
+            [">=", ["get", "population_rank"], 13],
             13,
             0,
           ],
           4,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 13],
+            ["<", ["get", "population_rank"], 13],
             10,
-            [">=", ["get", "pmap:population_rank"], 13],
+            [">=", ["get", "population_rank"], 13],
             15,
             0,
           ],
           6,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 12],
+            ["<", ["get", "population_rank"], 12],
             11,
-            [">=", ["get", "pmap:population_rank"], 12],
+            [">=", ["get", "population_rank"], 12],
             17,
             0,
           ],
           8,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 11],
+            ["<", ["get", "population_rank"], 11],
             11,
-            [">=", ["get", "pmap:population_rank"], 11],
+            [">=", ["get", "population_rank"], 11],
             18,
             0,
           ],
           10,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 9],
+            ["<", ["get", "population_rank"], 9],
             12,
-            [">=", ["get", "pmap:population_rank"], 9],
+            [">=", ["get", "population_rank"], 9],
             20,
             0,
           ],
           15,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 8],
+            ["<", ["get", "population_rank"], 8],
             12,
-            [">=", ["get", "pmap:population_rank"], 8],
+            [">=", ["get", "population_rank"], 8],
             22,
             0,
           ],
@@ -1956,9 +1956,9 @@ export function labels_layers(
       type: "symbol",
       source: source,
       "source-layer": "places",
-      filter: ["==", "pmap:kind", "region"],
+      filter: ["==", "kind", "region"],
       layout: {
-        "symbol-sort-key": ["get", "pmap:min_zoom"],
+        "symbol-sort-key": ["get", "min_zoom"],
         "text-field": [
           "step",
           ["zoom"],
@@ -1983,9 +1983,9 @@ export function labels_layers(
       type: "symbol",
       source: source,
       "source-layer": "places",
-      filter: ["==", "pmap:kind", "country"],
+      filter: ["==", "kind", "country"],
       layout: {
-        "symbol-sort-key": ["get", "pmap:min_zoom"],
+        "symbol-sort-key": ["get", "min_zoom"],
         "text-field": get_country_name(
           lang,
           script,
@@ -1998,27 +1998,27 @@ export function labels_layers(
           2,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 10],
+            ["<", ["get", "population_rank"], 10],
             8,
-            [">=", ["get", "pmap:population_rank"], 10],
+            [">=", ["get", "population_rank"], 10],
             12,
             0,
           ],
           6,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 8],
+            ["<", ["get", "population_rank"], 8],
             10,
-            [">=", ["get", "pmap:population_rank"], 8],
+            [">=", ["get", "population_rank"], 8],
             18,
             0,
           ],
           8,
           [
             "case",
-            ["<", ["get", "pmap:population_rank"], 7],
+            ["<", ["get", "population_rank"], 7],
             11,
-            [">=", ["get", "pmap:population_rank"], 7],
+            [">=", ["get", "population_rank"], 7],
             20,
             0,
           ],
diff --git a/styles/src/language.ts b/styles/src/language.ts
index aefcb920..af5bca66 100644
--- a/styles/src/language.ts
+++ b/styles/src/language.ts
@@ -12,13 +12,13 @@ function get_name_block(script_segment: "name" | "name2" | "name3") {
   return [
     [
       "coalesce",
-      ["get", `pmap:pgf:${script_segment}`],
+      ["get", `pgf:${script_segment}`],
       ["get", script_segment],
     ],
     {
       "text-font": [
         "case",
-        ["==", ["get", `pmap:${script}`], "Devanagari"],
+        ["==", ["get", script], "Devanagari"],
         ["literal", ["Noto Sans Devanagari Regular v1"]],
         ["literal", ["Noto Sans Regular"]],
       ],
@@ -41,20 +41,20 @@ function is_not_in_target_script(
   }
 
   if (script === "Latin") {
-    return ["has", `pmap:script${suffix}`];
+    return ["has", `script${suffix}`];
   }
 
   if (lang === "ja") {
     return [
       "all",
-      ["!=", ["get", `pmap:script${suffix}`], "Han"],
-      ["!=", ["get", `pmap:script${suffix}`], "Hiragana"],
-      ["!=", ["get", `pmap:script${suffix}`], "Katakana"],
-      ["!=", ["get", `pmap:script${suffix}`], "Mixed-Japanese"],
+      ["!=", ["get", `script${suffix}`], "Han"],
+      ["!=", ["get", `script${suffix}`], "Hiragana"],
+      ["!=", ["get", `script${suffix}`], "Katakana"],
+      ["!=", ["get", `script${suffix}`], "Mixed-Japanese"],
     ];
   }
 
-  return ["!=", ["get", `pmap:script${suffix}`], script];
+  return ["!=", ["get", `script${suffix}`], script];
 }
 
 function get_font_formatting(script: string) {
@@ -75,7 +75,7 @@ export function get_country_name(lang: string, script?: string) {
   const _script = script || get_default_script(lang);
   let name_prefix: string;
   if (_script === "Devanagari") {
-    name_prefix = "pmap:pgf:";
+    name_prefix = "pgf:";
   } else {
     name_prefix = "";
   }
@@ -90,7 +90,7 @@ export function get_multiline_name(lang: string, script?: string) {
   const _script = script || get_default_script(lang);
   let name_prefix: string;
   if (_script === "Devanagari") {
-    name_prefix = "pmap:pgf:";
+    name_prefix = "pgf:";
   } else {
     name_prefix = "";
   }
@@ -99,9 +99,9 @@ export function get_multiline_name(lang: string, script?: string) {
     "case",
     [
       "all",
-      ["any", ["has", "name"], ["has", "pmap:pgf:name"]],
-      ["!", ["any", ["has", "name2"], ["has", "pmap:pgf:name2"]]],
-      ["!", ["any", ["has", "name3"], ["has", "pmap:pgf:name3"]]],
+      ["any", ["has", "name"], ["has", "pgf:name"]],
+      ["!", ["any", ["has", "name2"], ["has", "pgf:name2"]]],
+      ["!", ["any", ["has", "name3"], ["has", "pgf:name3"]]],
     ],
     // The local name has 1 script segment: `name`
     [
@@ -113,7 +113,7 @@ export function get_multiline_name(lang: string, script?: string) {
         [
           "any",
           ["is-supported-script", ["get", "name"]],
-          ["has", "pmap:pgf:name"],
+          ["has", "pgf:name"],
         ],
         // `name` can be rendered correctly
         [
@@ -132,16 +132,16 @@ export function get_multiline_name(lang: string, script?: string) {
               "all",
               ["!", ["has", `${name_prefix}name:${lang}`]],
               ["has", "name:en"],
-              ["!", ["has", "pmap:script"]],
+              ["!", ["has", "script"]],
             ],
             // We did fallback to English in the first line and `name` is Latin
             "",
-            ["coalesce", ["get", "pmap:pgf:name"], ["get", "name"]],
+            ["coalesce", ["get", "pgf:name"], ["get", "name"]],
           ],
           {
             "text-font": [
               "case",
-              ["==", ["get", "pmap:script"], "Devanagari"],
+              ["==", ["get", "script"], "Devanagari"],
               ["literal", ["Noto Sans Devanagari Regular v1"]],
               ["literal", ["Noto Sans Regular"]],
             ],
@@ -156,7 +156,7 @@ export function get_multiline_name(lang: string, script?: string) {
         [
           "coalesce",
           ["get", `${name_prefix}name:${lang}`],
-          ["get", "pmap:pgf:name"],
+          ["get", "pgf:name"],
           ["get", "name"],
         ],
         get_font_formatting(_script),
@@ -164,9 +164,9 @@ export function get_multiline_name(lang: string, script?: string) {
     ],
     [
       "all",
-      ["any", ["has", "name"], ["has", "pmap:pgf:name"]],
-      ["any", ["has", "name2"], ["has", "pmap:pgf:name2"]],
-      ["!", ["any", ["has", "name3"], ["has", "pmap:pgf:name3"]]],
+      ["any", ["has", "name"], ["has", "pgf:name"]],
+      ["any", ["has", "name2"], ["has", "pgf:name2"]],
+      ["!", ["any", ["has", "name3"], ["has", "pgf:name3"]]],
     ],
     // The local name has 2 script segments: `name` and `name2`
     [
@@ -198,7 +198,7 @@ export function get_multiline_name(lang: string, script?: string) {
           [
             "coalesce",
             ["get", `${name_prefix}name:${lang}`],
-            ["get", "pmap:pgf:name"],
+            ["get", "pgf:name"],
             ["get", "name"],
           ],
           get_font_formatting(_script),
@@ -212,7 +212,7 @@ export function get_multiline_name(lang: string, script?: string) {
           [
             "coalesce",
             ["get", `${name_prefix}name:${lang}`],
-            ["get", "pmap:pgf:name2"],
+            ["get", "pgf:name2"],
             ["get", "name2"],
           ],
           get_font_formatting(_script),
@@ -256,7 +256,7 @@ export function get_multiline_name(lang: string, script?: string) {
           [
             "coalesce",
             ["get", `${name_prefix}name:${lang}`],
-            ["get", "pmap:pgf:name"],
+            ["get", "pgf:name"],
             ["get", "name"],
           ],
           get_font_formatting(_script),
@@ -274,7 +274,7 @@ export function get_multiline_name(lang: string, script?: string) {
           [
             "coalesce",
             ["get", `${name_prefix}name:${lang}`],
-            ["get", "pmap:pgf:name2"],
+            ["get", "pgf:name2"],
             ["get", "name2"],
           ],
           get_font_formatting(_script),
@@ -291,7 +291,7 @@ export function get_multiline_name(lang: string, script?: string) {
           [
             "coalesce",
             ["get", `${name_prefix}name:${lang}`],
-            ["get", "pmap:pgf:name3"],
+            ["get", "pgf:name3"],
             ["get", "name3"],
           ],
           get_font_formatting(_script),