diff --git a/data/presets/presets.json b/data/presets/presets.json
index 73ab2550c..4df1926b5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -551,7 +551,7 @@
             "amenity": "marketplace"
         },
         "fields": [
-            "building"
+            "building_area"
         ],
         "name": "Marketplace"
     },
@@ -599,7 +599,7 @@
         "fields": [
             "religion",
             "denomination",
-            "building",
+            "building_area",
             "address"
         ],
         "geometry": [
@@ -881,7 +881,7 @@
         "icon": "school",
         "fields": [
             "operator",
-            "building",
+            "building_area",
             "address"
         ],
         "geometry": [
@@ -962,7 +962,7 @@
     "amenity/toilets": {
         "fields": [
             "operator",
-            "building"
+            "building_area"
         ],
         "geometry": [
             "point",
diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json
index 228ec8938..5fb0a9969 100644
--- a/data/presets/presets/amenity/marketplace.json
+++ b/data/presets/presets/amenity/marketplace.json
@@ -8,7 +8,7 @@
         "amenity": "marketplace"
     },
     "fields": [
-        "building"
+        "building_area"
     ],
     "name": "Marketplace"
 }
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index 3f69d9624..256407eae 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -3,7 +3,7 @@
     "fields": [
         "religion",
         "denomination",
-        "building",
+        "building_area",
         "address"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index 8cdbde054..9f9edf685 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -2,7 +2,7 @@
     "icon": "school",
     "fields": [
         "operator",
-        "building",
+        "building_area",
         "address"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index a8232c775..c5f3a94cd 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -1,7 +1,7 @@
 {
     "fields": [
         "operator",
-        "building"
+        "building_area"
     ],
     "geometry": [
         "point",