diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql
index a5439dbf..5713fb49 100644
--- a/layers/waterway/waterway.sql
+++ b/layers/waterway/waterway.sql
@@ -1,19 +1,19 @@
 
 -- etldoc: ne_110m_rivers_lake_centerlines ->  waterway_z3
 CREATE OR REPLACE VIEW waterway_z3 AS (
-    SELECT geom AS geometry, 'river'::text AS class, name FROM ne_110m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_110m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 -- etldoc: ne_50m_rivers_lake_centerlines ->  waterway_z4
 CREATE OR REPLACE VIEW waterway_z4 AS (
-    SELECT geom AS geometry, 'river'::text AS class, name FROM ne_50m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_50m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 -- etldoc: ne_10m_rivers_lake_centerlines ->  waterway_z6
 CREATE OR REPLACE VIEW waterway_z6 AS (
-    SELECT geom AS geometry, 'river'::text AS class, name FROM ne_10m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_10m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml
index f03dde45..187a3293 100644
--- a/layers/waterway/waterway.yaml
+++ b/layers/waterway/waterway.yaml
@@ -1,12 +1,15 @@
 layer:
   id: "waterway"
   description: |
-      Rivers based of OpenStreetMap [waterways](http://wiki.openstreetmap.org/wiki/Waterways) for *z8* to *z14*
-      and Natural Earth rivers and lake centerlines from *z3* to *z7*.
-      Too short linestrings are filtered out for some zoom levels. Waterways do no not have a `subclass`.
+      Rivers based of OpenStreetMap [waterways](http://wiki.openstreetmap.org/wiki/Waterways) for *z9* to *z14*
+      and Natural Earth rivers and lake centerlines from *z3* to *z8*.
+      Linestrings without a name or which are too short are filtered
+      out at low zoom levels. Waterways do no not have a `subclass` field.
   buffer_size: 4
   fields:
-    name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway or the name from Natural Earth for lower zoom levels.
+    name: |
+        The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway.
+        The `name` field is empty for NaturalEarth data until **z9** when OSM data is used.
     class: |
         The original value of the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag.
         Can be one of [`stream`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dstream),