diff --git a/src/Domain/style.domain-land-sea-karatsu-10nm.json b/src/Domain/style.domain-land-sea-karatsu-10nm.json
new file mode 100644
index 0000000..ea12890
--- /dev/null
+++ b/src/Domain/style.domain-land-sea-karatsu-10nm.json
@@ -0,0 +1,151 @@
+{
+  "version": 8,
+  "name": "NavSea Domain Land Sea Karatsu 10nm",
+  "glyphs": "https://tile.mapple-on.jp/glyphs/{fontstack}/{range}.pbf",
+  "sources": {
+    "domain_safety": {
+      "type": "vector",
+      "minzoom": 0,
+      "maxzoom": 12,
+      "tiles": [
+        "http://192.168.200.184/pbf-domain-karatsu-10nm/safety/{z}/{x}/{y}.pbf"
+      ],
+      "attribution": "© NavSea Domain"
+    },
+    "domain_detail": {
+      "type": "vector",
+      "minzoom": 0,
+      "maxzoom": 12,
+      "tiles": [
+        "http://192.168.200.184/pbf-domain-karatsu-10nm/detail/{z}/{x}/{y}.pbf"
+      ],
+      "attribution": "© NavSea Domain"
+    }
+  },
+  "layers": [
+    {
+      "id": "sea-background",
+      "type": "background",
+      "paint": {
+        "background-color": "#cfe4ea"
+      }
+    },
+    {
+      "id": "land-area",
+      "type": "fill",
+      "source": "domain_safety",
+      "source-layer": "land_area",
+      "paint": {
+        "fill-color": "#dfcfac",
+        "fill-opacity": 1
+      }
+    },
+    {
+      "id": "coast-structure-area",
+      "type": "fill",
+      "source": "domain_safety",
+      "source-layer": "onshore_structure_area",
+      "paint": {
+        "fill-color": "#8f8a7b",
+        "fill-opacity": 0.82
+      }
+    },
+    {
+      "id": "coast-structure-line",
+      "type": "line",
+      "source": "domain_safety",
+      "source-layer": "onshore_structure_line",
+      "paint": {
+        "line-color": "#5f5b4e",
+        "line-width": [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          5, 0.8,
+          10, 1.8,
+          12, 2.4
+        ]
+      }
+    },
+    {
+      "id": "baseline-line",
+      "type": "line",
+      "source": "domain_safety",
+      "source-layer": "baseline_line",
+      "paint": {
+        "line-color": "#676253",
+        "line-width": [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          5, 0.5,
+          10, 1.1,
+          12, 1.4
+        ]
+      }
+    },
+    {
+      "id": "baseline-outline",
+      "type": "line",
+      "source": "domain_safety",
+      "source-layer": "baseline_outline",
+      "paint": {
+        "line-color": "#6e6959",
+        "line-width": [
+          "interpolate",
+          ["linear"],
+          ["zoom"],
+          5, 0.5,
+          10, 1.0,
+          12, 1.2
+        ],
+        "line-opacity": 0.7
+      }
+    },
+    {
+      "id": "depth-contour-overview",
+      "type": "line",
+      "source": "domain_safety",
+      "source-layer": "depth_contour_overview",
+      "paint": {
+        "line-color": "#8fd6a8",
+        "line-width": 1,
+        "line-opacity": 0.85
+      }
+    },
+    {
+      "id": "depth-contour",
+      "type": "line",
+      "source": "domain_safety",
+      "source-layer": "depth_contour",
+      "paint": {
+        "line-color": "#65c684",
+        "line-width": 1.1,
+        "line-opacity": 0.9
+      }
+    },
+    {
+      "id": "depth-labels",
+      "type": "symbol",
+      "source": "domain_safety",
+      "source-layer": "depth_contour",
+      "minzoom": 10,
+      "layout": {
+        "symbol-placement": "line",
+        "text-field": [
+          "coalesce",
+          ["get", "chart_label_text"],
+          ["to-string", ["get", "depth_value_m"]],
+          ["to-string", ["get", "least_depth_m"]]
+        ],
+        "text-size": 11,
+        "symbol-spacing": 140
+      },
+      "paint": {
+        "text-color": "#36525a",
+        "text-halo-color": "rgba(255,255,255,0.75)",
+        "text-halo-width": 1
+      }
+    }
+  ]
+}
diff --git a/src/pbf/style.navsea-delivery-karatsu-10nm.json b/src/pbf/style.navsea-delivery-karatsu-10nm.json
index 5d73112..24133e6 100644
--- a/src/pbf/style.navsea-delivery-karatsu-10nm.json
+++ b/src/pbf/style.navsea-delivery-karatsu-10nm.json
@@ -46,7 +46,7 @@
       "id": "sea-area-fill",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -204,7 +204,7 @@
       "id": "tidal-flat",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -233,7 +233,7 @@
       "id": "river-water",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -268,7 +268,7 @@
       "id": "unsurveyed-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -297,7 +297,7 @@
       "id": "shoal-danger-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -326,7 +326,7 @@
       "id": "coast-structures-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -361,7 +361,7 @@
       "id": "hazard-polygons",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P投錨注意障害物",
