diff --git a/data/presets.yaml b/data/presets.yaml
index f81d2a5cf..cf7299c1e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1491,7 +1491,7 @@ en:
           waterway_right: Waterway Right
       seamark/beacon_lateral/colour:
         # 'seamark:beacon_lateral:colour=*'
-        label: Colour
+        label: Color
         options:
           # 'seamark:beacon_lateral:colour=green'
           green: Green
@@ -1540,7 +1540,7 @@ en:
           waterway_right: Waterway Right
       seamark/buoy_lateral/colour:
         # 'seamark:buoy_lateral:colour=*'
-        label: Colour
+        label: Color
         options:
           # 'seamark:buoy_lateral:colour=green'
           green: Green
@@ -2961,13 +2961,13 @@ en:
         terms: '<translate with synonyms or related terms for ''Hedge'', separated by commas>'
       barrier/kerb:
         # barrier=kerb
-        name: Kerb
-        terms: '<translate with synonyms or related terms for ''Kerb'', separated by commas>'
+        name: Curb
+        terms: '<translate with synonyms or related terms for ''Curb'', separated by commas>'
       barrier/kerb/lowered:
         # 'barrier=kerb, kerb=lowered'
-        name: Lowered Kerb
+        name: Lowered Curb
         # 'terms: curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp'
-        terms: '<translate with synonyms or related terms for ''Lowered Kerb'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Lowered Curb'', separated by commas>'
       barrier/kissing_gate:
         # barrier=kissing_gate
         name: Kissing Gate
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 4212d95e1..fc1b11195 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -252,11 +252,11 @@
     "sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"},
     "seamark/beacon_isolated_danger/shape": {"key": "seamark:beacon_isolated_danger:shape", "type": "combo", "label": "Shape"},
     "seamark/beacon_lateral/category": {"key": "seamark:beacon_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right"}}},
-    "seamark/beacon_lateral/colour": {"key": "seamark:beacon_lateral:colour", "type": "combo", "label": "Colour", "strings": {"options": {"red": "Red", "green": "Green", "grey": "Grey"}}},
+    "seamark/beacon_lateral/colour": {"key": "seamark:beacon_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "grey": "Grey"}}},
     "seamark/beacon_lateral/shape": {"key": "seamark:beacon_lateral:shape", "type": "combo", "label": "Shape"},
     "seamark/beacon_lateral/system": {"key": "seamark:beacon_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}},
     "seamark/buoy_lateral/category": {"key": "seamark:buoy_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "channel_left": "Channel Left", "channel_right": "Channel Right", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right", "preferred_channel_port": "Preferred Channel Port", "preferred_channel_starboard": "Preferred Channel Starboard"}}},
