diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml
index 9c5598ef..7e526419 100644
--- a/layers/water/mapping.yaml
+++ b/layers/water/mapping.yaml
@@ -75,6 +75,9 @@ tables:
     - name: waterway
       key: waterway
       type: string
+    - name: water
+      key: water
+      type: string
     - name: is_intermittent
       key: intermittent
       type: bool
@@ -95,11 +98,8 @@ tables:
       - bay
       - spring
       waterway:
-      - river
       - riverbank
-      - stream
-      - canal
-      - drain
-      - ditch
       - dock
+      water:
+      - river
     type: polygon
diff --git a/layers/water/mapping_diagram.png b/layers/water/mapping_diagram.png
index 61ca4ddd..4d08bc09 100644
Binary files a/layers/water/mapping_diagram.png and b/layers/water/mapping_diagram.png differ
diff --git a/layers/water/water.sql b/layers/water/water.sql
index 6b8144ea..8ba2ec64 100644
--- a/layers/water/water.sql
+++ b/layers/water/water.sql
@@ -1,8 +1,9 @@
-CREATE OR REPLACE FUNCTION water_class(waterway text) RETURNS text AS
+CREATE OR REPLACE FUNCTION water_class(waterway text, water text) RETURNS text AS
 $$
 SELECT CASE
+           WHEN waterway='riverbank' THEN 'river'
            %%FIELD_MAPPING: class %%
-           ELSE 'river'
+           ELSE 'lake'
            END;
 $$ LANGUAGE SQL IMMUTABLE
                 PARALLEL SAFE;
@@ -314,7 +315,7 @@ FROM osm_ocean_polygon_gen_z6
 UNION ALL
 -- etldoc:  osm_water_polygon_gen_z6 ->  water_z6
 SELECT geometry,
-       water_class(waterway) AS class,
+       water_class(waterway, water) AS class,
        is_intermittent,
        NULL::boolean AS is_bridge,
        NULL::boolean AS is_tunnel
@@ -334,7 +335,7 @@ FROM osm_ocean_polygon_gen_z7
 UNION ALL
 -- etldoc:  osm_water_polygon_gen_z7 ->  water_z7
 SELECT geometry,
-       water_class(waterway) AS class,
+       water_class(waterway, water) AS class,
        is_intermittent,
        NULL::boolean AS is_bridge,
        NULL::boolean AS is_tunnel
@@ -354,7 +355,7 @@ FROM osm_ocean_polygon_gen_z8
 UNION ALL
 -- etldoc:  osm_water_polygon_gen_z8 ->  water_z8
 SELECT geometry,
-       water_class(waterway) AS class,
+       water_class(waterway, water) AS class,
        is_intermittent,
        NULL::boolean AS is_bridge,
        NULL::boolean AS is_tunnel
@@ -374,7 +375,7 @@ FROM osm_ocean_polygon_gen_z9
 UNION ALL
 -- etldoc:  osm_water_polygon_gen_z9 ->  water_z9
 SELECT geometry,
-       water_class(waterway) AS class,
+       water_class(waterway, water) AS class,
        is_intermittent,
        NULL::boolean AS is_bridge,
        NULL::boolean AS is_tunnel
@@ -394,7 +395,7 @@ FROM osm_ocean_polygon_gen_z10
 UNION ALL
 -- etldoc:  osm_water_polygon_gen_z10 ->  water_z10
 SELECT geometry,
-       water_class(waterway) AS class,
+       water_class(waterway, water) AS class,
        is_intermittent,
        NULL::boolean AS is_bridge,
        NULL::boolean AS is_tunnel
@@ -414,7 +415,7 @@ FROM osm_ocean_polygon_gen_z11
 UNION ALL
 -- etldoc:  osm_water_polygon_gen_z11 ->  water_z11
 SELECT geometry,
-       water_class(waterway) AS class,
+       water_class(waterway, water) AS class,
        is_intermittent,
        NULL::boolean AS is_bridge,
        NULL::boolean AS is_tunnel
@@ -434,7 +435,7 @@ FROM osm_ocean_polygon_union
 UNION ALL
 -- etldoc:  osm_water_polygon ->  water_z12
 SELECT geometry,
-       water_class(waterway) AS class,
+       water_class(waterway, water) AS class,
        is_intermittent,
        is_bridge,
        is_tunnel
diff --git a/layers/water/water.yaml b/layers/water/water.yaml
index 913fe49d..dce377cc 100644
--- a/layers/water/water.yaml
+++ b/layers/water/water.yaml
@@ -12,14 +12,18 @@ layer:
     class:
       description: |
           All water polygons from [OpenStreetMapData](http://osmdata.openstreetmap.de/) have the class `ocean`.
-          Water bodies with the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag are classified as `lake`, `dock`, or `river`.
+          Water bodies with the [`waterway=riverbank`](http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank) 
+          or [`water=river`](http://wiki.openstreetmap.org/wiki/Tag:water=river) tag are classified as river.  Wet and dry docks
+          tagged [`waterway=dock`](http://wiki.openstreetmap.org/wiki/Tag:waterway=dock) are classified as a `dock`.
           All other water bodies are classified as `lake`.
       values:
-        lake:
-          waterway: ['', 'lake']
         dock:
           waterway: 'dock'
         river:
+          water: 'river'
+          waterway: 'riverbank'
+        lake:
+          waterway: ''
         ocean:
     intermittent:
       description: |
diff --git a/layers/water_name/mapping_diagram.png b/layers/water_name/mapping_diagram.png
index e18ee367..4b8e5a40 100644
Binary files a/layers/water_name/mapping_diagram.png and b/layers/water_name/mapping_diagram.png differ