--- a/schema/gemma.sql	Thu Jul 25 12:33:19 2019 +0200
+++ b/schema/gemma.sql	Thu Jul 25 12:36:07 2019 +0200
@@ -484,8 +484,8 @@
         UNIQUE (measure_date, location, staging_done)
     )
     CREATE CONSTRAINT TRIGGER waterway_gauge_measurements_reference_gauge
-        AFTER INSERT OR UPDATE OF location ON waterway.gauge_measurements
-        FOR EACH ROW EXECUTE FUNCTION check_valid_gauge_ts('location','measure_date');
+        AFTER INSERT OR UPDATE OF location ON gauge_measurements
+        FOR EACH ROW EXECUTE FUNCTION check_valid_gauge_ts('location','measure_date')
     -- For fast retrieval of newest measurement per location:
     CREATE INDEX gauge_measurements_location_measure_date_desc
         ON waterway.gauge_measurements (location, measure_date DESC)
@@ -506,8 +506,8 @@
         PRIMARY KEY (measure_date, location, date_issue)
     )
     CREATE CONSTRAINT TRIGGER waterway_gauge_predictions_reference_gauge
-        AFTER INSERT OR UPDATE OF location ON waterway.gauge_predictions
-        FOR EACH ROW EXECUTE FUNCTION check_valid_gauge_ts('location','measure_date');
+        AFTER INSERT OR UPDATE OF location ON gauge_predictions
+        FOR EACH ROW EXECUTE FUNCTION check_valid_gauge_ts('location','measure_date')
 
     CREATE TABLE waterway_axis (
         id int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
@@ -702,12 +702,12 @@
         staging_done boolean NOT NULL DEFAULT false
     )
     CREATE CONSTRAINT TRIGGER a_sounding_results_reference_bottleneck
-        AFTER INSERT OR UPDATE OF bottleneck_id ON waterway.sounding_results
+        AFTER INSERT OR UPDATE OF bottleneck_id ON sounding_results
         FOR EACH ROW
-        EXECUTE FUNCTION check_valid_bottleneck_ts('bottleneck_id','date_info');
+        EXECUTE FUNCTION check_valid_bottleneck_ts('bottleneck_id','date_info')
     CREATE CONSTRAINT TRIGGER b_sounding_results_in_bn_area
-        AFTER INSERT OR UPDATE ON waterway.sounding_results
-        FOR EACH ROW EXECUTE FUNCTION check_sr_in_bn_area();
+        AFTER INSERT OR UPDATE ON sounding_results
+        FOR EACH ROW EXECUTE FUNCTION check_sr_in_bn_area()
 
     CREATE TABLE sounding_results_contour_lines (
         sounding_result_id int NOT NULL REFERENCES sounding_results