diff --git a/hetzner/traefik/traefik.template.yml b/hetzner/traefik/traefik.template.yml
index 68357aa1..2a3c212b 100644
--- a/hetzner/traefik/traefik.template.yml
+++ b/hetzner/traefik/traefik.template.yml
@@ -74,15 +74,15 @@ http:
         replacement: "https://${1}/ui/search.html"
         permanent: true
 
-    # replace-osm-to-ohm:
-    #   replacePathRegex:
-    #     regex: "^/capabilities/osm\\.json$"
-    #     replacement: "/capabilities/ohm.json"
+    replace-osm-to-ohm:
+      replacePathRegex:
+        regex: "^/capabilities/osm\\.json$"
+        replacement: "/capabilities/ohm.json"
 
-    # replace-osm-tiles-to-ohm:
-    #   replacePathRegex:
-    #     regex: "^/maps/osm/(.*)$"
-    #     replacement: "/maps/ohm/${1}"
+    replace-osm-tiles-to-ohm:
+      replacePathRegex:
+        regex: "^/maps/osm/(.*)$"
+        replacement: "/maps/ohm/${1}"
 
   routers:
     vtiles-router:
@@ -93,8 +93,8 @@ http:
       middlewares:
         - secure-headers-allow-iframe
         # Note: Removed replace-osm-to-ohm middleware because Tegola map is named "osm"
-        # - replace-osm-to-ohm
-        # - replace-osm-tiles-to-ohm
+        - replace-osm-to-ohm
+        - replace-osm-tiles-to-ohm
 
     nominatim-router:
       rule: Host(`nominatim.{{OHM_DOMAIN}}`) && !PathPrefix(`/ui`)
diff --git a/images/tiler-server/config/config.template.toml b/images/tiler-server/config/config.template.toml
index 3381ba4a..72ad226f 100644
--- a/images/tiler-server/config/config.template.toml
+++ b/images/tiler-server/config/config.template.toml
@@ -23,7 +23,7 @@ type = "prometheus"
 ## OpenHistoricalMap providers
 ####################################
 [[providers]]
-name = "osm"
+name = "ohm"
 type = "mvt_postgis"
 uri = "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
 max_connections = 120
@@ -45,7 +45,7 @@ max_connections = 25
 ####################################
 
 [[providers]]
-name = "non_admin"
+name = "ohm_non_admin"
 type = "mvt_postgis"
 uri = "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
 max_connections = 25
@@ -129,7 +129,7 @@ max_connections = 25
 ## OpenHistoricalMap maps
 ####################################
 [[maps]]
-name = "osm"
+name = "ohm"
 attribution = "OpenHistoricalMap"
 center = [-42.31214, 70.00455, 10.0]
 	###### MAPS_OSM
@@ -147,7 +147,7 @@ center = [0.0, 0.0, 0.0]
 ## OHM non admin boundaries areas maps
 ####################################
 [[maps]]
-name = "non_admin"
+name = "ohm_non_admin"
 attribution = "OpenHistoricalMap"
 center = [0.0, 0.0, 0.0]
 	###### MAPS_NON_ADMIN_BOUNDARIES_AREAS
diff --git a/images/tiler-server/config/providers/admin_boundaries_centroids.toml b/images/tiler-server/config/providers/admin_boundaries_centroids.toml
index 0b395b1b..5b6d4c66 100644
--- a/images/tiler-server/config/providers/admin_boundaries_centroids.toml
+++ b/images/tiler-server/config/providers/admin_boundaries_centroids.toml
@@ -175,42 +175,42 @@ WHERE geometry && !BBOX!
 #######Maps
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z0_2"
+provider_layer = "ohm.admin_boundaries_centroid_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z3_5"
+provider_layer = "ohm.admin_boundaries_centroid_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z6_7"
+provider_layer = "ohm.admin_boundaries_centroid_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z8_9"
+provider_layer = "ohm.admin_boundaries_centroid_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z10_12"
+provider_layer = "ohm.admin_boundaries_centroid_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z13_15"
+provider_layer = "ohm.admin_boundaries_centroid_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "land_ohm_centroids"
-provider_layer = "osm.admin_boundaries_centroid_z16_20"
+provider_layer = "ohm.admin_boundaries_centroid_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/admin_boundaries_lines.toml b/images/tiler-server/config/providers/admin_boundaries_lines.toml
index 7ad67efc..90335210 100644
--- a/images/tiler-server/config/providers/admin_boundaries_lines.toml
+++ b/images/tiler-server/config/providers/admin_boundaries_lines.toml
@@ -148,42 +148,42 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z0_2"
+provider_layer = "ohm.admin_boundaries_lines_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z3_5"
+provider_layer = "ohm.admin_boundaries_lines_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z6_7"
+provider_layer = "ohm.admin_boundaries_lines_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z8_9"
+provider_layer = "ohm.admin_boundaries_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z10_12"
+provider_layer = "ohm.admin_boundaries_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z13_15"
+provider_layer = "ohm.admin_boundaries_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "land_ohm_lines"
-provider_layer = "osm.admin_boundaries_lines_z16_20"
+provider_layer = "ohm.admin_boundaries_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/admin_boundaries_maritime.toml b/images/tiler-server/config/providers/admin_boundaries_maritime.toml
index 2b9d1670..e40ac87b 100644
--- a/images/tiler-server/config/providers/admin_boundaries_maritime.toml
+++ b/images/tiler-server/config/providers/admin_boundaries_maritime.toml
@@ -76,18 +76,18 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z0_5"
+provider_layer = "ohm.admin_lines_z0_5"
 min_zoom = 0
 max_zoom = 5
 
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z6_9"
+provider_layer = "ohm.admin_lines_z6_9"
 min_zoom = 6
 max_zoom = 9
 
 [[maps.layers]]
 name = "land_ohm_maritime"
