diff --git a/data/presets.yaml b/data/presets.yaml
index 549b304f4..eb4b5e262 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -383,8 +383,8 @@ en:
         name: Marketplace
         terms: "<translate with synonyms or related terms for 'Marketplace', separated by commas>"
       amenity/parking: 
-        name: Parking
-        terms: "<translate with synonyms or related terms for 'Parking', separated by commas>"
+        name: Car Parking
+        terms: "<translate with synonyms or related terms for 'Car Parking', separated by commas>"
       amenity/pharmacy: 
         name: Pharmacy
         terms: "<translate with synonyms or related terms for 'Pharmacy', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e6ebb6eb3..163356505 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -692,7 +692,7 @@
             "amenity": "parking"
         },
         "terms": [],
-        "name": "Parking"
+        "name": "Car Parking"
     },
     "amenity/pharmacy": {
         "icon": "pharmacy",
@@ -988,7 +988,9 @@
             "visitor centre",
             "permit center",
             "permit centre",
-            "backcountry office"
+            "backcountry office",
+            "warden office",
+            "warden center"
         ],
         "tags": {
             "amenity": "ranger_station"
@@ -4040,6 +4042,10 @@
         "tags": {
             "railway": "station"
         },
+        "terms": [
+            "train station",
+            "station"
+        ],
         "name": "Railway Station"
     },
     "railway/subway": {
@@ -5160,7 +5166,9 @@
             "vertex",
             "area"
         ],
-        "terms": [],
+        "terms": [
+            "camping"
+        ],
         "tags": {
             "tourism": "camp_site"
         },
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index 9991c0546..0acf80fac 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -17,5 +17,5 @@
         "amenity": "parking"
     },
     "terms": [],
-    "name": "Parking"
+    "name": "Car Parking"
 }
diff --git a/data/presets/presets/amenity/ranger_station.json b/data/presets/presets/amenity/ranger_station.json
index 72e542de0..6092f5c4f 100644
--- a/data/presets/presets/amenity/ranger_station.json
+++ b/data/presets/presets/amenity/ranger_station.json
@@ -14,7 +14,9 @@
         "visitor centre",
         "permit center",
         "permit centre",
-        "backcountry office"
+        "backcountry office",
+        "warden office",
+        "warden center"
     ],
     "tags": {
         "amenity": "ranger_station"
diff --git a/data/presets/presets/railway/station.json b/data/presets/presets/railway/station.json
index 7cc779784..73154c466 100644
--- a/data/presets/presets/railway/station.json
+++ b/data/presets/presets/railway/station.json
@@ -8,5 +8,9 @@
     "tags": {
         "railway": "station"
     },
+    "terms": [
+        "train station",
+        "station"
+    ],
     "name": "Railway Station"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
index 55be62d56..c0a4ca634 100644
--- a/data/presets/presets/tourism/camp_site.json
+++ b/data/presets/presets/tourism/camp_site.json
@@ -9,7 +9,9 @@
         "vertex",
         "area"
     ],
-    "terms": [],
+    "terms": [
+        "camping"
+    ],
     "tags": {
         "tourism": "camp_site"
     },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index eb8b8ce84..d2f3353d0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -928,7 +928,7 @@
                 "terms": ""
             },
             "amenity/parking": {
-                "name": "Parking",
+                "name": "Car Parking",
                 "terms": ""
             },
             "amenity/pharmacy": {
@@ -973,7 +973,7 @@
             },
             "amenity/ranger_station": {
                 "name": "Ranger Station",
-                "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office"
+                "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center"
             },
             "amenity/restaurant": {
                 "name": "Restaurant",
@@ -1797,7 +1797,7 @@
             },
             "railway/station": {
                 "name": "Railway Station",
-                "terms": ""
+                "terms": "train station,station"
             },
             "railway/subway": {
                 "name": "Subway",
@@ -2057,7 +2057,7 @@
             },
             "tourism/camp_site": {
                 "name": "Camp Site",
-                "terms": ""
+                "terms": "camping"
             },
             "tourism/caravan_site": {
                 "name": "RV Park",