     ALTER TABLE osm_place_polygon DISABLE TRIGGER USER;
     ALTER TABLE osm_poi_point DISABLE TRIGGER USER;
     ALTER TABLE osm_poi_polygon DISABLE TRIGGER USER;
-    ALTER TABLE osm_road_polygon DISABLE TRIGGER USER;
-    ALTER TABLE osm_road_linestring DISABLE TRIGGER USER;
+    ALTER TABLE osm_road_geometry DISABLE TRIGGER USER;
     ALTER TABLE osm_admin_linestring DISABLE TRIGGER USER;
     ALTER TABLE osm_water_linestring DISABLE TRIGGER USER;
     ALTER TABLE osm_water_polygon DISABLE TRIGGER USER;

    DROP TABLE osm_place_polygon CASCADE;
    DROP TABLE osm_poi_point CASCADE;
    DROP TABLE osm_poi_polygon CASCADE;
    DROP TABLE osm_road_linestring CASCADE;
    DROP TABLE osm_road_polygon CASCADE;
    DROP TABLE osm_water_linestring CASCADE;
    DROP TABLE osm_water_polygon CASCADE;
    DROP TABLE osm_water_polygon_gen1 CASCADE;

    UPDATE osm_place_polygon SET timestamp=ts WHERE timestamp IS NULL;
	UPDATE osm_poi_point SET timestamp=ts WHERE timestamp IS NULL;
	UPDATE osm_poi_polygon SET timestamp=ts WHERE timestamp IS NULL;
	UPDATE osm_road_geometry SET timestamp=ts WHERE timestamp IS NULL;
	UPDATE osm_water_linestring SET timestamp=ts WHERE timestamp IS NULL;
	UPDATE osm_water_polygon SET timestamp=ts WHERE timestamp IS NULL;
	UPDATE osm_water_polygon_gen1 SET timestamp=ts WHERE timestamp IS NULL;