-provider_layer = "osm.admin_lines_z10_15"
+provider_layer = "ohm.admin_lines_z10_15"
 min_zoom = 10
 max_zoom = 12
diff --git a/images/tiler-server/config/providers/amenity_areas.toml b/images/tiler-server/config/providers/amenity_areas.toml
index 25945b03..66fe6480 100644
--- a/images/tiler-server/config/providers/amenity_areas.toml
+++ b/images/tiler-server/config/providers/amenity_areas.toml
@@ -46,12 +46,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "amenity_areas"
-provider_layer = "osm.amenity_areas_z14_15"
+provider_layer = "ohm.amenity_areas_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "amenity_areas"
-provider_layer = "osm.amenity_areas_z16_20"
+provider_layer = "ohm.amenity_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/amenity_points_centroids.toml b/images/tiler-server/config/providers/amenity_points_centroids.toml
index ec1b255b..ddea2032 100644
--- a/images/tiler-server/config/providers/amenity_points_centroids.toml
+++ b/images/tiler-server/config/providers/amenity_points_centroids.toml
@@ -46,12 +46,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "amenity_points_centroids"
-provider_layer = "osm.amenity_points_centroids_z14_15"
+provider_layer = "ohm.amenity_points_centroids_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "amenity_points_centroids"
-provider_layer = "osm.amenity_points_centroids_z16_20"
+provider_layer = "ohm.amenity_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/buildings_areas.toml b/images/tiler-server/config/providers/buildings_areas.toml
index 453303aa..238f0238 100644
--- a/images/tiler-server/config/providers/buildings_areas.toml
+++ b/images/tiler-server/config/providers/buildings_areas.toml
@@ -49,12 +49,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "buildings"
-provider_layer = "osm.buildings_z14_15"
+provider_layer = "ohm.buildings_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "buildings"
-provider_layer = "osm.buildings_z16_20"
+provider_layer = "ohm.buildings_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/buildings_points_centroids.toml b/images/tiler-server/config/providers/buildings_points_centroids.toml
index 03961d99..f402c52f 100644
--- a/images/tiler-server/config/providers/buildings_points_centroids.toml
+++ b/images/tiler-server/config/providers/buildings_points_centroids.toml
@@ -48,12 +48,12 @@ WHERE
 
 [[maps.layers]]
 name = "buildings_points_centroids"
-provider_layer = "osm.buildings_points_centroids_z14_15"
+provider_layer = "ohm.buildings_points_centroids_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "buildings_points_centroids"
-provider_layer = "osm.buildings_points_centroids_z16_20"
+provider_layer = "ohm.buildings_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/landuse_areas.toml b/images/tiler-server/config/providers/landuse_areas.toml
index bf170f39..e75d0120 100644
--- a/images/tiler-server/config/providers/landuse_areas.toml
+++ b/images/tiler-server/config/providers/landuse_areas.toml
@@ -128,30 +128,30 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z6_7"
+provider_layer = "ohm.landuse_areas_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z8_9"
+provider_layer = "ohm.landuse_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z10_12"
+provider_layer = "ohm.landuse_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z13_15"
+provider_layer = "ohm.landuse_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_areas"
-provider_layer = "osm.landuse_areas_z16_20"
+provider_layer = "ohm.landuse_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/landuse_lines.toml b/images/tiler-server/config/providers/landuse_lines.toml
index c3a2a904..4e147803 100644
--- a/images/tiler-server/config/providers/landuse_lines.toml
+++ b/images/tiler-server/config/providers/landuse_lines.toml
@@ -47,13 +47,13 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_lines"
-provider_layer = "osm.landuse_lines_z14_15"
+provider_layer = "ohm.landuse_lines_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_lines"
-provider_layer = "osm.landuse_lines_z16_20"
+provider_layer = "ohm.landuse_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
 
