diff --git a/data/presets.yaml b/data/presets.yaml
index cc671ca13..8f2c70bd5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -6290,8 +6290,8 @@ en:
         terms: '<translate with synonyms or related terms for ''Basin'', separated by commas>'
       natural/water/canal:
         # 'natural=water, water=canal'
-        name: Canal
-        terms: '<translate with synonyms or related terms for ''Canal'', separated by commas>'
+        name: Canal Area
+        terms: '<translate with synonyms or related terms for ''Canal Area'', separated by commas>'
       natural/water/lake:
         # 'natural=water, water=lake'
         name: Lake
@@ -6312,14 +6312,14 @@ en:
         terms: '<translate with synonyms or related terms for ''Reservoir'', separated by commas>'
       natural/water/river:
         # 'natural=water, water=river'
-        name: River
+        name: River Area
         # 'terms: beck,branch,brook,course,creek,estuary,rill,riverbank,rivulet,run,runnel,stream,tributary,watercourse'
-        terms: '<translate with synonyms or related terms for ''River'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''River Area'', separated by commas>'
       natural/water/stream:
         # 'natural=water, water=stream'
-        name: Stream
+        name: Stream Area
         # 'terms: beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse'
-        terms: '<translate with synonyms or related terms for ''Stream'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Stream Area'', separated by commas>'
       natural/water/wastewater:
         # 'natural=water, water=wastewater'
         name: Wastewater Basin
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e20eccbd1..f55b3103a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -810,13 +810,13 @@
     "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["mountain", "crater"], "name": "Volcano"},
     "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
     "natural/water/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"natural": "water", "water": "basin"}, "reference": {"key": "water", "value": "basin"}, "terms": ["detention", "drain", "overflow", "rain", "retention"], "name": "Basin"},
-    "natural/water/canal": {"icon": "iD-waterway-canal", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"},
+    "natural/water/canal": {"icon": "iD-waterway-canal", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal Area"},
     "natural/water/lake": {"icon": "maki-water", "fields": ["{natural/water}", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"},
     "natural/water/moat": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "moat"}, "name": "Moat"},
     "natural/water/pond": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "water", "value": "pond"}, "terms": ["lakelet", "millpond", "tarn", "pool", "mere"], "name": "Pond"},
     "natural/water/reservoir": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"},
-    "natural/water/river": {"icon": "iD-waterway-river", "fields": ["{natural/water}", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "riverbank", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River"},
-    "natural/water/stream": {"icon": "iD-waterway-stream", "fields": ["{natural/water}"], "geometry": ["area"], "tags": {"natural": "water", "water": "stream"}, "reference": {"key": "water", "value": "stream"}, "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "name": "Stream"},
+    "natural/water/river": {"icon": "iD-waterway-river", "fields": ["{natural/water}", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "riverbank", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River Area"},
+    "natural/water/stream": {"icon": "iD-waterway-stream", "fields": ["{natural/water}"], "geometry": ["area"], "tags": {"natural": "water", "water": "stream"}, "reference": {"key": "water", "value": "stream"}, "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "name": "Stream Area"},
     "natural/water/wastewater": {"icon": "temaki-waste", "geometry": ["area"], "tags": {"natural": "water", "water": "wastewater"}, "reference": {"key": "water", "value": "wastewater"}, "terms": ["excrement", "shit", "sewage", "wastewater", "Settling Basin", "Clarifier Basin"], "name": "Wastewater Basin"},
     "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"},
     "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"},
diff --git a/data/presets/presets/natural/water/canal.json b/data/presets/presets/natural/water/canal.json
index 96505bb92..749c3d45a 100644
--- a/data/presets/presets/natural/water/canal.json
+++ b/data/presets/presets/natural/water/canal.json
@@ -15,5 +15,5 @@
         "key": "water",
         "value": "canal"
     },
-    "name": "Canal"
+    "name": "Canal Area"
 }
diff --git a/data/presets/presets/natural/water/river.json b/data/presets/presets/natural/water/river.json
index 5909ba6d6..10f242919 100644
--- a/data/presets/presets/natural/water/river.json
+++ b/data/presets/presets/natural/water/river.json
@@ -31,5 +31,5 @@
         "tributary",
         "watercourse"
     ],
-    "name": "River"
+    "name": "River Area"
 }
diff --git a/data/presets/presets/natural/water/stream.json b/data/presets/presets/natural/water/stream.json
index a7b9425f8..9a9e8b0e8 100644
--- a/data/presets/presets/natural/water/stream.json
+++ b/data/presets/presets/natural/water/stream.json
@@ -41,5 +41,5 @@
         "tributary",
         "watercourse"
     ],
-    "name": "Stream"
+    "name": "Stream Area"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index d6c846a09..cad1e70cd 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -786,13 +786,13 @@
     {"key": "natural", "value": "volcano", "description": "🄿 Volcano", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/volcano-15.svg"},
     {"key": "natural", "value": "water", "description": "🄿 Water", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "basin", "description": "🄿 Basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
-    {"key": "water", "value": "canal", "description": "🄿 Canal", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-canal.svg"},
+    {"key": "water", "value": "canal", "description": "🄿 Canal Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-canal.svg"},
     {"key": "water", "value": "lake", "description": "🄿 Lake", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "moat", "description": "🄿 Moat", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "pond", "description": "🄿 Pond", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "reservoir", "description": "🄿 Reservoir", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
-    {"key": "water", "value": "river", "description": "🄿 River", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-river.svg"},
-    {"key": "water", "value": "stream", "description": "🄿 Stream", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
+    {"key": "water", "value": "river", "description": "🄿 River Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-river.svg"},
+    {"key": "water", "value": "stream", "description": "🄿 Stream Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
     {"key": "water", "value": "wastewater", "description": "🄿 Wastewater Basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste.svg"},
     {"key": "natural", "value": "wetland", "description": "🄿 Wetland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wetland-15.svg"},
     {"key": "natural", "value": "wood", "description": "🄿 Wood", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 488587f75..99e19d01e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -7847,7 +7847,7 @@
                     "terms": "detention,drain,overflow,rain,retention"
                 },
                 "natural/water/canal": {
-                    "name": "Canal",
+                    "name": "Canal Area",
                     "terms": ""
                 },
                 "natural/water/lake": {
@@ -7867,11 +7867,11 @@
                     "terms": ""
                 },
                 "natural/water/river": {
-                    "name": "River",
+                    "name": "River Area",
                     "terms": "beck,branch,brook,course,creek,estuary,rill,riverbank,rivulet,run,runnel,stream,tributary,watercourse"
                 },
                 "natural/water/stream": {
-                    "name": "Stream",
+                    "name": "Stream Area",
                     "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"
                 },
                 "natural/water/wastewater": {