diff --git a/data/presets.yaml b/data/presets.yaml
index 2c6b4041a..da650b9f6 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4270,7 +4270,7 @@ en:
       natural/cliff:
         # natural=cliff
         name: Cliff
-        # 'terms: escarpment'
+        # 'terms: crag,escarpment,rock face,scarp'
         terms: '<translate with synonyms or related terms for ''Cliff'', separated by commas>'
       natural/coastline:
         # natural=coastline
diff --git a/data/presets/presets.json b/data/presets/presets.json
index dc5d33927..4f19cc1b0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -565,7 +565,7 @@
     "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"},
     "natural/beach": {"icon": "temaki-beach", "fields": ["surface"], "geometry": ["point", "area"], "tags": {"natural": "beach"}, "terms": ["shore"], "name": "Beach"},
     "natural/cave_entrance": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["fee", "access_simple", "direction"], "tags": {"natural": "cave_entrance"}, "terms": ["cavern", "hollow", "grotto", "shelter", "cavity"], "name": "Cave Entrance"},
-    "natural/cliff": {"icon": "maki-triangle", "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "cliff"}, "terms": ["escarpment"], "name": "Cliff"},
+    "natural/cliff": {"icon": "maki-triangle", "fields": ["name", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "cliff"}, "terms": ["crag", "escarpment", "rock face", "scarp"], "name": "Cliff"},
     "natural/coastline": {"geometry": ["line"], "tags": {"natural": "coastline"}, "terms": ["shore"], "name": "Coastline"},
     "natural/fell": {"geometry": ["area"], "tags": {"natural": "fell"}, "terms": [], "name": "Fell"},
     "natural/glacier": {"geometry": ["area"], "tags": {"natural": "glacier"}, "terms": [], "name": "Glacier"},
diff --git a/data/presets/presets/natural/cliff.json b/data/presets/presets/natural/cliff.json
index b2434129a..7c7947839 100644
--- a/data/presets/presets/natural/cliff.json
+++ b/data/presets/presets/natural/cliff.json
@@ -1,5 +1,9 @@
 {
     "icon": "maki-triangle",
+    "fields": [
+        "name",
+        "height"
+    ],
     "geometry": [
         "point",
         "vertex",
@@ -10,7 +14,10 @@
         "natural": "cliff"
     },
     "terms": [
-        "escarpment"
+        "crag",
+        "escarpment",
+        "rock face",
+        "scarp"
     ],
     "name": "Cliff"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index cb556b931..d0ee61534 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5093,7 +5093,7 @@
                 },
                 "natural/cliff": {
                     "name": "Cliff",
-                    "terms": "escarpment"
+                    "terms": "crag,escarpment,rock face,scarp"
                 },
                 "natural/coastline": {
                     "name": "Coastline",