diff --git a/images/tiler-server/config/providers/landuse_points_centroids.toml b/images/tiler-server/config/providers/landuse_points_centroids.toml
index e8433884..5d92795e 100644
--- a/images/tiler-server/config/providers/landuse_points_centroids.toml
+++ b/images/tiler-server/config/providers/landuse_points_centroids.toml
@@ -124,30 +124,30 @@ WHERE
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z6_7"
+provider_layer = "ohm.landuse_points_centroids_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z8_9"
+provider_layer = "ohm.landuse_points_centroids_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z10_12"
+provider_layer = "ohm.landuse_points_centroids_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z13_15"
+provider_layer = "ohm.landuse_points_centroids_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "landuse_points_centroids"
-provider_layer = "osm.landuse_points_centroids_z16_20"
+provider_layer = "ohm.landuse_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/non_admin_boundaries_areas.toml b/images/tiler-server/config/providers/non_admin_boundaries_areas.toml
index d698e3d8..58c3595a 100644
--- a/images/tiler-server/config/providers/non_admin_boundaries_areas.toml
+++ b/images/tiler-server/config/providers/non_admin_boundaries_areas.toml
@@ -223,42 +223,42 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z0_2"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z3_5"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z6_7"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z8_9"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z10_12"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z10_12"
 min_zoom = 9
 max_zoom = 10
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z13_15"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z13_15"
 min_zoom = 11
 max_zoom = 15
 
 [[maps.layers]]
 name = "boundaries_areas"
-provider_layer = "non_admin.non_admin_boundaries_areas_z16_20"
+provider_layer = "ohm_non_admin.non_admin_boundaries_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/non_admin_boundaries_centroids.toml b/images/tiler-server/config/providers/non_admin_boundaries_centroids.toml
index 84b8665b..e5b2b87d 100644
--- a/images/tiler-server/config/providers/non_admin_boundaries_centroids.toml
+++ b/images/tiler-server/config/providers/non_admin_boundaries_centroids.toml
@@ -224,42 +224,42 @@ WHERE geometry && !BBOX!
 #######Maps
 [[maps.layers]]
 name = "boundaries_centroids"
-provider_layer = "non_admin.non_admin_boundaries_centroid_z0_2"
+provider_layer = "ohm_non_admin.non_admin_boundaries_centroid_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "boundaries_centroids"
-provider_layer = "non_admin.non_admin_boundaries_centroid_z3_5"
+provider_layer = "ohm_non_admin.non_admin_boundaries_centroid_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "boundaries_centroids"
-provider_layer = "non_admin.non_admin_boundaries_centroid_z6_7"
+provider_layer = "ohm_non_admin.non_admin_boundaries_centroid_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "boundaries_centroids"
-provider_layer = "non_admin.non_admin_boundaries_centroid_z8_9"
+provider_layer = "ohm_non_admin.non_admin_boundaries_centroid_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "boundaries_centroids"
-provider_layer = "non_admin.non_admin_boundaries_centroid_z10_12"
+provider_layer = "ohm_non_admin.non_admin_boundaries_centroid_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "boundaries_centroids"
-provider_layer = "non_admin.non_admin_boundaries_centroid_z13_15"
+provider_layer = "ohm_non_admin.non_admin_boundaries_centroid_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "boundaries_centroids"
-provider_layer = "non_admin.non_admin_boundaries_centroid_z16_20"
+provider_layer = "ohm_non_admin.non_admin_boundaries_centroid_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/other_areas.toml b/images/tiler-server/config/providers/other_areas.toml
index 21568d9d..9ad172af 100644
--- a/images/tiler-server/config/providers/other_areas.toml
+++ b/images/tiler-server/config/providers/other_areas.toml
@@ -97,25 +97,25 @@ WHERE
 
 [[maps.layers]]
 name = "other_areas"
-provider_layer = "osm.other_areas_z8_9"
+provider_layer = "ohm.other_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "other_areas"
-provider_layer = "osm.other_areas_z10_12"
+provider_layer = "ohm.other_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "other_areas"
-provider_layer = "osm.other_areas_z13_15"
+provider_layer = "ohm.other_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "other_areas"
-provider_layer = "osm.other_areas_z16_20"
+provider_layer = "ohm.other_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
  
