diff --git a/data/presets.yaml b/data/presets.yaml
index a52444a80..2fd1341ff 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -462,6 +462,12 @@ en:
         label: Seasonal
       service:
         label: Type
+      service/bicycle/chain_tool:
+        label: Chain Tool
+        options:
+          undefined: Assumed to be No
+          "yes": "Yes"
+          "no": "No"
       service/bicycle/chaintool:
         label: Chain Tool
         options:
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 889e0d404..084a87b35 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -942,8 +942,20 @@
             "drive-through"
         ]
     },
+    "service/bicycle/chain_tool": {
+        "key": "service:bicycle:chain_tool",
+        "type": "check",
+        "label": "Chain Tool",
+        "strings": {
+            "options": {
+                "undefined": "Assumed to be No",
+                "yes": "Yes",
+                "no": "No"
+            }
+        }
+    },
     "service/bicycle/chaintool": {
-        "key": "service:bicycle:chaintool",
+        "key": "service:bicycle:chain_tool",
         "type": "check",
         "label": "Chain Tool",
         "strings": {
diff --git a/data/presets/fields/service/bicycle/chaintool.json b/data/presets/fields/service/bicycle/chain_tool.json
similarity index 82%
rename from data/presets/fields/service/bicycle/chaintool.json
rename to data/presets/fields/service/bicycle/chain_tool.json
index 8d34c8615..1718e55ec 100644
--- a/data/presets/fields/service/bicycle/chaintool.json
+++ b/data/presets/fields/service/bicycle/chain_tool.json
@@ -1,5 +1,5 @@
 {
-    "key": "service:bicycle:chaintool",
+    "key": "service:bicycle:chain_tool",
     "type": "check",
     "label": "Chain Tool",
     "strings": {
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 1eebb3246..f5ea84352 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -506,7 +506,7 @@
             "brand",
             "opening_hours",
             "fee",
-            "service/bicycle/chaintool",
+            "service/bicycle/chain_tool",
             "service/bicycle/pump"
         ],
         "geometry": [
diff --git a/data/presets/presets/amenity/bicycle_repair_station.json b/data/presets/presets/amenity/bicycle_repair_station.json
index 91c51a608..559ad9824 100644
--- a/data/presets/presets/amenity/bicycle_repair_station.json
+++ b/data/presets/presets/amenity/bicycle_repair_station.json
@@ -5,7 +5,7 @@
         "brand",
         "opening_hours",
         "fee",
-        "service/bicycle/chaintool",
+        "service/bicycle/chain_tool",
         "service/bicycle/pump"
     ],
     "geometry": [
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 6ea44af14..6cfe05e7d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1136,6 +1136,14 @@
             "service": {
                 "label": "Type"
             },
+            "service/bicycle/chain_tool": {
+                "label": "Chain Tool",
+                "options": {
+                    "undefined": "Assumed to be No",
+                    "yes": "Yes",
+                    "no": "No"
+                }
+            },
             "service/bicycle/chaintool": {
                 "label": "Chain Tool",
                 "options": {