diff --git a/data/presets.yaml b/data/presets.yaml
index f209aee6b..626a67050 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2033,7 +2033,7 @@ en:
         name: Marketplace
         terms: '<translate with synonyms or related terms for ''Marketplace'', separated by commas>'
       amenity/monastery:
-        # amenity=monastery_grounds
+        # amenity=monastery
         name: Monastery Grounds
         # 'terms: abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house of God,house of prayer,house of worship,minster,mission,monastery,mosque,oratory,parish,sacellum,sanctuary,shrine,synagogue,tabernacle,temple'
         terms: '<translate with synonyms or related terms for ''Monastery Grounds'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 21192d1ed..6cfc5773e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1995,7 +1995,7 @@
                 "temple"
             ],
             "tags": {
-                "amenity": "monastery_grounds"
+                "amenity": "monastery"
             },
             "name": "Monastery Grounds"
         },
diff --git a/data/presets/presets/amenity/monastery.json b/data/presets/presets/amenity/monastery.json
index 0c84f08ca..f7f4fec96 100644
--- a/data/presets/presets/amenity/monastery.json
+++ b/data/presets/presets/amenity/monastery.json
@@ -38,7 +38,7 @@
         "temple"
     ],
     "tags": {
-        "amenity": "monastery_grounds"
+        "amenity": "monastery"
     },
     "name": "Monastery Grounds"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 9cedb9ef0..0f76186d9 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -381,7 +381,7 @@
         },
         {
             "key": "amenity",
-            "value": "monastery_grounds"
+            "value": "monastery"
         },
         {
             "key": "amenity",