\ No newline at end of file
diff --git a/images/tiler-server/config/providers/other_lines.toml b/images/tiler-server/config/providers/other_lines.toml
index 03da853e..6182840e 100644
--- a/images/tiler-server/config/providers/other_lines.toml
+++ b/images/tiler-server/config/providers/other_lines.toml
@@ -46,12 +46,12 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "other_lines"
-provider_layer = "osm.other_lines_z14_15"
+provider_layer = "ohm.other_lines_z14_15"
 min_zoom = 14
 max_zoom = 15
 
 [[maps.layers]]
 name = "other_lines"
-provider_layer = "osm.other_lines_z16_20"
+provider_layer = "ohm.other_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/other_points_centroids.toml b/images/tiler-server/config/providers/other_points_centroids.toml
index 5ba0d084..88f7bb86 100644
--- a/images/tiler-server/config/providers/other_points_centroids.toml
+++ b/images/tiler-server/config/providers/other_points_centroids.toml
@@ -98,24 +98,24 @@ WHERE
 
 [[maps.layers]]
 name = "other_points_centroids"
-provider_layer = "osm.other_points_centroids_z8_9"
+provider_layer = "ohm.other_points_centroids_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "other_points_centroids"
-provider_layer = "osm.other_points_centroids_z10_12"
+provider_layer = "ohm.other_points_centroids_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "other_points_centroids"
-provider_layer = "osm.other_points_centroids_z13_15"
+provider_layer = "ohm.other_points_centroids_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "other_points_centroids"
-provider_layer = "osm.other_points_centroids_z16_20"
+provider_layer = "ohm.other_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/place_areas.toml b/images/tiler-server/config/providers/place_areas.toml
index 44ed82de..1fac59c6 100644
--- a/images/tiler-server/config/providers/place_areas.toml
+++ b/images/tiler-server/config/providers/place_areas.toml
@@ -26,6 +26,6 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "place_areas"
-provider_layer = "osm.place_areas"
+provider_layer = "ohm.place_areas"
 min_zoom = 14
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/place_points_centroids.toml b/images/tiler-server/config/providers/place_points_centroids.toml
index 4bcb9893..a0f8b7df 100644
--- a/images/tiler-server/config/providers/place_points_centroids.toml
+++ b/images/tiler-server/config/providers/place_points_centroids.toml
@@ -101,24 +101,24 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "place_points_centroids"
-provider_layer = "osm.place_points_centroids_z3_5"
+provider_layer = "ohm.place_points_centroids_z3_5"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "place_points_centroids"
-provider_layer = "osm.place_points_centroids_z3_5"
+provider_layer = "ohm.place_points_centroids_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "place_points_centroids"
-provider_layer = "osm.place_points_centroids_z6_10"
+provider_layer = "ohm.place_points_centroids_z6_10"
 min_zoom = 6
 max_zoom = 10
 
 [[maps.layers]]
 name = "place_points_centroids"
