diff --git a/data/presets.yaml b/data/presets.yaml
index 14fe61c70..34682e7c6 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1932,9 +1932,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Bicycle Repair Tool Stand'', separated by commas>'
       amenity/biergarten:
         # amenity=biergarten
-        name: Beer Garden
+        name: Biergarten
         # 'terms: beer,bier,booze'
-        terms: '<translate with synonyms or related terms for ''Beer Garden'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Biergarten'', separated by commas>'
       amenity/boat_rental:
         # amenity=boat_rental
         name: Boat Rental
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 23a674734..92514f134 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -53,7 +53,7 @@
     "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
     "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "payment_multi"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
     "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "service/bicycle"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
-    "amenity/biergarten": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "outdoor_seating", "brewery"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Beer Garden"},
+    "amenity/biergarten": {"icon": "maki-beer", "fields": ["name", "address", "building", "opening_hours", "smoking", "outdoor_seating", "brewery"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
     "amenity/boat_rental": {"fields": ["name", "operator", "payment_multi"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
     "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "currency_multi", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
     "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "outdoor_seating"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
diff --git a/data/presets/presets/amenity/biergarten.json b/data/presets/presets/amenity/biergarten.json
index 894220df5..5913f3819 100644
--- a/data/presets/presets/amenity/biergarten.json
+++ b/data/presets/presets/amenity/biergarten.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "address",
-        "building_area",
+        "building",
         "opening_hours",
         "smoking",
         "outdoor_seating",
@@ -21,5 +21,5 @@
         "bier",
         "booze"
     ],
-    "name": "Beer Garden"
+    "name": "Biergarten"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index fbdd0389b..bf4a65fd3 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -348,7 +348,7 @@
     {
       "key": "amenity",
       "value": "biergarten",
-      "description": "Beer Garden",
+      "description": "Biergarten",
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/beer-15.svg?sanitize=true"
     },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ca551b5a0..01726e4d6 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3136,7 +3136,7 @@
                     "terms": "bike,repair,chain,pump"
                 },
                 "amenity/biergarten": {
-                    "name": "Beer Garden",
+                    "name": "Biergarten",
                     "terms": "beer,bier,booze"
                 },
                 "amenity/boat_rental": {