diff --git a/data/presets.yaml b/data/presets.yaml
index 5e65082f4e..8665ac9200 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2568,9 +2568,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Buddhist Temple'', separated by commas>'
       amenity/place_of_worship/christian:
         # 'amenity=place_of_worship, religion=christian'
-        name: Church
+        name: Christian Church
         # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple'
-        terms: '<translate with synonyms or related terms for ''Church'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Christian Church'', separated by commas>'
       amenity/place_of_worship/hindu:
         # 'amenity=place_of_worship, religion=hindu'
         name: Hindu Temple
@@ -2578,14 +2578,14 @@ en:
         terms: '<translate with synonyms or related terms for ''Hindu Temple'', separated by commas>'
       amenity/place_of_worship/jewish:
         # 'amenity=place_of_worship, religion=jewish'
-        name: Synagogue
+        name: Jewish Synagogue
         # 'terms: jewish'
-        terms: '<translate with synonyms or related terms for ''Synagogue'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Jewish Synagogue'', separated by commas>'
       amenity/place_of_worship/muslim:
         # 'amenity=place_of_worship, religion=muslim'
-        name: Mosque
+        name: Muslim Mosque
         # 'terms: muslim'
-        terms: '<translate with synonyms or related terms for ''Mosque'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Muslim Mosque'', separated by commas>'
       amenity/place_of_worship/shinto:
         # 'amenity=place_of_worship, religion=shinto'
         name: Shinto Shrine
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 59d5cdfde5..90024dbd09 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -120,10 +120,10 @@
     "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "opening_hours", "payment_multi", "dispensing"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
     "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
     "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
-    "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Church"},
+    "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
     "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
-    "amenity/place_of_worship/jewish": {"icon": "maki-religious-jewish", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["jewish"], "tags": {"amenity": "place_of_worship", "religion": "jewish"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Synagogue"},
-    "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Mosque"},
+    "amenity/place_of_worship/jewish": {"icon": "maki-religious-jewish", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["jewish"], "tags": {"amenity": "place_of_worship", "religion": "jewish"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Jewish Synagogue"},
+    "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"},
     "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
     "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
     "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json
index 618bc0e77d..25f0fdb181 100644
--- a/data/presets/presets/amenity/place_of_worship/christian.json
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -43,5 +43,5 @@
         "key": "amenity",
         "value": "place_of_worship"
     },
-    "name": "Church"
+    "name": "Christian Church"
 }
diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json
index bff8c16f11..c0b4060556 100644
--- a/data/presets/presets/amenity/place_of_worship/jewish.json
+++ b/data/presets/presets/amenity/place_of_worship/jewish.json
@@ -23,5 +23,5 @@
         "key": "amenity",
         "value": "place_of_worship"
     },
-    "name": "Synagogue"
+    "name": "Jewish Synagogue"
 }
diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json
index ec827de128..bc7d804594 100644
--- a/data/presets/presets/amenity/place_of_worship/muslim.json
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -23,5 +23,5 @@
         "key": "amenity",
         "value": "place_of_worship"
     },
-    "name": "Mosque"
+    "name": "Muslim Mosque"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 9eeff62dde..3ebc49bfde 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -815,7 +815,7 @@
     {
       "key": "religion",
       "value": "christian",
-      "description": "🄿 Church",
+      "description": "🄿 Christian Church",
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"
     },
@@ -829,14 +829,14 @@
     {
       "key": "religion",
       "value": "jewish",
-      "description": "🄿 Synagogue",
+      "description": "🄿 Jewish Synagogue",
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-jewish-15.svg?sanitize=true"
     },
     {
       "key": "religion",
       "value": "muslim",
-      "description": "🄿 Mosque",
+      "description": "🄿 Muslim Mosque",
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-muslim-15.svg?sanitize=true"
     },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e0c901b26c..288a7d4831 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4013,7 +4013,7 @@
                     "terms": "stupa,vihara,monastery,temple,pagoda,zendo,dojo"
                 },
                 "amenity/place_of_worship/christian": {
-                    "name": "Church",
+                    "name": "Christian Church",
                     "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
                 },
                 "amenity/place_of_worship/hindu": {
@@ -4021,11 +4021,11 @@
                     "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple"
                 },
                 "amenity/place_of_worship/jewish": {
-                    "name": "Synagogue",
+                    "name": "Jewish Synagogue",
                     "terms": "jewish"
                 },
                 "amenity/place_of_worship/muslim": {
-                    "name": "Mosque",
+                    "name": "Muslim Mosque",
                     "terms": "muslim"
                 },
                 "amenity/place_of_worship/shinto": {