-provider_layer = "osm.place_points_centroids_z11_20"
+provider_layer = "ohm.place_points_centroids_z11_20"
 min_zoom = 11
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/route_lines.toml b/images/tiler-server/config/providers/route_lines.toml
index 883f4398..a7afdb09 100644
--- a/images/tiler-server/config/providers/route_lines.toml
+++ b/images/tiler-server/config/providers/route_lines.toml
@@ -440,36 +440,36 @@ WHERE geometry && !BBOX!
 #######Maps
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z5"
+provider_layer = "ohm.route_lines_z5"
 min_zoom = 5
 max_zoom = 5
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z6_7"
+provider_layer = "ohm.route_lines_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z8_9"
+provider_layer = "ohm.route_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z10_12"
+provider_layer = "ohm.route_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z13_15"
+provider_layer = "ohm.route_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "route_lines"
-provider_layer = "osm.route_lines_z16_20"
+provider_layer = "ohm.route_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/transport_areas.toml b/images/tiler-server/config/providers/transport_areas.toml
index 6ee9188b..71bcb1b9 100644
--- a/images/tiler-server/config/providers/transport_areas.toml
+++ b/images/tiler-server/config/providers/transport_areas.toml
@@ -72,18 +72,18 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "transport_areas"
-provider_layer = "osm.transport_areas_z10_12"
+provider_layer = "ohm.transport_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "transport_areas"
-provider_layer = "osm.transport_areas_z13_15"
+provider_layer = "ohm.transport_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "transport_areas"
-provider_layer = "osm.transport_areas_z16_20"
+provider_layer = "ohm.transport_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/transport_lines.toml b/images/tiler-server/config/providers/transport_lines.toml
index 7ca1fd81..f1cea34e 100644
--- a/images/tiler-server/config/providers/transport_lines.toml
+++ b/images/tiler-server/config/providers/transport_lines.toml
@@ -207,36 +207,36 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z5"
+provider_layer = "ohm.transport_lines_z5"
 min_zoom = 5
 max_zoom = 5
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z6_7"
+provider_layer = "ohm.transport_lines_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z8_9"
+provider_layer = "ohm.transport_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z10_12"
+provider_layer = "ohm.transport_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z13_15"
+provider_layer = "ohm.transport_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "transport_lines"
-provider_layer = "osm.transport_lines_z16_20"
+provider_layer = "ohm.transport_lines_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/transport_points_centroids.toml b/images/tiler-server/config/providers/transport_points_centroids.toml
index f0ffdbae..db151a35 100644
--- a/images/tiler-server/config/providers/transport_points_centroids.toml
+++ b/images/tiler-server/config/providers/transport_points_centroids.toml
@@ -72,18 +72,18 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "transport_points_centroids"
-provider_layer = "osm.transport_points_centroids_z10_12"
+provider_layer = "ohm.transport_points_centroids_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "transport_points_centroids"
-provider_layer = "osm.transport_points_centroids_z13_15"
+provider_layer = "ohm.transport_points_centroids_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "transport_points_centroids"
-provider_layer = "osm.transport_points_centroids_z16_20"
+provider_layer = "ohm.transport_points_centroids_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/water_areas.toml b/images/tiler-server/config/providers/water_areas.toml
index 767800ed..cc4270a7 100644
--- a/images/tiler-server/config/providers/water_areas.toml
+++ b/images/tiler-server/config/providers/water_areas.toml
@@ -162,42 +162,42 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z0_2"
+provider_layer = "ohm.water_areas_z0_2"
 min_zoom = 0
 max_zoom = 2
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z3_5"
+provider_layer = "ohm.water_areas_z3_5"
 min_zoom = 3
 max_zoom = 5
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z6_7"
+provider_layer = "ohm.water_areas_z6_7"
 min_zoom = 6
 max_zoom = 7
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z8_9"
+provider_layer = "ohm.water_areas_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z10_12"
+provider_layer = "ohm.water_areas_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z13_15"
+provider_layer = "ohm.water_areas_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "water_areas"
-provider_layer = "osm.water_areas_z16_20"
+provider_layer = "ohm.water_areas_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/water_areas_centroids.toml b/images/tiler-server/config/providers/water_areas_centroids.toml
index 9d5b54c2..8b519c80 100644
--- a/images/tiler-server/config/providers/water_areas_centroids.toml
+++ b/images/tiler-server/config/providers/water_areas_centroids.toml
@@ -94,24 +94,24 @@ WHERE
 
 [[maps.layers]]
 name = "water_areas_centroids"
-provider_layer = "osm.water_areas_centroid_z8_9"
+provider_layer = "ohm.water_areas_centroid_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "water_areas_centroids"
-provider_layer = "osm.water_areas_centroid_z10_12"
+provider_layer = "ohm.water_areas_centroid_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "water_areas_centroids"
-provider_layer = "osm.water_areas_centroid_z13_15"
+provider_layer = "ohm.water_areas_centroid_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "water_areas_centroids"
-provider_layer = "osm.water_areas_centroid_z16_20"
+provider_layer = "ohm.water_areas_centroid_z16_20"
 min_zoom = 16
 max_zoom = 20
diff --git a/images/tiler-server/config/providers/water_lines.toml b/images/tiler-server/config/providers/water_lines.toml
index 0750120c..98c9af32 100644
--- a/images/tiler-server/config/providers/water_lines.toml
+++ b/images/tiler-server/config/providers/water_lines.toml
@@ -100,24 +100,24 @@ WHERE
 #######Maps
 [[maps.layers]]
 name = "water_lines"
-provider_layer = "osm.water_lines_z8_9"
+provider_layer = "ohm.water_lines_z8_9"
 min_zoom = 8
 max_zoom = 9
 
 [[maps.layers]]
 name = "water_lines"
-provider_layer = "osm.water_lines_z10_12"
+provider_layer = "ohm.water_lines_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
 name = "water_lines"
-provider_layer = "osm.water_lines_z13_15"
+provider_layer = "ohm.water_lines_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
 name = "water_lines"
-provider_layer = "osm.water_lines_z16_20"
+provider_layer = "ohm.water_lines_z16_20"
 min_zoom = 16
 max_zoom = 20