diff --git a/data/presets.yaml b/data/presets.yaml
index 22b2b9a12..c2f467244 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -169,20 +169,20 @@ en:
         label: Type
       bath/open_air:
         # 'bath:open_air=*'
-        label: Open air bath
+        label: Open Air
       bath/sand_bath:
         # 'bath:sand_bath=*'
-        label: Sand bath
+        label: Sand Bath
       bath/type:
         # 'bath:type=*'
-        label: Bath amenity
+        label: Specialty
         options:
           # 'bath:type=foot_bath'
           foot_bath: Foot Bath
           # 'bath:type=hot_spring'
           hot_spring: Hot Spring
           # 'bath:type=onsen'
-          onsen: Onsen
+          onsen: Japanese Onsen
       beauty:
         # beauty=*
         label: Shop Type
@@ -1658,9 +1658,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Pub'', separated by commas>'
       amenity/public_bath:
         # amenity=public_bath
-        name: Public bath
+        name: Public Bath
         # 'terms: onsen,foot bath,hot springs'
-        terms: '<translate with synonyms or related terms for ''Public bath'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Public Bath'', separated by commas>'
       amenity/public_bookcase:
         # amenity=public_bookcase
         name: Public Bookcase
diff --git a/data/presets/fields.json b/data/presets/fields.json
index e5d131e7c..b14cbb81f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -225,21 +225,21 @@
         },
         "bath/open_air": {
             "key": "bath:open_air",
-            "label": "Open air bath",
+            "label": "Open Air",
             "type": "check"
         },
         "bath/sand_bath": {
             "key": "bath:sand_bath",
-            "label": "Sand bath",
+            "label": "Sand Bath",
             "type": "check"
         },
         "bath/type": {
             "key": "bath:type",
             "type": "combo",
-            "label": "Bath amenity",
+            "label": "Specialty",
             "strings": {
                 "options": {
-                    "onsen": "Onsen",
+                    "onsen": "Japanese Onsen",
                     "foot_bath": "Foot Bath",
                     "hot_spring": "Hot Spring"
                 }
diff --git a/data/presets/fields/bath/open_air.json b/data/presets/fields/bath/open_air.json
index fa399ef1e..60e09c205 100644
--- a/data/presets/fields/bath/open_air.json
+++ b/data/presets/fields/bath/open_air.json
@@ -1,5 +1,5 @@
 {
   "key": "bath:open_air",
-  "label": "Open air bath",
+  "label": "Open Air",
   "type": "check"
 }
diff --git a/data/presets/fields/bath/sand_bath.json b/data/presets/fields/bath/sand_bath.json
index a065baee2..8242b1649 100644
--- a/data/presets/fields/bath/sand_bath.json
+++ b/data/presets/fields/bath/sand_bath.json
@@ -1,5 +1,5 @@
 {
   "key": "bath:sand_bath",
-  "label": "Sand bath",
+  "label": "Sand Bath",
   "type": "check"
 }
diff --git a/data/presets/fields/bath/type.json b/data/presets/fields/bath/type.json
index 7bbe3d2cf..48907ad8c 100644
--- a/data/presets/fields/bath/type.json
+++ b/data/presets/fields/bath/type.json
@@ -1,10 +1,10 @@
 {
   "key": "bath:type",
   "type": "combo",
-  "label": "Bath amenity",
+  "label": "Specialty",
   "strings": {
     "options": {
-      "onsen": "Onsen",
+      "onsen": "Japanese Onsen",
       "foot_bath": "Foot Bath",
       "hot_spring": "Hot Spring"
     }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3ee9a6d75..4b897a68d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1894,7 +1894,7 @@
                 "foot bath",
                 "hot springs"
             ],
-            "name": "Public bath"
+            "name": "Public Bath"
         },
         "amenity/public_bookcase": {
             "icon": "library",
diff --git a/data/presets/presets/amenity/public_bath.json b/data/presets/presets/amenity/public_bath.json
index 000d1cf49..8fd83ea2d 100644
--- a/data/presets/presets/amenity/public_bath.json
+++ b/data/presets/presets/amenity/public_bath.json
@@ -20,5 +20,5 @@
         "foot bath",
         "hot springs"
     ],
-    "name": "Public bath"
+    "name": "Public Bath"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a00cde332..59e4cf749 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -785,15 +785,15 @@
                     "label": "Type"
                 },
                 "bath/open_air": {
-                    "label": "Open air bath"
+                    "label": "Open Air"
                 },
                 "bath/sand_bath": {
-                    "label": "Sand bath"
+                    "label": "Sand Bath"
                 },
                 "bath/type": {
-                    "label": "Bath amenity",
+                    "label": "Specialty",
                     "options": {
-                        "onsen": "Onsen",
+                        "onsen": "Japanese Onsen",
                         "foot_bath": "Foot Bath",
                         "hot_spring": "Hot Spring"
                     }
@@ -2075,7 +2075,7 @@
                     "terms": "alcohol,drink,dive,beer,bier,booze"
                 },
                 "amenity/public_bath": {
-                    "name": "Public bath",
+                    "name": "Public Bath",
                     "terms": "onsen,foot bath,hot springs"
                 },
                 "amenity/public_bookcase": {