+      "source-layer": "anchor_caution_hazard_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -377,7 +377,7 @@
       "id": "navigation-hazard-polygons",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P航行危険障害物",
+      "source-layer": "navigation_hazard_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -393,7 +393,7 @@
       "id": "fishery-areas",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P漁具定置箇所",
+      "source-layer": "fixed_fishing_gear_area",
       "paint": {
         "fill-color": "#7eb36a",
         "fill-opacity": 0.4,
@@ -404,7 +404,7 @@
       "id": "anchorage-areas",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P錨泊地等",
+      "source-layer": "anchorage_area",
       "paint": {
         "fill-color": "rgba(0,0,0,0)"
       }
@@ -413,7 +413,7 @@
       "id": "facility-zones",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P施設・境界線等",
+      "source-layer": "facility_boundary_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -429,7 +429,7 @@
       "id": "submerged-structures",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P潜堤",
+      "source-layer": "submerged_reef_area",
       "paint": {
         "fill-color": "#7d7f95",
         "fill-opacity": 0.45,
@@ -440,7 +440,7 @@
       "id": "bridge-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P橋りょう等構造物",
+      "source-layer": "bridge_structure",
       "paint": {
         "fill-color": "#74685d",
         "fill-opacity": 0.8
@@ -450,7 +450,7 @@
       "id": "land-structures-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P陸上構造物陸",
+      "source-layer": "onshore_structure_area",
       "paint": {
         "fill-color": "#8a6d3b",
         "fill-opacity": 0.8
@@ -460,7 +460,7 @@
       "id": "land-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P陸域",
+      "source-layer": "land_area",
       "paint": {
         "fill-color": "#d8caa2",
         "fill-opacity": 0.92
@@ -470,7 +470,7 @@
       "id": "land-hole",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P穴",
+      "source-layer": "hole_area",
       "paint": {
         "fill-color": "#c6cdb2"
       }
@@ -479,7 +479,7 @@
       "id": "bathymetry-support",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L海底地形",
+      "source-layer": "bathymetry_line",
       "paint": {
         "line-color": "#86aabb",
         "line-width": 0.5,
@@ -490,7 +490,7 @@
       "id": "depth-contours",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L等深線",
+      "source-layer": "depth_contour",
       "paint": {
         "line-color": "#3d7992",
         "line-width": [
@@ -515,7 +515,7 @@
       "id": "depth-contours-major",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L概略等深線",
+      "source-layer": "depth_contour_overview",
       "paint": {
         "line-color": "#1f5a72",
         "line-width": [
@@ -540,7 +540,7 @@
       "id": "depth-contour-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "L等深線",
+      "source-layer": "depth_contour",
       "minzoom": 11,
       "layout": {
         "visibility": "none",
@@ -594,7 +594,7 @@
       "id": "bathymetry-depth-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "L海底地形",
+      "source-layer": "bathymetry_line",
       "minzoom": 11,
       "filter": [
         "all",
@@ -633,7 +633,7 @@
       "id": "subsea-cables",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L海底線",
+      "source-layer": "seabed_line",
       "paint": {
         "line-color": "#814d99",
         "line-width": 1.3,
@@ -647,7 +647,7 @@
       "id": "coast-structures-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L基本線",
+      "source-layer": "baseline_line",
       "paint": {
         "line-color": "#5f5a50",
         "line-width": 1.4
@@ -657,7 +657,7 @@
       "id": "land-structures-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L陸上構造物陸",
+      "source-layer": "onshore_structure_line",
       "paint": {
         "line-color": "#7d602d",
         "line-width": 1
@@ -667,7 +667,7 @@
       "id": "water-boundary",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L739",
+      "source-layer": "depth_zone_739",
       "paint": {
         "line-color": "#4f8ca7",
         "line-width": 1.1
@@ -677,7 +677,7 @@
       "id": "regulatory-boundary",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L741",
+      "source-layer": "depth_zone_741",
       "paint": {
         "line-color": "#cb5c46",
         "line-width": 1.2,
@@ -691,7 +691,7 @@
       "id": "height-limit-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L高さ制限",
+      "source-layer": "clearance_limit_line",
       "paint": {
         "line-color": "#ad3b6a",
         "line-width": 1.1
@@ -701,7 +701,7 @@
       "id": "clip-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P基本線ククリ",
+      "source-layer": "baseline_outline",
       "paint": {
         "line-color": "#7c7567",
         "line-width": 1
@@ -711,7 +711,7 @@
       "id": "danger-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P危険界ククリ",
+      "source-layer": "hazard_boundary_outline",
       "paint": {
         "line-color": "#c65e2d",
         "line-width": 1.2,
@@ -725,7 +725,7 @@
       "id": "navigation-hazard-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P航行危険障害物ククリ",
+      "source-layer": "navigation_hazard_outline",
       "paint": {
         "line-width": [
           "coalesce",
@@ -749,7 +749,7 @@
       "id": "anchor-danger-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P投錨注意障害物ククリ",
+      "source-layer": "anchor_caution_hazard_outline",
       "paint": {
         "line-width": [
           "coalesce",
@@ -773,7 +773,7 @@
       "id": "anchorage-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P錨泊地等ククリ",
+      "source-layer": "anchorage_outline",
       "paint": {
         "line-color": [
           "coalesce",
@@ -801,7 +801,7 @@
       "id": "facility-zone-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P施設・境界線等ククリ",
+      "source-layer": "facility_boundary_outline",
       "paint": {
         "line-color": [
           "coalesce",
@@ -825,7 +825,7 @@
       "id": "special-pattern-line-754",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P754ククリ",
+      "source-layer": "clip_outline_754",
       "paint": {
         "line-pattern": "line-daytime-754",
         "line-width": 8
@@ -835,7 +835,7 @@
       "id": "hazard-points",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航行危険障害物",
+      "source-layer": "navigation_hazard_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -852,7 +852,7 @@
       "id": "anchorage-symbols",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p錨泊地等",
+      "source-layer": "anchorage_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -869,7 +869,7 @@
       "id": "anchor-hazard-points",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p投錨注意障害物",
+      "source-layer": "anchor_caution_hazard_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -886,7 +886,7 @@
       "id": "nav-light-flare",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -919,7 +919,7 @@
       "id": "nav-marks",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -936,7 +936,7 @@
       "id": "facility-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p施設・境界線等",
+      "source-layer": "facility_boundary_point",
       "paint": {
         "circle-radius": 3.5,
         "circle-color": "#516f89",
@@ -948,7 +948,7 @@
       "id": "landmark-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p陸上構造物",
+      "source-layer": "onshore_structure_point",
       "paint": {
         "circle-radius": 3,
         "circle-color": "#695641",
@@ -960,7 +960,7 @@
       "id": "bottom-material-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p底質",
+      "source-layer": "seabed_text_point",
       "paint": {
         "circle-radius": 1.8,
         "circle-color": "#3e7081",
@@ -971,7 +971,7 @@
       "id": "bottom-material-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p底質",
+      "source-layer": "seabed_text_point",
       "minzoom": 11,
       "filter": [
         "has",
@@ -1014,7 +1014,7 @@
       "id": "height-limit-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p高さ制限",
+      "source-layer": "clearance_limit_point",
       "paint": {
         "circle-radius": 3.5,
         "circle-color": "#ab355f",
@@ -1026,7 +1026,7 @@
       "id": "nav-mark-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "text-allow-overlap": true,
         "text-max-width": 100,
@@ -1163,7 +1163,7 @@
       "id": "nav-light-abbr-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "text-allow-overlap": true,
         "text-max-width": 100,
@@ -1307,7 +1307,7 @@
       "id": "place-labels-sea",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p地名",
+      "source-layer": "place_label_sea",
       "layout": {
         "text-field": [
           "get",
@@ -1349,7 +1349,7 @@
       "id": "place-labels-land",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p地名陸",
+      "source-layer": "place_label_land",
       "layout": {
         "text-field": [
           "get",
diff --git a/src/pbf/style.navsea-engineering-karatsu-10nm.json b/src/pbf/style.navsea-engineering-karatsu-10nm.json
index 79e9222..f491a2e 100644
--- a/src/pbf/style.navsea-engineering-karatsu-10nm.json
+++ b/src/pbf/style.navsea-engineering-karatsu-10nm.json
@@ -46,7 +46,7 @@
       "id": "sea-area-fill",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -204,7 +204,7 @@
       "id": "tidal-flat",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -233,7 +233,7 @@
       "id": "river-water",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -268,7 +268,7 @@
       "id": "unsurveyed-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -297,7 +297,7 @@
       "id": "shoal-danger-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -326,7 +326,7 @@
       "id": "coast-structures-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -361,7 +361,7 @@
       "id": "hazard-polygons",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P投錨注意障害物",
+      "source-layer": "anchor_caution_hazard_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -377,7 +377,7 @@
       "id": "navigation-hazard-polygons",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P航行危険障害物",
+      "source-layer": "navigation_hazard_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -393,7 +393,7 @@
       "id": "fishery-areas",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P漁具定置箇所",
+      "source-layer": "fixed_fishing_gear_area",
       "paint": {
         "fill-color": "#7eb36a",
         "fill-opacity": 0.4,
@@ -404,7 +404,7 @@
       "id": "anchorage-areas",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P錨泊地等",
+      "source-layer": "anchorage_area",
       "paint": {
         "fill-color": "rgba(0,0,0,0)"
       }
@@ -413,7 +413,7 @@
       "id": "facility-zones",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P施設・境界線等",
+      "source-layer": "facility_boundary_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -429,7 +429,7 @@
       "id": "submerged-structures",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P潜堤",
+      "source-layer": "submerged_reef_area",
       "paint": {
         "fill-color": "#7d7f95",
         "fill-opacity": 0.45,
@@ -440,7 +440,7 @@
       "id": "bridge-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P橋りょう等構造物",
+      "source-layer": "bridge_structure",
       "paint": {
         "fill-color": "#74685d",
         "fill-opacity": 0.8
@@ -450,7 +450,7 @@
       "id": "land-structures-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P陸上構造物陸",
+      "source-layer": "onshore_structure_area",
       "paint": {
         "fill-color": "#8a6d3b",
         "fill-opacity": 0.8
@@ -460,7 +460,7 @@
       "id": "land-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P陸域",
+      "source-layer": "land_area",
       "paint": {
         "fill-color": "#d8caa2",
         "fill-opacity": 0.92
@@ -470,7 +470,7 @@
       "id": "land-hole",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P穴",
+      "source-layer": "hole_area",
       "paint": {
         "fill-color": "#c6cdb2"
       }
@@ -479,7 +479,7 @@
       "id": "bathymetry-support",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L海底地形",
+      "source-layer": "bathymetry_line",
       "paint": {
         "line-color": "#86aabb",
         "line-width": 0.5,
@@ -490,7 +490,7 @@
       "id": "depth-contours",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L等深線",
+      "source-layer": "depth_contour",
       "paint": {
         "line-color": "#3d7992",
         "line-width": [
@@ -515,7 +515,7 @@
       "id": "depth-contours-major",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L概略等深線",
+      "source-layer": "depth_contour_overview",
       "paint": {
         "line-color": "#1f5a72",
         "line-width": [
@@ -540,7 +540,7 @@
       "id": "depth-contour-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "L等深線",
+      "source-layer": "depth_contour",
       "minzoom": 11,
       "layout": {
         "visibility": "none",
@@ -594,7 +594,7 @@
       "id": "bathymetry-depth-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "L海底地形",
+      "source-layer": "bathymetry_line",
       "minzoom": 11,
       "filter": [
         "all",
@@ -633,7 +633,7 @@
       "id": "subsea-cables",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L海底線",
+      "source-layer": "seabed_line",
       "paint": {
         "line-color": "#814d99",
         "line-width": 1.3,
@@ -647,7 +647,7 @@
       "id": "coast-structures-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L基本線",
+      "source-layer": "baseline_line",
       "paint": {
         "line-color": "#5f5a50",
         "line-width": 1.4
@@ -657,7 +657,7 @@
       "id": "land-structures-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L陸上構造物陸",
+      "source-layer": "onshore_structure_line",
       "paint": {
         "line-color": "#7d602d",
         "line-width": 1
@@ -667,7 +667,7 @@
       "id": "water-boundary",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L739",
+      "source-layer": "depth_zone_739",
       "paint": {
         "line-color": "#4f8ca7",
         "line-width": 1.1
@@ -677,7 +677,7 @@
       "id": "regulatory-boundary",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L741",
+      "source-layer": "depth_zone_741",
       "paint": {
         "line-color": "#cb5c46",
         "line-width": 1.2,
@@ -691,7 +691,7 @@
       "id": "height-limit-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L高さ制限",
+      "source-layer": "clearance_limit_line",
       "paint": {
         "line-color": "#ad3b6a",
         "line-width": 1.1
@@ -701,7 +701,7 @@
       "id": "clip-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P基本線ククリ",
+      "source-layer": "baseline_outline",
       "paint": {
         "line-color": "#7c7567",
         "line-width": 1
@@ -711,7 +711,7 @@
       "id": "danger-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P危険界ククリ",
+      "source-layer": "hazard_boundary_outline",
       "paint": {
         "line-color": "#c65e2d",
         "line-width": 1.2,
@@ -725,7 +725,7 @@
       "id": "navigation-hazard-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P航行危険障害物ククリ",
+      "source-layer": "navigation_hazard_outline",
       "paint": {
         "line-width": [
           "coalesce",
@@ -749,7 +749,7 @@
       "id": "anchor-danger-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P投錨注意障害物ククリ",
+      "source-layer": "anchor_caution_hazard_outline",
       "paint": {
         "line-width": [
           "coalesce",
@@ -773,7 +773,7 @@
       "id": "anchorage-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P錨泊地等ククリ",
+      "source-layer": "anchorage_outline",
       "paint": {
         "line-color": [
           "coalesce",
@@ -801,7 +801,7 @@
       "id": "facility-zone-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P施設・境界線等ククリ",
+      "source-layer": "facility_boundary_outline",
       "paint": {
         "line-color": [
           "coalesce",
@@ -825,7 +825,7 @@
       "id": "special-pattern-line-754",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P754ククリ",
+      "source-layer": "clip_outline_754",
       "paint": {
         "line-pattern": "line-daytime-754",
         "line-width": 8
@@ -835,7 +835,7 @@
       "id": "hazard-points",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航行危険障害物",
+      "source-layer": "navigation_hazard_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -852,7 +852,7 @@
       "id": "anchorage-symbols",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p錨泊地等",
+      "source-layer": "anchorage_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -869,7 +869,7 @@
       "id": "anchor-hazard-points",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p投錨注意障害物",
+      "source-layer": "anchor_caution_hazard_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -886,7 +886,7 @@
       "id": "nav-light-flare",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -919,7 +919,7 @@
       "id": "nav-marks",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -936,7 +936,7 @@
       "id": "facility-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p施設・境界線等",
+      "source-layer": "facility_boundary_point",
       "paint": {
         "circle-radius": 3.5,
         "circle-color": "#516f89",
@@ -948,7 +948,7 @@
       "id": "landmark-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p陸上構造物",
+      "source-layer": "onshore_structure_point",
       "paint": {
         "circle-radius": 3,
         "circle-color": "#695641",
@@ -960,7 +960,7 @@
       "id": "bottom-material-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p底質",
+      "source-layer": "seabed_text_point",
       "paint": {
         "circle-radius": 1.8,
         "circle-color": "#3e7081",
@@ -971,7 +971,7 @@
       "id": "bottom-material-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p底質",
+      "source-layer": "seabed_text_point",
       "minzoom": 11,
       "filter": [
         "has",
@@ -1014,7 +1014,7 @@
       "id": "height-limit-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p高さ制限",
+      "source-layer": "clearance_limit_point",
       "paint": {
         "circle-radius": 3.5,
         "circle-color": "#ab355f",
@@ -1026,7 +1026,7 @@
       "id": "nav-mark-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "text-allow-overlap": true,
         "text-max-width": 100,
@@ -1163,7 +1163,7 @@
       "id": "nav-light-abbr-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "text-allow-overlap": true,
         "text-max-width": 100,
@@ -1307,7 +1307,7 @@
       "id": "place-labels-sea",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p地名",
+      "source-layer": "place_label_sea",
       "layout": {
         "text-field": [
           "get",
@@ -1349,7 +1349,7 @@
       "id": "place-labels-land",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p地名陸",
+      "source-layer": "place_label_land",
       "layout": {
         "text-field": [
           "get",
diff --git a/src/pbf/style.navsea-v2.json b/src/pbf/style.navsea-v2.json
index 65a9df4..e84075d 100644
--- a/src/pbf/style.navsea-v2.json
+++ b/src/pbf/style.navsea-v2.json
@@ -46,7 +46,7 @@
       "id": "sea-area-fill",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -204,7 +204,7 @@
       "id": "tidal-flat",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -233,7 +233,7 @@
       "id": "river-water",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -268,7 +268,7 @@
       "id": "unsurveyed-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -297,7 +297,7 @@
       "id": "shoal-danger-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -326,7 +326,7 @@
       "id": "coast-structures-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P基本線",
+      "source-layer": "baseline_area",
       "filter": [
         "any",
         [
@@ -361,7 +361,7 @@
       "id": "hazard-polygons",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P投錨注意障害物",
+      "source-layer": "anchor_caution_hazard_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -377,7 +377,7 @@
       "id": "navigation-hazard-polygons",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P航行危険障害物",
+      "source-layer": "navigation_hazard_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -393,7 +393,7 @@
       "id": "fishery-areas",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P漁具定置箇所",
+      "source-layer": "fixed_fishing_gear_area",
       "paint": {
         "fill-color": "#7eb36a",
         "fill-opacity": 0.4,
@@ -404,7 +404,7 @@
       "id": "anchorage-areas",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P錨泊地等",
+      "source-layer": "anchorage_area",
       "paint": {
         "fill-color": "rgba(0,0,0,0)"
       }
@@ -413,7 +413,7 @@
       "id": "facility-zones",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P施設・境界線等",
+      "source-layer": "facility_boundary_area",
       "paint": {
         "fill-pattern": [
           "coalesce",
@@ -429,7 +429,7 @@
       "id": "submerged-structures",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P潜堤",
+      "source-layer": "submerged_reef_area",
       "paint": {
         "fill-color": "#7d7f95",
         "fill-opacity": 0.45,
@@ -440,7 +440,7 @@
       "id": "bridge-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P橋りょう等構造物",
+      "source-layer": "bridge_structure",
       "paint": {
         "fill-color": "#74685d",
         "fill-opacity": 0.8
@@ -450,7 +450,7 @@
       "id": "land-structures-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P陸上構造物陸",
+      "source-layer": "onshore_structure_area",
       "paint": {
         "fill-color": "#8a6d3b",
         "fill-opacity": 0.8
@@ -460,7 +460,7 @@
       "id": "land-area",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P陸域",
+      "source-layer": "land_area",
       "paint": {
         "fill-color": "#d8caa2",
         "fill-opacity": 0.92
@@ -470,7 +470,7 @@
       "id": "land-hole",
       "type": "fill",
       "source": "navsea",
-      "source-layer": "P穴",
+      "source-layer": "hole_area",
       "paint": {
         "fill-color": "#c6cdb2"
       }
@@ -479,7 +479,7 @@
       "id": "bathymetry-support",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L海底地形",
+      "source-layer": "bathymetry_line",
       "paint": {
         "line-color": "#86aabb",
         "line-width": 0.5,
@@ -490,7 +490,7 @@
       "id": "depth-contours",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L等深線",
+      "source-layer": "depth_contour",
       "paint": {
         "line-color": "#3d7992",
         "line-width": [
@@ -515,7 +515,7 @@
       "id": "depth-contours-major",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L概略等深線",
+      "source-layer": "depth_contour_overview",
       "paint": {
         "line-color": "#1f5a72",
         "line-width": [
@@ -540,7 +540,7 @@
       "id": "depth-contour-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "L等深線",
+      "source-layer": "depth_contour",
       "minzoom": 11,
       "layout": {
         "visibility": "none",
@@ -594,7 +594,7 @@
       "id": "bathymetry-depth-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "L海底地形",
+      "source-layer": "bathymetry_line",
       "minzoom": 11,
       "filter": [
         "all",
@@ -633,7 +633,7 @@
       "id": "subsea-cables",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L海底線",
+      "source-layer": "seabed_line",
       "paint": {
         "line-color": "#814d99",
         "line-width": 1.3,
@@ -647,7 +647,7 @@
       "id": "coast-structures-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L基本線",
+      "source-layer": "baseline_line",
       "paint": {
         "line-color": "#5f5a50",
         "line-width": 1.4
@@ -657,7 +657,7 @@
       "id": "land-structures-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L陸上構造物陸",
+      "source-layer": "onshore_structure_line",
       "paint": {
         "line-color": "#7d602d",
         "line-width": 1
@@ -667,7 +667,7 @@
       "id": "water-boundary",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L739",
+      "source-layer": "depth_zone_739",
       "paint": {
         "line-color": "#4f8ca7",
         "line-width": 1.1
@@ -677,7 +677,7 @@
       "id": "regulatory-boundary",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L741",
+      "source-layer": "depth_zone_741",
       "paint": {
         "line-color": "#cb5c46",
         "line-width": 1.2,
@@ -691,7 +691,7 @@
       "id": "height-limit-line",
       "type": "line",
       "source": "navsea",
-      "source-layer": "L高さ制限",
+      "source-layer": "clearance_limit_line",
       "paint": {
         "line-color": "#ad3b6a",
         "line-width": 1.1
@@ -701,7 +701,7 @@
       "id": "clip-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P基本線ククリ",
+      "source-layer": "baseline_outline",
       "paint": {
         "line-color": "#7c7567",
         "line-width": 1
@@ -711,7 +711,7 @@
       "id": "danger-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P危険界ククリ",
+      "source-layer": "hazard_boundary_outline",
       "paint": {
         "line-color": "#c65e2d",
         "line-width": 1.2,
@@ -725,7 +725,7 @@
       "id": "navigation-hazard-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P航行危険障害物ククリ",
+      "source-layer": "navigation_hazard_outline",
       "paint": {
         "line-width": [
           "coalesce",
@@ -749,7 +749,7 @@
       "id": "anchor-danger-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P投錨注意障害物ククリ",
+      "source-layer": "anchor_caution_hazard_outline",
       "paint": {
         "line-width": [
           "coalesce",
@@ -773,7 +773,7 @@
       "id": "anchorage-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P錨泊地等ククリ",
+      "source-layer": "anchorage_outline",
       "paint": {
         "line-color": [
           "coalesce",
@@ -801,7 +801,7 @@
       "id": "facility-zone-outline",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P施設・境界線等ククリ",
+      "source-layer": "facility_boundary_outline",
       "paint": {
         "line-color": [
           "coalesce",
@@ -825,7 +825,7 @@
       "id": "special-pattern-line-754",
       "type": "line",
       "source": "navsea",
-      "source-layer": "P754ククリ",
+      "source-layer": "clip_outline_754",
       "paint": {
         "line-pattern": "line-daytime-754",
         "line-width": 8
@@ -835,7 +835,7 @@
       "id": "hazard-points",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航行危険障害物",
+      "source-layer": "navigation_hazard_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -852,7 +852,7 @@
       "id": "anchorage-symbols",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p錨泊地等",
+      "source-layer": "anchorage_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -869,7 +869,7 @@
       "id": "anchor-hazard-points",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p投錨注意障害物",
+      "source-layer": "anchor_caution_hazard_point",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -886,7 +886,7 @@
       "id": "nav-light-flare",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -919,7 +919,7 @@
       "id": "nav-marks",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "icon-allow-overlap": true,
         "icon-image": [
@@ -936,7 +936,7 @@
       "id": "facility-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p施設・境界線等",
+      "source-layer": "facility_boundary_point",
       "paint": {
         "circle-radius": 3.5,
         "circle-color": "#516f89",
@@ -948,7 +948,7 @@
       "id": "landmark-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p陸上構造物",
+      "source-layer": "onshore_structure_point",
       "paint": {
         "circle-radius": 3,
         "circle-color": "#695641",
@@ -960,7 +960,7 @@
       "id": "bottom-material-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p底質",
+      "source-layer": "seabed_text_point",
       "paint": {
         "circle-radius": 1.8,
         "circle-color": "#3e7081",
@@ -971,7 +971,7 @@
       "id": "bottom-material-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p底質",
+      "source-layer": "seabed_text_point",
       "minzoom": 11,
       "filter": [
         "has",
@@ -1014,7 +1014,7 @@
       "id": "height-limit-points",
       "type": "circle",
       "source": "navsea",
-      "source-layer": "p高さ制限",
+      "source-layer": "clearance_limit_point",
       "paint": {
         "circle-radius": 3.5,
         "circle-color": "#ab355f",
@@ -1026,7 +1026,7 @@
       "id": "nav-mark-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "text-allow-overlap": true,
         "text-max-width": 100,
@@ -1163,7 +1163,7 @@
       "id": "nav-light-abbr-labels",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p航路標識群",
+      "source-layer": "navigation_marks",
       "layout": {
         "text-allow-overlap": true,
         "text-max-width": 100,
@@ -1307,7 +1307,7 @@
       "id": "place-labels-sea",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p地名",
+      "source-layer": "place_label_sea",
       "layout": {
         "text-field": [
           "get",
@@ -1349,7 +1349,7 @@
       "id": "place-labels-land",
       "type": "symbol",
       "source": "navsea",
-      "source-layer": "p地名陸",
+      "source-layer": "place_label_land",
       "layout": {
         "text-field": [
           "get",
diff --git a/tasks/pbf/mappings/navsea_source_layer_rules_v1.yaml b/tasks/pbf/mappings/navsea_source_layer_rules_v1.yaml
index 6d6105d..9ec0d0c 100644
--- a/tasks/pbf/mappings/navsea_source_layer_rules_v1.yaml
+++ b/tasks/pbf/mappings/navsea_source_layer_rules_v1.yaml
@@ -86,6 +86,9 @@ rules:
   - source_layer_jp: p投錨注意障害物
     source_layer_std: anchor_caution_hazard_point
     notes: Point hazards relevant to anchoring caution.
+  - source_layer_jp: P投錨注意障害物
+    source_layer_std: anchor_caution_hazard_area
+    notes: Area hazards relevant to anchoring caution.
   - source_layer_jp: P投錨注意障害物ククリ
     source_layer_std: anchor_caution_hazard_outline
     notes: Outline of anchoring caution hazard area.
@@ -110,6 +113,9 @@ rules:
   - source_layer_jp: P穴
     source_layer_std: hole_area
     notes: Hole or depression area layer.
+  - source_layer_jp: P航行危険障害物
+    source_layer_std: navigation_hazard_area
+    notes: Navigation hazard area layer.
   - source_layer_jp: p航行危険障害物
     source_layer_std: navigation_hazard_point
     notes: Navigation hazard point layer.
@@ -134,9 +140,15 @@ rules:
   - source_layer_jp: p錨泊地等
     source_layer_std: anchorage_point
     notes: Anchorage point symbol layer.
+  - source_layer_jp: P錨泊地等
+    source_layer_std: anchorage_area
+    notes: Anchorage area layer.
   - source_layer_jp: P錨泊地等ククリ
     source_layer_std: anchorage_outline
     notes: Anchorage outline layer.
+  - source_layer_jp: p施設・境界線等
+    source_layer_std: facility_boundary_point
+    notes: Facility and boundary point symbol layer.
   - source_layer_jp: p陸上構造物
     source_layer_std: onshore_structure_point
     notes: Onshore structure point layer.