--- a/samples/adressliste.yml2	Tue Nov 20 22:35:38 2018 +0100
+++ b/samples/adressliste.yml2	Fri Jan 25 23:31:57 2019 +0100
@@ -1,12 +1,12 @@
-liste {
-    adresse {
+list {
+    adress {
         name "Meier";
-        strasse "Uhlmannstrasse 42";
-        ort "Laupheim";
+        street "Uhlmannstrasse 42";
+        village "Laupheim";
     }
     adresse {
         name "Schmidt";
-        strasse "Haupstrasse 23";
-        ort "Bad Waldsee";
+        street "Haupstrasse 23";
+        village "Bad Waldsee";
     }
 }