diff --git a/data/fields/crossing_raised.json b/data/fields/crossing_raised.json
index bcf16fe22..3e911acc0 100644
--- a/data/fields/crossing_raised.json
+++ b/data/fields/crossing_raised.json
@@ -7,5 +7,11 @@
             "undefined": "No",
             "table": "Yes"
         }
-    }
+    },
+    "terms": [
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
+    ]
 }
diff --git a/data/presets/highway/crossing/marked.json b/data/presets/highway/crossing/marked.json
index ebb308dc4..3c248b502 100644
--- a/data/presets/highway/crossing/marked.json
+++ b/data/presets/highway/crossing/marked.json
@@ -23,11 +23,7 @@
     "terms": [
         "zebra crossing",
         "marked crossing",
-        "crosswalk",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "crosswalk"
     ],
     "name": "Marked Crosswalk"
 }
diff --git a/data/presets/highway/crossing/signals.json b/data/presets/highway/crossing/traffic_signals.json
similarity index 89%
rename from data/presets/highway/crossing/signals.json
rename to data/presets/highway/crossing/traffic_signals.json
index 6fbbd684c..fb0db84f8 100644
--- a/data/presets/highway/crossing/signals.json
+++ b/data/presets/highway/crossing/traffic_signals.json
@@ -31,10 +31,6 @@
         "pedestrian traffic signals",
         "pedestrian crossing (lights)",
         "bicycle crossing (lights)",
-        "crosswalk (lights)",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "crosswalk (lights)"
     ]
 }
diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json
index 034f9fca9..0640f22f9 100644
--- a/data/presets/highway/crossing/unmarked.json
+++ b/data/presets/highway/crossing/unmarked.json
@@ -23,11 +23,7 @@
     "terms": [
         "unmarked foot path crossing",
         "unmarked crosswalk",
-        "unmarked pedestrian crossing",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"
 }
diff --git a/data/presets/highway/footway/marked.json b/data/presets/highway/footway/marked.json
index daf6e9bbb..90fe69603 100644
--- a/data/presets/highway/footway/marked.json
+++ b/data/presets/highway/footway/marked.json
@@ -28,11 +28,7 @@
         "marked crossing",
         "marked pedestrian crosswalk",
         "zebra crossing",
-        "crosswalk",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "crosswalk"
     ],
     "name": "Marked Crosswalk"
 }
diff --git a/data/presets/highway/footway/signals.json b/data/presets/highway/footway/traffic_signals.json
similarity index 90%
rename from data/presets/highway/footway/signals.json
rename to data/presets/highway/footway/traffic_signals.json
index 5a7d287a6..404108f3e 100644
--- a/data/presets/highway/footway/signals.json
+++ b/data/presets/highway/footway/traffic_signals.json
@@ -34,10 +34,6 @@
         "pedestrian traffic signals",
         "pedestrian crossing (lights)",
         "bicycle crossing (lights)",
-        "crosswalk (lights)",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "crosswalk (lights)"
     ]
 }
diff --git a/data/presets/highway/footway/unmarked.json b/data/presets/highway/footway/unmarked.json
index dc373b26a..99a5bb350 100644
--- a/data/presets/highway/footway/unmarked.json
+++ b/data/presets/highway/footway/unmarked.json
@@ -26,11 +26,7 @@
     "terms": [
         "unmarked foot path crossing",
         "unmarked crosswalk",
-        "unmarked pedestrian crossing",
-        "flat top",
-        "hump",
-        "speed",
-        "slow"
+        "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index b9fab09e6..122ae509a 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -6019,12 +6019,12 @@ en:
       highway/crossing/marked:
         # highway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Marked Crosswalk
-        # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow'
+        # 'terms: zebra crossing,marked crossing,crosswalk'
         terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
-      highway/crossing/signals:
+      highway/crossing/traffic_signals:
         # highway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Crossing With Pedestrian Signals
-        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights),flat top,hump,speed,slow'
+        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
         terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
       highway/crossing/uncontrolled:
         # highway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -6032,7 +6032,7 @@ en:
       highway/crossing/unmarked:
         # highway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Unmarked Crossing
-        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing,flat top,hump,speed,slow'
+        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
         terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
       highway/crossing/zebra:
         # highway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -6109,22 +6109,22 @@ en:
       highway/footway/marked:
         # highway=footway + footway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Marked Crosswalk
-        # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing,crosswalk,flat top,hump,speed,slow'
+        # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing,crosswalk'
         terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
       highway/footway/sidewalk:
         # footway=sidewalk | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Sidewalk
         # 'terms: pavement,sidepath'
         terms: <translate with synonyms or related terms for 'Sidewalk', separated by commas>
-      highway/footway/signals:
+      highway/footway/traffic_signals:
         # highway=footway + footway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Crossing With Pedestrian Signals
-        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights),flat top,hump,speed,slow'
+        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
         terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
       highway/footway/unmarked:
         # highway=footway + footway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Unmarked Crossing
-        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing,flat top,hump,speed,slow'
+        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
         terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
       highway/footway/zebra:
         # highway=footway + footway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).