diff --git a/data/presets.yaml b/data/presets.yaml
index ba0b8031c..125b3fd50 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2684,11 +2684,21 @@ en:
         # 'highway=footway, footway=crossing'
         name: Street Crossing
         terms: '<translate with synonyms or related terms for ''Street Crossing'', separated by commas>'
+      footway/crossing-raised:
+        # 'highway=footway, footway=crossing, traffic_calming=table'
+        name: Raised Street Crossing
+        # 'terms: flat top,hump,speed,slow'
+        terms: '<translate with synonyms or related terms for ''Raised Street Crossing'', separated by commas>'
       footway/crosswalk:
         # 'highway=footway, footway=crossing, crossing=zebra'
         name: Pedestrian Crosswalk
         # 'terms: zebra crossing'
         terms: '<translate with synonyms or related terms for ''Pedestrian Crosswalk'', separated by commas>'
+      footway/crosswalk-raised:
+        # 'highway=footway, footway=crossing, crossing=zebra, traffic_calming=table'
+        name: Raised Pedestrian Crosswalk
+        # 'terms: zebra crossing,flat top,hump,speed,slow'
+        terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crosswalk'', separated by commas>'
       footway/sidewalk:
         # 'highway=footway, footway=sidewalk'
         name: Sidewalk
@@ -2765,11 +2775,21 @@ en:
         # highway=crossing
         name: Street Crossing
         terms: '<translate with synonyms or related terms for ''Street Crossing'', separated by commas>'
+      highway/crossing-raised:
+        # 'highway=crossing, traffic_calming=table'
+        name: Raised Street Crossing
+        # 'terms: flat top,hump,speed,slow'
+        terms: '<translate with synonyms or related terms for ''Raised Street Crossing'', separated by commas>'
       highway/crosswalk:
         # 'highway=crossing, crossing=zebra'
         name: Pedestrian Crosswalk
         # 'terms: zebra crossing'
         terms: '<translate with synonyms or related terms for ''Pedestrian Crosswalk'', separated by commas>'
+      highway/crosswalk-raised:
+        # 'highway=crossing, crossing=zebra, traffic_calming=table'
+        name: Raised Pedestrian Crosswalk
+        # 'terms: zebra crossing,flat top,hump,speed,slow'
+        terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crosswalk'', separated by commas>'
       highway/cycleway:
         # highway=cycleway
         name: Cycle Path
@@ -4679,10 +4699,10 @@ en:
         # 'terms: audible lines,sleeper lines,growlers'
         terms: '<translate with synonyms or related terms for ''Rumble Strip'', separated by commas>'
       traffic_calming/table:
-        # 'highway=crossing, traffic_calming=table'
-        name: Raised Pedestrian Crossing
+        # traffic_calming=table
+        name: Speed Table
         # 'terms: flat top,hump,speed,slow'
-        terms: '<translate with synonyms or related terms for ''Raised Pedestrian Crossing'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Speed Table'', separated by commas>'
       type/boundary:
         # type=boundary
         name: Boundary
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c44d78592..a038f69ff 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5745,9 +5745,36 @@
             ],
             "name": "Entrance/Exit"
         },
