diff --git a/layers/transportation_name/merge_highways.sql b/layers/transportation_name/merge_highways.sql
index d3ebedf..7ad1f16 100644
--- a/layers/transportation_name/merge_highways.sql
+++ b/layers/transportation_name/merge_highways.sql
@@ -79,10 +79,10 @@ CREATE OR REPLACE FUNCTION transportation_name.refresh() RETURNS trigger AS
   $BODY$
   BEGIN
     RAISE LOG 'Refresh transportation_name';
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_transportation_name_linestring;
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_transportation_name_linestring_gen1;
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_transportation_name_linestring_gen2;
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_transportation_name_linestring_gen3;
+    REFRESH MATERIALIZED VIEW osm_transportation_name_linestring;
+    REFRESH MATERIALIZED VIEW osm_transportation_name_linestring_gen1;
+    REFRESH MATERIALIZED VIEW osm_transportation_name_linestring_gen2;
+    REFRESH MATERIALIZED VIEW osm_transportation_name_linestring_gen3;
     DELETE FROM transportation_name.updates;
     RETURN null;
   END;
diff --git a/layers/water_name/water_lakeline.sql b/layers/water_name/water_lakeline.sql
index dea4251..56aa383 100644
--- a/layers/water_name/water_lakeline.sql
+++ b/layers/water_name/water_lakeline.sql
@@ -31,7 +31,7 @@ CREATE OR REPLACE FUNCTION water_lakeline.refresh() RETURNS trigger AS
   $BODY$
   BEGIN
     RAISE LOG 'Refresh water_lakeline';
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_water_lakeline;
+    REFRESH MATERIALIZED VIEW osm_water_lakeline;
     DELETE FROM water_lakeline.updates;
     RETURN null;
   END;
diff --git a/layers/water_name/water_point.sql b/layers/water_name/water_point.sql
index 7fdc379..37640da 100644
--- a/layers/water_name/water_point.sql
+++ b/layers/water_name/water_point.sql
@@ -1,5 +1,5 @@
 DROP TRIGGER IF EXISTS trigger_flag ON osm_water_polygon;
-DROP TRIGGER IF EXISTS trigger_refresh ON water_name.updates;
+DROP TRIGGER IF EXISTS trigger_refresh ON water_point.updates;
 
 -- etldoc:  osm_water_polygon ->  osm_water_point
 -- etldoc:  lake_centerline ->  osm_water_point
@@ -17,22 +17,22 @@ CREATE INDEX IF NOT EXISTS osm_water_point_geometry_idx ON osm_water_point USING
  
 -- Handle updates
 
-CREATE SCHEMA IF NOT EXISTS water_name;
+CREATE SCHEMA IF NOT EXISTS water_point;
 
-CREATE TABLE IF NOT EXISTS water_name.updates(id serial primary key, t text, unique (t));
-CREATE OR REPLACE FUNCTION water_name.flag() RETURNS trigger AS $$
+CREATE TABLE IF NOT EXISTS water_point.updates(id serial primary key, t text, unique (t));
+CREATE OR REPLACE FUNCTION water_point.flag() RETURNS trigger AS $$
 BEGIN
-    INSERT INTO water_name.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
+    INSERT INTO water_point.updates(t) VALUES ('y')  ON CONFLICT(t) DO NOTHING;
     RETURN null;
 END;    
 $$ language plpgsql;
 
-CREATE OR REPLACE FUNCTION water_name.refresh() RETURNS trigger AS
+CREATE OR REPLACE FUNCTION water_point.refresh() RETURNS trigger AS
   $BODY$
   BEGIN
     RAISE LOG 'Refresh water_point';
     REFRESH MATERIALIZED VIEW osm_water_point;
-    DELETE FROM water_name.updates;
+    DELETE FROM water_point.updates;
     RETURN null;
   END;
   $BODY$
@@ -41,10 +41,10 @@ language plpgsql;
 CREATE TRIGGER trigger_flag
     AFTER INSERT OR UPDATE OR DELETE ON osm_water_polygon
     FOR EACH STATEMENT
-    EXECUTE PROCEDURE water_name.flag();
+    EXECUTE PROCEDURE water_point.flag();
 
 CREATE CONSTRAINT TRIGGER trigger_refresh
-    AFTER INSERT ON water_name.updates
+    AFTER INSERT ON water_point.updates
     INITIALLY DEFERRED
     FOR EACH ROW
-    EXECUTE PROCEDURE water_name.refresh();
+    EXECUTE PROCEDURE water_point.refresh();
diff --git a/layers/waterway/merge_waterway.sql b/layers/waterway/merge_waterway.sql
index 93c8200..5cf6ab0 100644
--- a/layers/waterway/merge_waterway.sql
+++ b/layers/waterway/merge_waterway.sql
@@ -66,10 +66,10 @@ CREATE OR REPLACE FUNCTION waterway.refresh() RETURNS trigger AS
   $BODY$
   BEGIN
     RAISE LOG 'Refresh waterway';
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_important_waterway_linestring;
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_important_waterway_linestring_gen1;
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_important_waterway_linestring_gen2;
-    REFRESH MATERIALIZED VIEW CONCURRENTLY osm_important_waterway_linestring_gen3;
+    REFRESH MATERIALIZED VIEW osm_important_waterway_linestring;
+    REFRESH MATERIALIZED VIEW osm_important_waterway_linestring_gen1;
+    REFRESH MATERIALIZED VIEW osm_important_waterway_linestring_gen2;
+    REFRESH MATERIALIZED VIEW osm_important_waterway_linestring_gen3;
     DELETE FROM waterway.updates;
     RETURN null;
   END;