Victor Schappert (vcschapp) · Aug 10, 2026 · Aug 5, 2026
diff --git a/Makefile b/Makefile
@@ -65,10 +65,12 @@ doctest-only:
 mypy: uv-sync mypy-only
 
 mypy-only:
-	@# $$ escapes $ for make - sed needs literal $ for end-of-line anchor
+	@# $$ escapes $ for make - sed replaces the -theme- infix (packages were
+	@# renamed overture-schema-<t>-theme -> overture-schema-theme-<t>) so the
+	@# derived mypy module stays overture.schema.<t>
 	@find packages -maxdepth 1 -type d -name "overture-schema*" \
 		| sort \
-		| sed 's|-theme$$||' \
+		| sed 's|-theme-|-|' \
 		| tr - . \
 		| sed 's|^packages/|-p |' \
 		| xargs uv run mypy --no-error-summary

diff --git a/PYDANTIC_GUIDE.md b/PYDANTIC_GUIDE.md
@@ -848,13 +848,13 @@ road_segment = RoadSegment(subtype=Subtype.ROAD, ...)  # Valid
 Instead of making classes abstract, we use **entry point registration** where only specific concrete types are discoverable as map features:
 
 ```python
-# In packages/overture-schema-transportation-theme/pyproject.toml
+# In packages/overture-schema-theme-transportation/pyproject.toml
 [project.entry-points."overture.models"]
 connector = "overture.schema.transportation:Connector"
 segment = "overture.schema.transportation:Segment"
 ```
 
-**Real example:** See [`packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/__init__.py`](packages/overture-schema-transportation-theme/src/overture/schema/transportation/segment/__init__.py) where:
+**Real example:** See [`packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/__init__.py`](packages/overture-schema-theme-transportation/src/overture/schema/transportation/segment/__init__.py) where:
 
 - **`Segment`** is a discriminated union: `RoadSegment | RailSegment | WaterSegment`
 - **`TransportationSegment`** is the concrete base class that all segment types inherit from
@@ -1003,11 +1003,11 @@ Organize code by scope and avoid circular imports:
 
 - Used by multiple themes (e.g., `OvertureFeature`, `Names`, `Sources`, `Scope`)
 
-**Theme-level shared**: Theme package root (e.g., `overture-schema-transportation-theme/src/overture/schema/transportation/`)
+**Theme-level shared**: Theme package root (e.g., `overture-schema-theme-transportation/src/overture/schema/transportation/`)
 
 - Used by multiple types within a theme (e.g., `AccessRules`, `RoadSurface`)
 
-**Type-specific**: Type subdirectory (e.g., `overture-schema-transportation-theme/src/overture/schema/transportation/segment/`)
+**Type-specific**: Type subdirectory (e.g., `overture-schema-theme-transportation/src/overture/schema/transportation/segment/`)
 
 - Only used by one specific type (e.g., `SegmentType`, `LaneConfiguration`)
 
@@ -1088,14 +1088,14 @@ properties:
 **Pydantic approach:**
 
 ```python
-# In overture-schema-addresses-theme/src/overture/schema/addresses/address.py
+# In overture-schema-theme-addresses/src/overture/schema/addresses/address.py
 @no_extra_fields
 class Address(BaseModel):
     """A postal address."""
     freeform: str | None = None
     locality: str | None = None
 
-# In overture-schema-buildings-theme/src/overture/schema/buildings/building.py
+# In overture-schema-theme-buildings/src/overture/schema/buildings/building.py
 class Building(OvertureFeature):
     address: Address | None = None
 ```

diff --git a/README.pydantic.md b/README.pydantic.md
@@ -96,16 +96,16 @@ This workspace contains the following packages:
 
 ### Theme Packages
 