+        "footway/crossing-raised": {
+            "fields": [
+                "crossing",
+                "access",
+                "surface",
+                "kerb",
+                "tactile_paving"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "highway": "footway",
+                "footway": "crossing",
+                "traffic_calming": "table"
+            },
+            "reference": {
+                "key": "traffic_calming",
+                "value": "table"
+            },
+            "terms": [
+                "flat top",
+                "hump",
+                "speed",
+                "slow"
+            ],
+            "name": "Raised Street Crossing"
+        },
         "footway/crossing": {
             "fields": [
-                "name",
                 "crossing",
                 "access",
                 "surface",
@@ -5768,10 +5795,40 @@
             "terms": [],
             "name": "Street Crossing"
         },
+        "footway/crosswalk-raised": {
+            "icon": "highway-footway",
+            "fields": [
+                "crossing",
+                "access",
+                "surface",
+                "kerb",
+                "tactile_paving"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "highway": "footway",
+                "footway": "crossing",
+                "crossing": "zebra",
+                "traffic_calming": "table"
+            },
+            "reference": {
+                "key": "traffic_calming",
+                "value": "table"
+            },
+            "terms": [
+                "zebra crossing",
+                "flat top",
+                "hump",
+                "speed",
+                "slow"
+            ],
+            "name": "Raised Pedestrian Crosswalk"
+        },
         "footway/crosswalk": {
             "icon": "highway-footway",
             "fields": [
-                "name",
                 "crossing",
                 "access",
                 "surface",
@@ -5798,7 +5855,6 @@
         "footway/sidewalk": {
             "icon": "highway-footway",
             "fields": [
-                "name",
                 "surface",
                 "lit",
                 "width",
@@ -6098,9 +6154,33 @@
             ],
             "name": "Indoor Corridor"
         },
+        "highway/crossing-raised": {
+            "fields": [
+                "crossing",
+                "kerb",
+                "tactile_paving"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "highway": "crossing",
+                "traffic_calming": "table"
+            },
+            "reference": {
+                "key": "traffic_calming",
+                "value": "table"
+            },
+            "terms": [
+                "flat top",
+                "hump",
+                "speed",
+                "slow"
+            ],
+            "name": "Raised Street Crossing"
+        },
         "highway/crossing": {
             "fields": [
-                "name",
                 "crossing",
                 "kerb",
                 "tactile_paving"
@@ -6118,10 +6198,37 @@
             "terms": [],
             "name": "Street Crossing"
         },
+        "highway/crosswalk-raised": {
+            "icon": "poi-foot",
+            "fields": [
+                "crossing",
+                "kerb",
+                "tactile_paving"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "highway": "crossing",
+                "crossing": "zebra",
+                "traffic_calming": "table"
+            },
+            "reference": {
+                "key": "traffic_calming",
+                "value": "table"
+            },
+            "terms": [
+                "zebra crossing",
+                "flat top",
+                "hump",
+                "speed",
+                "slow"
+            ],
+            "name": "Raised Pedestrian Crosswalk"
+        },
         "highway/crosswalk": {
             "icon": "poi-foot",
             "fields": [
-                "name",
                 "crossing",
                 "kerb",
                 "tactile_paving"
@@ -14645,20 +14752,18 @@
                 "surface"
             ],
             "geometry": [
-                "vertex",
-                "line"
+                "vertex"
             ],
+            "tags": {
+                "traffic_calming": "table"
+            },
             "terms": [
                 "flat top",
                 "hump",
                 "speed",
                 "slow"
             ],
-            "tags": {
-                "highway": "crossing",
-                "traffic_calming": "table"
-            },
-            "name": "Raised Pedestrian Crossing"
+            "name": "Speed Table"
         },
         "type/multipolygon": {
             "geometry": [
diff --git a/data/presets/presets/footway/crossing-raised.json b/data/presets/presets/footway/crossing-raised.json
new file mode 100644
index 000000000..0ed1a2b50
--- /dev/null
+++ b/data/presets/presets/footway/crossing-raised.json
@@ -0,0 +1,28 @@
+{
+    "fields": [
+        "crossing",
+        "access",
+        "surface",
+        "kerb",
+        "tactile_paving"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "traffic_calming": "table"
+    },
+    "reference": {
+        "key": "traffic_calming",
+        "value": "table"
+    },
+    "terms": [
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
+    ],
+    "name": "Raised Street Crossing"
+}
diff --git a/data/presets/presets/footway/crossing.json b/data/presets/presets/footway/crossing.json
index 6726decff..293e22af8 100644
--- a/data/presets/presets/footway/crossing.json
+++ b/data/presets/presets/footway/crossing.json
@@ -1,6 +1,5 @@
 {
     "fields": [
-        "name",
         "crossing",
         "access",
         "surface",
diff --git a/data/presets/presets/footway/crosswalk-raised.json b/data/presets/presets/footway/crosswalk-raised.json
new file mode 100644
index 000000000..7d337fb37
--- /dev/null
+++ b/data/presets/presets/footway/crosswalk-raised.json
@@ -0,0 +1,31 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "crossing",
+        "access",
+        "surface",
+        "kerb",
+        "tactile_paving"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "crossing": "zebra",
+        "traffic_calming": "table"
+    },
+    "reference": {
+        "key": "traffic_calming",
+        "value": "table"
+    },
+    "terms": [
+        "zebra crossing",
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
+    ],
+    "name": "Raised Pedestrian Crosswalk"
+}
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json
index f77176c93..b4daf5f29 100644
--- a/data/presets/presets/footway/crosswalk.json
+++ b/data/presets/presets/footway/crosswalk.json
@@ -1,7 +1,6 @@
 {
     "icon": "highway-footway",
     "fields": [
-        "name",
         "crossing",
         "access",
         "surface",
diff --git a/data/presets/presets/footway/sidewalk.json b/data/presets/presets/footway/sidewalk.json
index ac14c8a24..f51b44cf9 100644
--- a/data/presets/presets/footway/sidewalk.json
+++ b/data/presets/presets/footway/sidewalk.json
@@ -1,7 +1,6 @@
 {
     "icon": "highway-footway",
     "fields": [
-        "name",
         "surface",
         "lit",
         "width",
diff --git a/data/presets/presets/highway/crossing-raised.json b/data/presets/presets/highway/crossing-raised.json
new file mode 100644
index 000000000..1b57fa04e
--- /dev/null
+++ b/data/presets/presets/highway/crossing-raised.json
@@ -0,0 +1,25 @@
+{
+    "fields": [
+        "crossing",
+        "kerb",
+        "tactile_paving"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "crossing",
+        "traffic_calming": "table"
+    },
+    "reference": {
+        "key": "traffic_calming",
+        "value": "table"
+    },
+    "terms": [
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
+    ],
+    "name": "Raised Street Crossing"
+}
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index 87613d4bd..971062c98 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -1,6 +1,5 @@
 {
     "fields": [
-        "name",
         "crossing",
         "kerb",
         "tactile_paving"
diff --git a/data/presets/presets/highway/crosswalk-raised.json b/data/presets/presets/highway/crosswalk-raised.json
new file mode 100644
index 000000000..b5340ad3e
--- /dev/null
+++ b/data/presets/presets/highway/crosswalk-raised.json
@@ -0,0 +1,28 @@
+{
+    "icon": "poi-foot",
+    "fields": [
+        "crossing",
+        "kerb",
+        "tactile_paving"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "crossing",
+        "crossing": "zebra",
+        "traffic_calming": "table"
+    },
+    "reference": {
+        "key": "traffic_calming",
+        "value": "table"
+    },
+    "terms": [
+        "zebra crossing",
+        "flat top",
+        "hump",
+        "speed",
+        "slow"
+    ],
+    "name": "Raised Pedestrian Crosswalk"
+}
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
index 787bbfb62..08dc6a3b1 100644
--- a/data/presets/presets/highway/crosswalk.json
+++ b/data/presets/presets/highway/crosswalk.json
@@ -1,7 +1,6 @@
 {
     "icon": "poi-foot",
     "fields": [
-        "name",
         "crossing",
         "kerb",
         "tactile_paving"
diff --git a/data/presets/presets/traffic_calming/table.json b/data/presets/presets/traffic_calming/table.json
index 2c0b94a91..275adfff1 100644
--- a/data/presets/presets/traffic_calming/table.json
+++ b/data/presets/presets/traffic_calming/table.json
@@ -4,18 +4,16 @@
         "surface"
     ],
     "geometry": [
-        "vertex",
-        "line"
+        "vertex"
     ],
+    "tags": {
+        "traffic_calming": "table"
+    },
     "terms": [
         "flat top",
         "hump",
         "speed",
         "slow"
     ],
-    "tags": {
-        "highway":"crossing",
-        "traffic_calming": "table"
-    },
-    "name": "Raised Pedestrian Crossing"
+    "name": "Speed Table"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 8a28a452c..d780ea65e 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1133,10 +1133,18 @@
         {
             "key": "entrance"
         },
+        {
+            "key": "traffic_calming",
+            "value": "table"
+        },
         {
             "key": "footway",
             "value": "crossing"
         },
+        {
+            "key": "traffic_calming",
+            "value": "table"
+        },
         {
             "key": "crossing",
             "value": "zebra"
@@ -1205,10 +1213,18 @@
             "key": "highway",
             "value": "corridor"
         },
+        {
+            "key": "traffic_calming",
+            "value": "table"
+        },
         {
             "key": "highway",
             "value": "crossing"
         },
+        {
+            "key": "traffic_calming",
+            "value": "table"
+        },
         {
             "key": "crossing",
             "value": "zebra"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 766d81d91..a1c413778 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3429,10 +3429,18 @@
                     "name": "Entrance/Exit",
                     "terms": ""
                 },
+                "footway/crossing-raised": {
+                    "name": "Raised Street Crossing",
+                    "terms": "flat top,hump,speed,slow"
+                },
                 "footway/crossing": {
                     "name": "Street Crossing",
                     "terms": ""
                 },
+                "footway/crosswalk-raised": {
+                    "name": "Raised Pedestrian Crosswalk",
+                    "terms": "zebra crossing,flat top,hump,speed,slow"
+                },
                 "footway/crosswalk": {
                     "name": "Pedestrian Crosswalk",
                     "terms": "zebra crossing"
@@ -3501,10 +3509,18 @@
                     "name": "Indoor Corridor",
                     "terms": "gallery,hall,hallway,indoor,passage,passageway"
                 },
+                "highway/crossing-raised": {
+                    "name": "Raised Street Crossing",
+                    "terms": "flat top,hump,speed,slow"
+                },
                 "highway/crossing": {
                     "name": "Street Crossing",
                     "terms": ""
                 },
+                "highway/crosswalk-raised": {
+                    "name": "Raised Pedestrian Crosswalk",
+                    "terms": "zebra crossing,flat top,hump,speed,slow"
+                },
                 "highway/crosswalk": {
                     "name": "Pedestrian Crosswalk",
                     "terms": "zebra crossing"
@@ -5206,7 +5222,7 @@
                     "terms": "audible lines,sleeper lines,growlers"
                 },
                 "traffic_calming/table": {
-                    "name": "Raised Pedestrian Crossing",
+                    "name": "Speed Table",
                     "terms": "flat top,hump,speed,slow"
                 },
                 "type/multipolygon": {