diff --git a/example-mapping.json b/example-mapping.json
index 30d17cc..f592cd4 100644
--- a/example-mapping.json
+++ b/example-mapping.json
@@ -1,14 +1,14 @@
 {
     "areas": {
         "area_tags": [
-            "buildings", 
-            "landuse", 
-            "leisure", 
-            "natural", 
+            "buildings",
+            "landuse",
+            "leisure",
+            "natural",
             "aeroway"
-        ], 
+        ],
         "linear_tags": [
-            "highway", 
+            "highway",
             "barrier"
         ]
     },
@@ -56,7 +56,7 @@
     },
     "tables": {
         "landusages": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -217,7 +217,7 @@
             }
         },
         "buildings": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -247,7 +247,7 @@
             }
         },
         "places": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -309,7 +309,7 @@
             }
         },
         "transport_areas": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -346,7 +346,7 @@
             }
         },
         "admin": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -381,7 +381,7 @@
             }
         },
         "aeroways": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -412,7 +412,7 @@
             }
         },
         "waterways": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -449,7 +449,7 @@
             }
         },
         "barrierways": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -491,7 +491,7 @@
             }
         },
         "transport_points": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -542,7 +542,7 @@
             }
         },
         "amenities": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -579,7 +579,7 @@
             }
         },
         "barrierpoints": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -624,7 +624,7 @@
             }
         },
         "housenumbers_interpolated": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -674,7 +674,7 @@
             }
         },
         "roads": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -794,7 +794,7 @@
             }
         },
         "housenumbers": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
@@ -839,7 +839,7 @@
             }
         },
         "waterareas": {
-            "fields": [
+            "columns": [
                 {
                     "type": "id",
                     "name": "osm_id",
diff --git a/example-mapping.yml b/example-mapping.yml
index e4db3c7..b900435 100644
--- a/example-mapping.yml
+++ b/example-mapping.yml
@@ -37,7 +37,7 @@ generalized_tables:
     tolerance: 50.0
 tables:
   admin:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -55,7 +55,7 @@ tables:
       - administrative
     type: polygon
   aeroways:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -71,7 +71,7 @@ tables:
       - taxiway
     type: linestring
   amenities:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -93,7 +93,7 @@ tables:
       - townhall
     type: point
   barrierpoints:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -123,7 +123,7 @@ tables:
       - stile
     type: point
   barrierways:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -150,7 +150,7 @@ tables:
       - wire_fence
     type: linestring
   buildings:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -165,7 +165,7 @@ tables:
       - __any__
     type: polygon
   housenumbers:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -189,7 +189,7 @@ tables:
       - __any__
     type: point
   housenumbers_interpolated:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -216,7 +216,7 @@ tables:
       - __any__
     type: linestring
   landusages:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -345,7 +345,7 @@ tables:
       - zoo
     type: polygon
   places:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -386,7 +386,7 @@ tables:
       - locality
     type: point
   roads:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -466,7 +466,7 @@ tables:
           - groyne
     type: linestring
   transport_areas:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -487,7 +487,7 @@ tables:
       - platform
     type: polygon
   transport_points:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -519,7 +519,7 @@ tables:
       - subway_entrance
     type: point
   waterareas:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry
@@ -545,7 +545,7 @@ tables:
       - riverbank
     type: polygon
   waterways:
-    fields:
+    columns:
     - name: osm_id
       type: id
     - name: geometry