-    "seamark/buoy_lateral/colour": {"key": "seamark:buoy_lateral:colour", "type": "combo", "label": "Colour", "strings": {"options": {"red": "Red", "green": "Green", "red;white;red;white": "Red-White-Red-White", "green;white;green;white": "Green-White-Green-White", "red;green;red": "Red-Green-Red", "green;red;green": "Green-Red-Green", "white": "White", "yellow": "Yellow"}}},
+    "seamark/buoy_lateral/colour": {"key": "seamark:buoy_lateral:colour", "type": "combo", "label": "Color", "strings": {"options": {"red": "Red", "green": "Green", "red;white;red;white": "Red-White-Red-White", "green;white;green;white": "Green-White-Green-White", "red;green;red": "Red-Green-Red", "green;red;green": "Green-Red-Green", "white": "White", "yellow": "Yellow"}}},
     "seamark/buoy_lateral/shape": {"key": "seamark:buoy_lateral:shape", "type": "combo", "label": "Shape"},
     "seamark/buoy_lateral/system": {"key": "seamark:buoy_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}},
     "seamark/mooring/category": {"key": "seamark:mooring:category", "type": "combo", "label": "Category"},
diff --git a/data/presets/fields/seamark/beacon_lateral/colour.json b/data/presets/fields/seamark/beacon_lateral/colour.json
index 2af53b30e..94c35483c 100644
--- a/data/presets/fields/seamark/beacon_lateral/colour.json
+++ b/data/presets/fields/seamark/beacon_lateral/colour.json
@@ -1,7 +1,7 @@
 {
     "key": "seamark:beacon_lateral:colour",
     "type": "combo",
-    "label": "Colour",
+    "label": "Color",
     "strings": {
         "options": {
             "red": "Red",
diff --git a/data/presets/fields/seamark/buoy_lateral/colour.json b/data/presets/fields/seamark/buoy_lateral/colour.json
index abe96b049..e95c4363e 100644
--- a/data/presets/fields/seamark/buoy_lateral/colour.json
+++ b/data/presets/fields/seamark/buoy_lateral/colour.json
@@ -1,7 +1,7 @@
 {
     "key": "seamark:buoy_lateral:colour",
     "type": "combo",
-    "label": "Colour",
+    "label": "Color",
     "strings": {
         "options": {
             "red": "Red",
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 814adcd7b..e8d5feadb 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -205,8 +205,8 @@
     "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25},
     "barrier/gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
-    "barrier/kerb": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Kerb"},
-    "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Kerb"},
+    "barrier/kerb": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"},
+    "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
     "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
     "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
diff --git a/data/presets/presets/barrier/kerb.json b/data/presets/presets/barrier/kerb.json
index aff132c00..21fdd6985 100644
--- a/data/presets/presets/barrier/kerb.json
+++ b/data/presets/presets/barrier/kerb.json
@@ -11,5 +11,5 @@
     "tags": {
         "barrier": "kerb"
     },
-    "name": "Kerb"
+    "name": "Curb"
 }
diff --git a/data/presets/presets/barrier/kerb/lowered.json b/data/presets/presets/barrier/kerb/lowered.json
index 98a3b9a56..9054ddc4d 100644
--- a/data/presets/presets/barrier/kerb/lowered.json
+++ b/data/presets/presets/barrier/kerb/lowered.json
@@ -23,5 +23,5 @@
         "dropped kerb",
         "pram ramp"
     ],
-    "name": "Lowered Kerb"
+    "name": "Lowered Curb"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 4af7e5ca2..ecf5e471c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1398,14 +1398,14 @@
     {
       "key": "barrier",
       "value": "kerb",
-      "description": "Kerb",
+      "description": "Curb",
       "object_types": ["node", "way"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"
     },
     {
       "key": "kerb",
       "value": "lowered",
-      "description": "Lowered Kerb",
+      "description": "Lowered Curb",
       "object_types": ["node", "way"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"
     },
@@ -5024,13 +5024,13 @@
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "green",
-      "description": "Green Buoy, Colour",
+      "description": "Green Buoy, Color",
       "object_types": ["node"]
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "red",
-      "description": "Red Buoy, Colour",
+      "description": "Red Buoy, Color",
       "object_types": ["node"]
     },
     {
@@ -7244,17 +7244,17 @@
     {
       "key": "seamark:beacon_lateral:colour",
       "value": "red",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:beacon_lateral:colour",
       "value": "green",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:beacon_lateral:colour",
       "value": "grey",
-      "description": "Colour"
+      "description": "Color"
     },
     {"key": "seamark:beacon_lateral:shape", "description": "Shape"},
     {
@@ -7330,32 +7330,32 @@
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "red;white;red;white",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "green;white;green;white",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "red;green;red",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "green;red;green",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "white",
-      "description": "Colour"
+      "description": "Color"
     },
     {
       "key": "seamark:buoy_lateral:colour",
       "value": "yellow",
-      "description": "Colour"
+      "description": "Color"
     },
     {"key": "seamark:buoy_lateral:shape", "description": "Shape"},
     {
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 19ffe1642..61869528c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2698,7 +2698,7 @@
                     }
                 },
                 "seamark/beacon_lateral/colour": {
-                    "label": "Colour",
+                    "label": "Color",
                     "options": {
                         "red": "Red",
                         "green": "Green",
@@ -2733,7 +2733,7 @@
                     }
                 },
                 "seamark/buoy_lateral/colour": {
-                    "label": "Colour",
+                    "label": "Color",
                     "options": {
                         "red": "Red",
                         "green": "Green",
@@ -3981,11 +3981,11 @@
                     "terms": ""
                 },
                 "barrier/kerb": {
-                    "name": "Kerb",
+                    "name": "Curb",
                     "terms": ""
                 },
                 "barrier/kerb/lowered": {
-                    "name": "Lowered Kerb",
+                    "name": "Lowered Curb",
                     "terms": "curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp"
                 },
                 "barrier/kissing_gate": {