-- **`overture-schema-addresses-theme`** - Address features
-- **`overture-schema-base-theme`** - Foundational geographic features (land, water,
+- **`overture-schema-theme-addresses`** - Address features
+- **`overture-schema-theme-base`** - Foundational geographic features (land, water,
   infrastructure, bathymetry, land cover, land use)
-- **`overture-schema-buildings-theme`** - Building footprints and building parts with
+- **`overture-schema-theme-buildings`** - Building footprints and building parts with
   architectural details
-- **`overture-schema-divisions-theme`** - Administrative boundaries, division areas, and
+- **`overture-schema-theme-divisions`** - Administrative boundaries, division areas, and
   political boundaries
-- **`overture-schema-places-theme`** - Points of interest, businesses, and named
+- **`overture-schema-theme-places`** - Points of interest, businesses, and named
   locations
-- **`overture-schema-transportation-theme`** - Road segments and transportation network
+- **`overture-schema-theme-transportation`** - Road segments and transportation network
   connectors
 
 ### Usage (Python)
@@ -218,7 +218,7 @@ uv sync --all-packages
 make check
 
 # Run tests for a specific package
-uv run pytest packages/overture-schema-buildings-theme/
+uv run pytest packages/overture-schema-theme-buildings/
 
 # Run tests matching a pattern
 uv run pytest -k "buildings"

diff --git a/docs/versioning.md b/docs/versioning.md
@@ -99,10 +99,10 @@ example:
 ```bash
 # 1. One small markdown file, named <issue-or-pr>.<type>.md
 echo 'Fixed brand enum values rejecting valid entries.' \
-  > packages/overture-schema-places-theme/changelog.d/561.bugfix.md
+  > packages/overture-schema-theme-places/changelog.d/561.bugfix.md
 
 # 2. Commit it with your change
-git add packages/overture-schema-places-theme/changelog.d/561.bugfix.md
+git add packages/overture-schema-theme-places/changelog.d/561.bugfix.md
 git commit -m 'Add changelog fragment'
 ```
 

diff --git a/packages/overture-schema-codegen/README.md b/packages/overture-schema-codegen/README.md
@@ -29,7 +29,7 @@ overture-codegen list
 ```
 
 The generator discovers models via `overture.models` entry points (provided by theme
-packages like `overture-schema-buildings-theme`), extracts type information, and renders
+packages like `overture-schema-theme-buildings`), extracts type information, and renders
 output pages with cross-page links, constraint descriptions, and validated examples.
 
 ## Architecture

diff --git a/packages/overture-schema-codegen/changelog.d/649.misc.md b/packages/overture-schema-codegen/changelog.d/649.misc.md
@@ -0,0 +1 @@
+Rename theme packages to improve sorting and grouping characteristics.
diff --git a/packages/overture-schema-codegen/pyproject.toml b/packages/overture-schema-codegen/pyproject.toml
@@ -22,24 +22,24 @@ requires-python = ">=3.10"
 overture-codegen = "overture.schema.codegen.cli:main"
 
 [tool.uv.sources]
-overture-schema-addresses-theme = { workspace = true }
-overture-schema-base-theme = { workspace = true }
-overture-schema-buildings-theme = { workspace = true }
 overture-schema-cli = { workspace = true }
 overture-schema-common = { workspace = true }
-overture-schema-divisions-theme = { workspace = true }
-overture-schema-places-theme = { workspace = true }
 overture-schema-system = { workspace = true }
-overture-schema-transportation-theme = { workspace = true }
+overture-schema-theme-addresses = { workspace = true }
+overture-schema-theme-base = { workspace = true }
+overture-schema-theme-buildings = { workspace = true }
+overture-schema-theme-divisions = { workspace = true }
+overture-schema-theme-places = { workspace = true }
+overture-schema-theme-transportation = { workspace = true }
 
 [dependency-groups]
 test = [
-    "overture-schema-addresses-theme",
-    "overture-schema-base-theme",
-    "overture-schema-buildings-theme",
-    "overture-schema-divisions-theme",
-    "overture-schema-places-theme",
-    "overture-schema-transportation-theme",
+    "overture-schema-theme-addresses",
+    "overture-schema-theme-base",
+    "overture-schema-theme-buildings",
+    "overture-schema-theme-divisions",
+    "overture-schema-theme-places",
+    "overture-schema-theme-transportation",
 ]
 
 [tool.hatch.build.targets.wheel]

diff --git a/...overture-schema-addresses-theme/README.md → ...overture-schema-theme-addresses/README.md b/...overture-schema-addresses-theme/README.md → ...overture-schema-theme-addresses/README.md
diff --git a/...a-addresses-theme/changelog.d/557.misc.md → ...a-theme-addresses/changelog.d/557.misc.md b/...a-addresses-theme/changelog.d/557.misc.md → ...a-theme-addresses/changelog.d/557.misc.md
diff --git a/packages/overture-schema-theme-addresses/changelog.d/649.misc.md b/packages/overture-schema-theme-addresses/changelog.d/649.misc.md
@@ -0,0 +1 @@
+Rename theme packages to improve sorting and grouping characteristics.
diff --git a/...ema-addresses-theme/changelog.d/README.md → ...ema-theme-addresses/changelog.d/README.md b/...ema-addresses-theme/changelog.d/README.md → ...ema-theme-addresses/changelog.d/README.md
diff --git a/...ure-schema-addresses-theme/pyproject.toml → ...ure-schema-theme-addresses/pyproject.toml b/...ure-schema-addresses-theme/pyproject.toml → ...ure-schema-theme-addresses/pyproject.toml
@@ -10,7 +10,7 @@ dependencies = [
 description = "Overture Maps addresses theme models and structures"
 version = "0.1.1"
 license = "MIT"
-name = "overture-schema-addresses-theme"
+name = "overture-schema-theme-addresses"
 readme = "README.md"
 requires-python = ">=3.10"
 

diff --git a/...-addresses-theme/src/overture/__init__.py → ...-theme-addresses/src/overture/__init__.py b/...-addresses-theme/src/overture/__init__.py → ...-theme-addresses/src/overture/__init__.py
diff --git a/...ses-theme/src/overture/schema/__init__.py → ...addresses/src/overture/schema/__init__.py b/...ses-theme/src/overture/schema/__init__.py → ...addresses/src/overture/schema/__init__.py
diff --git a/...src/overture/schema/addresses/__init__.py → ...src/overture/schema/addresses/__init__.py b/...src/overture/schema/addresses/__init__.py → ...src/overture/schema/addresses/__init__.py
diff --git a/.../src/overture/schema/addresses/address.py → .../src/overture/schema/addresses/address.py b/.../src/overture/schema/addresses/address.py → .../src/overture/schema/addresses/address.py
diff --git a/...me/src/overture/schema/addresses/py.typed → ...es/src/overture/schema/addresses/py.typed b/...me/src/overture/schema/addresses/py.typed → ...es/src/overture/schema/addresses/py.typed
diff --git a/...-theme/tests/address_baseline_schema.json → ...resses/tests/address_baseline_schema.json b/...-theme/tests/address_baseline_schema.json → ...resses/tests/address_baseline_schema.json
diff --git a/...ests/test_address_json_schema_baseline.py → ...ests/test_address_json_schema_baseline.py b/...ests/test_address_json_schema_baseline.py → ...ests/test_address_json_schema_baseline.py
diff --git a/...ages/overture-schema-base-theme/README.md → ...ages/overture-schema-theme-base/README.md b/...ages/overture-schema-base-theme/README.md → ...ages/overture-schema-theme-base/README.md
diff --git a/...schema-base-theme/changelog.d/557.misc.md → ...schema-theme-base/changelog.d/557.misc.md b/...schema-base-theme/changelog.d/557.misc.md → ...schema-theme-base/changelog.d/557.misc.md
diff --git a/packages/overture-schema-theme-base/changelog.d/649.misc.md b/packages/overture-schema-theme-base/changelog.d/649.misc.md
@@ -0,0 +1 @@
+Rename theme packages to improve sorting and grouping characteristics.
diff --git a/...e-schema-base-theme/changelog.d/README.md → ...e-schema-theme-base/changelog.d/README.md b/...e-schema-base-theme/changelog.d/README.md → ...e-schema-theme-base/changelog.d/README.md
diff --git a/...overture-schema-base-theme/pyproject.toml → ...overture-schema-theme-base/pyproject.toml b/...overture-schema-base-theme/pyproject.toml → ...overture-schema-theme-base/pyproject.toml
@@ -10,7 +10,7 @@ dependencies = [
 description = "Overture Maps base theme shared structures and models (bathymetry, infrastructure, land, land_cover, land_use, water)"
 version = "0.1.1"
 license = "MIT"
-name = "overture-schema-base-theme"
+name = "overture-schema-theme-base"
 readme = "README.md"
 requires-python = ">=3.10"
 

diff --git a/...chema-base-theme/src/overture/__init__.py → ...chema-theme-base/src/overture/__init__.py b/...chema-base-theme/src/overture/__init__.py → ...chema-theme-base/src/overture/__init__.py
diff --git a/...ase-theme/src/overture/schema/__init__.py → ...heme-base/src/overture/schema/__init__.py b/...ase-theme/src/overture/schema/__init__.py → ...heme-base/src/overture/schema/__init__.py
diff --git a/...heme/src/overture/schema/base/__init__.py → ...base/src/overture/schema/base/__init__.py b/...heme/src/overture/schema/base/__init__.py → ...base/src/overture/schema/base/__init__.py
diff --git a/...theme/src/overture/schema/base/_common.py → ...-base/src/overture/schema/base/_common.py b/...theme/src/overture/schema/base/_common.py → ...-base/src/overture/schema/base/_common.py
diff --git a/...me/src/overture/schema/base/bathymetry.py → ...se/src/overture/schema/base/bathymetry.py b/...me/src/overture/schema/base/bathymetry.py → ...se/src/overture/schema/base/bathymetry.py
diff --git a/...rc/overture/schema/base/infrastructure.py → ...rc/overture/schema/base/infrastructure.py b/...rc/overture/schema/base/infrastructure.py → ...rc/overture/schema/base/infrastructure.py
diff --git a/...se-theme/src/overture/schema/base/land.py → ...eme-base/src/overture/schema/base/land.py b/...se-theme/src/overture/schema/base/land.py → ...eme-base/src/overture/schema/base/land.py
diff --git a/...me/src/overture/schema/base/land_cover.py → ...se/src/overture/schema/base/land_cover.py b/...me/src/overture/schema/base/land_cover.py → ...se/src/overture/schema/base/land_cover.py
diff --git a/...heme/src/overture/schema/base/land_use.py → ...base/src/overture/schema/base/land_use.py b/...heme/src/overture/schema/base/land_use.py → ...base/src/overture/schema/base/land_use.py
diff --git a/...e-theme/src/overture/schema/base/py.typed → ...me-base/src/overture/schema/base/py.typed b/...e-theme/src/overture/schema/base/py.typed → ...me-base/src/overture/schema/base/py.typed
diff --git a/...e-theme/src/overture/schema/base/water.py → ...me-base/src/overture/schema/base/water.py b/...e-theme/src/overture/schema/base/water.py → ...me-base/src/overture/schema/base/water.py
diff --git a/...eme/tests/bathymetry_baseline_schema.json → ...ase/tests/bathymetry_baseline_schema.json b/...eme/tests/bathymetry_baseline_schema.json → ...ase/tests/bathymetry_baseline_schema.json
diff --git a/...tests/infrastructure_baseline_schema.json → ...tests/infrastructure_baseline_schema.json b/...tests/infrastructure_baseline_schema.json → ...tests/infrastructure_baseline_schema.json
diff --git a/...ase-theme/tests/land_baseline_schema.json → ...heme-base/tests/land_baseline_schema.json b/...ase-theme/tests/land_baseline_schema.json → ...heme-base/tests/land_baseline_schema.json
diff --git a/...eme/tests/land_cover_baseline_schema.json → ...ase/tests/land_cover_baseline_schema.json b/...eme/tests/land_cover_baseline_schema.json → ...ase/tests/land_cover_baseline_schema.json
diff --git a/...theme/tests/land_use_baseline_schema.json → ...-base/tests/land_use_baseline_schema.json b/...theme/tests/land_use_baseline_schema.json → ...-base/tests/land_use_baseline_schema.json
diff --git a/...s/test_bathymetry_json_schema_baseline.py → ...s/test_bathymetry_json_schema_baseline.py b/...s/test_bathymetry_json_schema_baseline.py → ...s/test_bathymetry_json_schema_baseline.py
diff --git a/...st_infrastructure_json_schema_baseline.py → ...st_infrastructure_json_schema_baseline.py b/...st_infrastructure_json_schema_baseline.py → ...st_infrastructure_json_schema_baseline.py
diff --git a/...s/test_land_cover_json_schema_baseline.py → ...s/test_land_cover_json_schema_baseline.py b/...s/test_land_cover_json_schema_baseline.py → ...s/test_land_cover_json_schema_baseline.py
diff --git a/...e/tests/test_land_json_schema_baseline.py → ...e/tests/test_land_json_schema_baseline.py b/...e/tests/test_land_json_schema_baseline.py → ...e/tests/test_land_json_schema_baseline.py
diff --git a/...sts/test_land_use_json_schema_baseline.py → ...sts/test_land_use_json_schema_baseline.py b/...sts/test_land_use_json_schema_baseline.py → ...sts/test_land_use_json_schema_baseline.py
diff --git a/.../tests/test_water_json_schema_baseline.py → .../tests/test_water_json_schema_baseline.py b/.../tests/test_water_json_schema_baseline.py → .../tests/test_water_json_schema_baseline.py
diff --git a/...se-theme/tests/water_baseline_schema.json → ...eme-base/tests/water_baseline_schema.json b/...se-theme/tests/water_baseline_schema.json → ...eme-base/tests/water_baseline_schema.json
diff --git a/...overture-schema-buildings-theme/README.md → ...overture-schema-theme-buildings/README.md b/...overture-schema-buildings-theme/README.md → ...overture-schema-theme-buildings/README.md
diff --git a/...a-buildings-theme/changelog.d/557.misc.md → ...a-theme-buildings/changelog.d/557.misc.md b/...a-buildings-theme/changelog.d/557.misc.md → ...a-theme-buildings/changelog.d/557.misc.md
diff --git a/packages/overture-schema-theme-buildings/changelog.d/649.misc.md b/packages/overture-schema-theme-buildings/changelog.d/649.misc.md
@@ -0,0 +1 @@
+Rename theme packages to improve sorting and grouping characteristics.
diff --git a/...ema-buildings-theme/changelog.d/README.md → ...ema-theme-buildings/changelog.d/README.md b/...ema-buildings-theme/changelog.d/README.md → ...ema-theme-buildings/changelog.d/README.md
diff --git a/...ure-schema-buildings-theme/pyproject.toml → ...ure-schema-theme-buildings/pyproject.toml b/...ure-schema-buildings-theme/pyproject.toml → ...ure-schema-theme-buildings/pyproject.toml
@@ -10,7 +10,7 @@ dependencies = [
 description = "Overture Maps buildings theme shared structures, building types, and building part types"
 version = "0.1.1"
 license = "MIT"
-name = "overture-schema-buildings-theme"
+name = "overture-schema-theme-buildings"
 readme = "README.md"
 requires-python = ">=3.10"
 

diff --git a/...-buildings-theme/src/overture/__init__.py → ...-theme-buildings/src/overture/__init__.py b/...-buildings-theme/src/overture/__init__.py → ...-theme-buildings/src/overture/__init__.py
diff --git a/...ngs-theme/src/overture/schema/__init__.py → ...buildings/src/overture/schema/__init__.py b/...ngs-theme/src/overture/schema/__init__.py → ...buildings/src/overture/schema/__init__.py
diff --git a/...src/overture/schema/buildings/__init__.py → ...src/overture/schema/buildings/__init__.py b/...src/overture/schema/buildings/__init__.py → ...src/overture/schema/buildings/__init__.py
diff --git a/.../src/overture/schema/buildings/_common.py → .../src/overture/schema/buildings/_common.py b/.../src/overture/schema/buildings/_common.py → .../src/overture/schema/buildings/_common.py
diff --git a/...src/overture/schema/buildings/building.py → ...src/overture/schema/buildings/building.py b/...src/overture/schema/buildings/building.py → ...src/overture/schema/buildings/building.py
diff --git a/...verture/schema/buildings/building_part.py → ...verture/schema/buildings/building_part.py b/...verture/schema/buildings/building_part.py → ...verture/schema/buildings/building_part.py
diff --git a/...me/src/overture/schema/buildings/py.typed → ...gs/src/overture/schema/buildings/py.typed b/...me/src/overture/schema/buildings/py.typed → ...gs/src/overture/schema/buildings/py.typed
diff --git a/...theme/tests/building_baseline_schema.json → ...dings/tests/building_baseline_schema.json b/...theme/tests/building_baseline_schema.json → ...dings/tests/building_baseline_schema.json
diff --git a/.../tests/building_part_baseline_schema.json → .../tests/building_part_baseline_schema.json b/.../tests/building_part_baseline_schema.json → .../tests/building_part_baseline_schema.json
diff --git a/...sts/test_building_json_schema_baseline.py → ...sts/test_building_json_schema_baseline.py b/...sts/test_building_json_schema_baseline.py → ...sts/test_building_json_schema_baseline.py
diff --git a/...est_building_part_json_schema_baseline.py → ...est_building_part_json_schema_baseline.py b/...est_building_part_json_schema_baseline.py → ...est_building_part_json_schema_baseline.py
diff --git a/...overture-schema-divisions-theme/README.md → ...overture-schema-theme-divisions/README.md b/...overture-schema-divisions-theme/README.md → ...overture-schema-theme-divisions/README.md
diff --git a/...a-divisions-theme/changelog.d/557.misc.md → ...a-theme-divisions/changelog.d/557.misc.md b/...a-divisions-theme/changelog.d/557.misc.md → ...a-theme-divisions/changelog.d/557.misc.md
diff --git a/packages/overture-schema-theme-divisions/changelog.d/649.misc.md b/packages/overture-schema-theme-divisions/changelog.d/649.misc.md
@@ -0,0 +1 @@
+Rename theme packages to improve sorting and grouping characteristics.
diff --git a/...ema-divisions-theme/changelog.d/README.md → ...ema-theme-divisions/changelog.d/README.md b/...ema-divisions-theme/changelog.d/README.md → ...ema-theme-divisions/changelog.d/README.md
diff --git a/...ure-schema-divisions-theme/pyproject.toml → ...ure-schema-theme-divisions/pyproject.toml b/...ure-schema-divisions-theme/pyproject.toml → ...ure-schema-theme-divisions/pyproject.toml
@@ -10,7 +10,7 @@ dependencies = [
 description = "Overture Maps divisions theme shared structures, division, division area and division boundary types"
 version = "0.1.1"
 license = "MIT"
-name = "overture-schema-divisions-theme"
+name = "overture-schema-theme-divisions"
 readme = "README.md"
 requires-python = ">=3.10"
 

diff --git a/...-divisions-theme/src/overture/__init__.py → ...-theme-divisions/src/overture/__init__.py b/...-divisions-theme/src/overture/__init__.py → ...-theme-divisions/src/overture/__init__.py
diff --git a/...ons-theme/src/overture/schema/__init__.py → ...divisions/src/overture/schema/__init__.py b/...ons-theme/src/overture/schema/__init__.py → ...divisions/src/overture/schema/__init__.py
diff --git a/...src/overture/schema/divisions/__init__.py → ...src/overture/schema/divisions/__init__.py b/...src/overture/schema/divisions/__init__.py → ...src/overture/schema/divisions/__init__.py
diff --git a/.../src/overture/schema/divisions/_common.py → .../src/overture/schema/divisions/_common.py b/.../src/overture/schema/divisions/_common.py → .../src/overture/schema/divisions/_common.py
diff --git a/...src/overture/schema/divisions/division.py → ...src/overture/schema/divisions/division.py b/...src/overture/schema/divisions/division.py → ...src/overture/schema/divisions/division.py
diff --git a/...verture/schema/divisions/division_area.py → ...verture/schema/divisions/division_area.py b/...verture/schema/divisions/division_area.py → ...verture/schema/divisions/division_area.py
diff --git a/...ure/schema/divisions/division_boundary.py → ...ure/schema/divisions/division_boundary.py b/...ure/schema/divisions/division_boundary.py → ...ure/schema/divisions/division_boundary.py
diff --git a/...me/src/overture/schema/divisions/py.typed → ...ns/src/overture/schema/divisions/py.typed b/...me/src/overture/schema/divisions/py.typed → ...ns/src/overture/schema/divisions/py.typed
diff --git a/.../tests/division_area_baseline_schema.json → .../tests/division_area_baseline_schema.json b/.../tests/division_area_baseline_schema.json → .../tests/division_area_baseline_schema.json
diff --git a/...theme/tests/division_baseline_schema.json → ...sions/tests/division_baseline_schema.json b/...theme/tests/division_baseline_schema.json → ...sions/tests/division_baseline_schema.json
diff --git a/...ts/division_boundary_baseline_schema.json → ...ts/division_boundary_baseline_schema.json b/...ts/division_boundary_baseline_schema.json → ...ts/division_boundary_baseline_schema.json
diff --git a/...est_division_area_json_schema_baseline.py → ...est_division_area_json_schema_baseline.py b/...est_division_area_json_schema_baseline.py → ...est_division_area_json_schema_baseline.py
diff --git a/...division_boundary_json_schema_baseline.py → ...division_boundary_json_schema_baseline.py b/...division_boundary_json_schema_baseline.py → ...division_boundary_json_schema_baseline.py
diff --git a/...sts/test_division_json_schema_baseline.py → ...sts/test_division_json_schema_baseline.py b/...sts/test_division_json_schema_baseline.py → ...sts/test_division_json_schema_baseline.py
diff --git a/...es/overture-schema-places-theme/README.md → ...es/overture-schema-theme-places/README.md b/...es/overture-schema-places-theme/README.md → ...es/overture-schema-theme-places/README.md
diff --git a/...hema-places-theme/changelog.d/557.misc.md → ...hema-theme-places/changelog.d/557.misc.md b/...hema-places-theme/changelog.d/557.misc.md → ...hema-theme-places/changelog.d/557.misc.md
diff --git a/packages/overture-schema-theme-places/changelog.d/649.misc.md b/packages/overture-schema-theme-places/changelog.d/649.misc.md
@@ -0,0 +1 @@
+Rename theme packages to improve sorting and grouping characteristics.
diff --git a/...schema-places-theme/changelog.d/README.md → ...schema-theme-places/changelog.d/README.md b/...schema-places-theme/changelog.d/README.md → ...schema-theme-places/changelog.d/README.md
diff --git a/...erture-schema-places-theme/pyproject.toml → ...erture-schema-theme-places/pyproject.toml b/...erture-schema-places-theme/pyproject.toml → ...erture-schema-theme-places/pyproject.toml
@@ -10,7 +10,7 @@ dependencies = [
 description = "Overture Maps places theme with place type models"
 version = "0.1.1"
 license = "MIT"
-name = "overture-schema-places-theme"
+name = "overture-schema-theme-places"
 readme = "README.md"
 requires-python = ">=3.10"
 

diff --git a/...ema-places-theme/src/overture/__init__.py → ...ema-theme-places/src/overture/__init__.py b/...ema-places-theme/src/overture/__init__.py → ...ema-theme-places/src/overture/__init__.py
diff --git a/...ces-theme/src/overture/schema/__init__.py → ...me-places/src/overture/schema/__init__.py b/...ces-theme/src/overture/schema/__init__.py → ...me-places/src/overture/schema/__init__.py
diff --git a/...me/src/overture/schema/places/__init__.py → ...es/src/overture/schema/places/__init__.py b/...me/src/overture/schema/places/__init__.py → ...es/src/overture/schema/places/__init__.py
diff --git a/...theme/src/overture/schema/places/place.py → ...laces/src/overture/schema/places/place.py b/...theme/src/overture/schema/places/place.py → ...laces/src/overture/schema/places/place.py
diff --git a/...theme/src/overture/schema/places/py.typed → ...laces/src/overture/schema/places/py.typed b/...theme/src/overture/schema/places/py.typed → ...laces/src/overture/schema/places/py.typed
diff --git a/...es-theme/tests/place_baseline_schema.json → ...e-places/tests/place_baseline_schema.json b/...es-theme/tests/place_baseline_schema.json → ...e-places/tests/place_baseline_schema.json
diff --git a/.../tests/test_place_json_schema_baseline.py → .../tests/test_place_json_schema_baseline.py b/.../tests/test_place_json_schema_baseline.py → .../tests/test_place_json_schema_baseline.py
diff --git a/...ure-schema-transportation-theme/README.md → ...ure-schema-theme-transportation/README.md b/...ure-schema-transportation-theme/README.md → ...ure-schema-theme-transportation/README.md
diff --git a/...nsportation-theme/changelog.d/557.misc.md → ...me-transportation/changelog.d/557.misc.md b/...nsportation-theme/changelog.d/557.misc.md → ...me-transportation/changelog.d/557.misc.md
diff --git a/packages/overture-schema-theme-transportation/changelog.d/649.misc.md b/packages/overture-schema-theme-transportation/changelog.d/649.misc.md
@@ -0,0 +1 @@
+Rename theme packages to improve sorting and grouping characteristics.
diff --git a/...ransportation-theme/changelog.d/README.md → ...heme-transportation/changelog.d/README.md b/...ransportation-theme/changelog.d/README.md → ...heme-transportation/changelog.d/README.md
diff --git a/...chema-transportation-theme/pyproject.toml → ...chema-theme-transportation/pyproject.toml b/...chema-transportation-theme/pyproject.toml → ...chema-theme-transportation/pyproject.toml
@@ -10,7 +10,7 @@ dependencies = [
 description = "Overture Maps transportation theme with shared structures and connector and segment types"
 version = "0.1.1"
 license = "MIT"
-name = "overture-schema-transportation-theme"
+name = "overture-schema-theme-transportation"
 readme = "README.md"
 requires-python = ">=3.10"
 

diff --git a/...sportation-theme/src/overture/__init__.py → ...e-transportation/src/overture/__init__.py b/...sportation-theme/src/overture/__init__.py → ...e-transportation/src/overture/__init__.py
diff --git a/...ion-theme/src/overture/schema/__init__.py → ...portation/src/overture/schema/__init__.py b/...ion-theme/src/overture/schema/__init__.py → ...portation/src/overture/schema/__init__.py
diff --git a/...verture/schema/transportation/__init__.py → ...verture/schema/transportation/__init__.py b/...verture/schema/transportation/__init__.py → ...verture/schema/transportation/__init__.py
diff --git a/...erture/schema/transportation/connector.py → ...erture/schema/transportation/connector.py b/...erture/schema/transportation/connector.py → ...erture/schema/transportation/connector.py
diff --git a/...c/overture/schema/transportation/py.typed → ...c/overture/schema/transportation/py.typed b/...c/overture/schema/transportation/py.typed → ...c/overture/schema/transportation/py.typed
diff --git a/...schema/transportation/segment/__init__.py → ...schema/transportation/segment/__init__.py b/...schema/transportation/segment/__init__.py → ...schema/transportation/segment/__init__.py
diff --git a/.../schema/transportation/segment/_common.py → .../schema/transportation/segment/_common.py b/.../schema/transportation/segment/_common.py → .../schema/transportation/segment/_common.py
diff --git a/...ure/schema/transportation/segment/rail.py → ...ure/schema/transportation/segment/rail.py b/...ure/schema/transportation/segment/rail.py → ...ure/schema/transportation/segment/rail.py
diff --git a/...ure/schema/transportation/segment/road.py → ...ure/schema/transportation/segment/road.py b/...ure/schema/transportation/segment/road.py → ...ure/schema/transportation/segment/road.py
diff --git a/...re/schema/transportation/segment/water.py → ...re/schema/transportation/segment/water.py b/...re/schema/transportation/segment/water.py → ...re/schema/transportation/segment/water.py
diff --git a/...heme/tests/connector_baseline_schema.json → ...tion/tests/connector_baseline_schema.json b/...heme/tests/connector_baseline_schema.json → ...tion/tests/connector_baseline_schema.json
diff --git a/...-theme/tests/segment_baseline_schema.json → ...tation/tests/segment_baseline_schema.json b/...-theme/tests/segment_baseline_schema.json → ...tation/tests/segment_baseline_schema.json
diff --git a/...ts/test_connector_json_schema_baseline.py → ...ts/test_connector_json_schema_baseline.py b/...ts/test_connector_json_schema_baseline.py → ...ts/test_connector_json_schema_baseline.py
diff --git a/...ests/test_segment_json_schema_baseline.py → ...ests/test_segment_json_schema_baseline.py b/...ests/test_segment_json_schema_baseline.py → ...ests/test_segment_json_schema_baseline.py
diff --git a/packages/overture-schema/changelog.d/649.misc.md b/packages/overture-schema/changelog.d/649.misc.md
@@ -0,0 +1 @@
+Rename theme packages to improve sorting and grouping characteristics.
diff --git a/packages/overture-schema/pyproject.toml b/packages/overture-schema/pyproject.toml
@@ -3,12 +3,12 @@ maintainers = [
     {name = "Overture Maps Schema Working Group"},
 ]
 dependencies = [
-    "overture-schema-addresses-theme>=0.1.1",
-    "overture-schema-base-theme>=0.1.1",
-    "overture-schema-buildings-theme>=0.1.1",
-    "overture-schema-divisions-theme>=0.1.1",
-    "overture-schema-places-theme>=0.1.1",
-    "overture-schema-transportation-theme>=0.1.1",
+    "overture-schema-theme-addresses>=0.1.1",
+    "overture-schema-theme-base>=0.1.1",
+    "overture-schema-theme-buildings>=0.1.1",
+    "overture-schema-theme-divisions>=0.1.1",
+    "overture-schema-theme-places>=0.1.1",
+    "overture-schema-theme-transportation>=0.1.1",
     "overture-schema-common>=0.1.1",
     "pydantic>=2.12.0",
     "pyyaml>=6.0.2",
@@ -27,14 +27,14 @@ Source = "https://github.com/OvertureMaps/schema"
 Issues = "https://github.com/OvertureMaps/schema/issues"
 
 [tool.uv.sources]
-overture-schema-addresses-theme = { workspace = true }
-overture-schema-base-theme = { workspace = true }
-overture-schema-buildings-theme = { workspace = true }
 overture-schema-cli = { workspace = true }
 overture-schema-common = { workspace = true }
-overture-schema-divisions-theme = { workspace = true }
-overture-schema-places-theme = { workspace = true }
-overture-schema-transportation-theme = { workspace = true }
+overture-schema-theme-addresses = { workspace = true }
+overture-schema-theme-base = { workspace = true }
+overture-schema-theme-buildings = { workspace = true }
+overture-schema-theme-divisions = { workspace = true }
+overture-schema-theme-places = { workspace = true }
+overture-schema-theme-transportation = { workspace = true }
 
 [build-system]
 build-backend = "hatchling.build"

diff --git a/pyproject.toml b/pyproject.toml
@@ -65,17 +65,17 @@ markers = [
     "baseline: golden file baseline tests",
 ]
 pythonpath = [
-    "packages/overture-schema-addresses-theme/tests",
-    "packages/overture-schema-base-theme/tests",
-    "packages/overture-schema-buildings-theme/tests",
     "packages/overture-schema-cli/tests",
     "packages/overture-schema-codegen/tests",
     "packages/overture-schema-common/tests",
-    "packages/overture-schema-divisions-theme/tests",
-    "packages/overture-schema-places-theme/tests",
     "packages/overture-schema-pyspark/tests",
     "packages/overture-schema-system/tests",
-    "packages/overture-schema-transportation-theme/tests",
+    "packages/overture-schema-theme-addresses/tests",
+    "packages/overture-schema-theme-base/tests",
+    "packages/overture-schema-theme-buildings/tests",
+    "packages/overture-schema-theme-divisions/tests",
+    "packages/overture-schema-theme-places/tests",
+    "packages/overture-schema-theme-transportation/tests",
     "packages/overture-schema/tests",
 ]
 verbosity_subtests = 0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Rename theme packages to improve sorting and grouping characteristics.