diff --git a/contracts/openapi.yaml b/contracts/openapi.yaml
index 781c221..47c5a1c 100644
--- a/contracts/openapi.yaml
+++ b/contracts/openapi.yaml
@@ -31,8 +31,10 @@ tags:
     description: Health checks, schema introspection, and system status
   - name: jobs
     description: Cross-cutting async job status polling
-  - name: external-apis
-    description: Integrations with external APIs (Weather, Zipcode)
+  - name: weather
+    description: Weather forecast lookup via external API
+  - name: zipcode
+    description: Address and postal code geocoding via external API
 
 paths:
   # ── Layer 1: Input ──────────────────────────────────────────────
@@ -102,7 +104,5 @@ paths:
   # ── Layer 9: External APIs ─────────────────────────────────────
   /api/v1/weather/forecast:
     $ref: "path/weather.yaml#/forecast"
-  /api/v1/zipcode/postal-code:
-    $ref: "path/zipcode.yaml#/postal_code"
-  /api/v1/zipcode/location:
-    $ref: "path/zipcode.yaml#/location"
+  /api/v1/zipcode/lookup-address:
+    $ref: "path/zipcode.yaml#/lookup_address"
diff --git a/contracts/path/weather.yaml b/contracts/path/weather.yaml
index ff56d93..601911b 100644
--- a/contracts/path/weather.yaml
+++ b/contracts/path/weather.yaml
@@ -5,7 +5,7 @@ forecast:
       Fetch hourly weather data for the given location and date range.
       Coordinates must be provided as decimal degrees (e.g. `40.7128` for latitude, `-74.0060` for longitude).
     tags:
-      - external-apis
+      - weather
     parameters:
       - name: latitude
         in: query
diff --git a/contracts/path/zipcode.yaml b/contracts/path/zipcode.yaml
index dcc22c4..a348017 100644
--- a/contracts/path/zipcode.yaml
+++ b/contracts/path/zipcode.yaml
@@ -7,7 +7,7 @@ lookup_address:
       place name, state, county, and country.
       The list is ordered by relevance (most relevant first, up to 10 results).
     tags:
-      - external-apis
+      - zipcode
     parameters:
       - name: address
         in: query