diff --git a/data/presets/presets.json b/data/presets/presets.json
index 521b2a488..53e7bbf87 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -41192,12 +41192,12 @@
             ],
             "suggestion": true
         },
-        "amenity/pharmacy/Adler Apotheke": {
+        "amenity/pharmacy/Adler-Apotheke": {
             "tags": {
-                "name": "Adler Apotheke",
+                "name": "Adler-Apotheke",
                 "amenity": "pharmacy"
             },
-            "name": "Adler Apotheke",
+            "name": "Adler-Apotheke",
             "icon": "pharmacy",
             "geometry": [
                 "point",
@@ -59078,12 +59078,12 @@
             ],
             "suggestion": true
         },
-        "shop/beverages/REWE Getränkemarkt": {
+        "shop/beverages/Rewe Getränkemarkt": {
             "tags": {
-                "name": "REWE Getränkemarkt",
+                "name": "Rewe Getränkemarkt",
                 "shop": "beverages"
             },
-            "name": "REWE Getränkemarkt",
+            "name": "Rewe Getränkemarkt",
             "icon": "shop",
             "geometry": [
                 "point",
@@ -59667,12 +59667,12 @@
             ],
             "suggestion": true
         },
-        "shop/car/Citroen": {
+        "shop/car/Citroën": {
             "tags": {
-                "name": "Citroen",
+                "name": "Citroën",
                 "shop": "car"
             },
-            "name": "Citroen",
+            "name": "Citroën",
             "icon": "car",
             "geometry": [
                 "point",
@@ -66388,26 +66388,6 @@
             ],
             "suggestion": true
         },
-        "shop/convenience/Boutique": {
-            "tags": {
-                "name": "Boutique",
-                "shop": "convenience"
-            },
-            "name": "Boutique",
-            "icon": "shop",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "name",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/convenience/CBA": {
             "tags": {
                 "name": "CBA",
@@ -67048,12 +67028,12 @@
             ],
             "suggestion": true
         },
-        "shop/convenience/LAWSON": {
+        "shop/convenience/Lawson": {
             "tags": {
-                "name": "LAWSON",
+                "name": "Lawson",
                 "shop": "convenience"
             },
-            "name": "LAWSON",
+            "name": "Lawson",
             "icon": "shop",
             "geometry": [
                 "point",
@@ -75337,26 +75317,6 @@
             ],
             "suggestion": true
         },
-        "shop/kiosk/Kiosk": {
-            "tags": {
-                "name": "Kiosk",
-                "shop": "kiosk"
-            },
-            "name": "Kiosk",
-            "icon": "shop",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "name",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/kiosk/Kiosko": {
             "tags": {
                 "name": "Kiosko",
@@ -79760,26 +79720,6 @@
             ],
             "suggestion": true
         },
-        "shop/supermarket/ALDI": {
-            "tags": {
-                "name": "ALDI",
-                "shop": "supermarket"
-            },
-            "name": "ALDI",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "name",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Ahorramás": {
             "tags": {
                 "name": "Ahorramás",
@@ -79860,6 +79800,26 @@
             ],
             "suggestion": true
         },
+        "shop/supermarket/Aldi": {
+            "tags": {
+                "name": "Aldi",
+                "shop": "supermarket"
+            },
+            "name": "Aldi",
+            "icon": "grocery",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "suggestion": true
+        },
         "shop/supermarket/Aldi Nord": {
             "tags": {
                 "name": "Aldi Nord",
@@ -83200,26 +83160,6 @@
             ],
             "suggestion": true
         },
-        "shop/supermarket/NETTO": {
-            "tags": {
-                "name": "NETTO",
-                "shop": "supermarket"
-            },
-            "name": "NETTO",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "name",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/NORMA": {
             "tags": {
                 "name": "NORMA",
@@ -83300,6 +83240,26 @@
             ],
             "suggestion": true
         },
+        "shop/supermarket/Netto": {
+            "tags": {
+                "name": "Netto",
+                "shop": "supermarket"
+            },
+            "name": "Netto",
+            "icon": "grocery",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "suggestion": true
+        },
         "shop/supermarket/Netto Marken-Discount": {
             "tags": {
                 "name": "Netto Marken-Discount",
@@ -83880,26 +83840,6 @@
             ],
             "suggestion": true
         },
-        "shop/supermarket/REWE City": {
-            "tags": {
-                "name": "REWE City",
-                "shop": "supermarket"
-            },
-            "name": "REWE City",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "name",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Ralphs": {
             "tags": {
                 "name": "Ralphs",
@@ -84020,6 +83960,26 @@
             ],
             "suggestion": true
         },
+        "shop/supermarket/Rewe City": {
+            "tags": {
+                "name": "Rewe City",
+                "shop": "supermarket"
+            },
+            "name": "Rewe City",
+            "icon": "grocery",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "suggestion": true
+        },
         "shop/supermarket/Rimi": {
             "tags": {
                 "name": "Rimi",
diff --git a/package.json b/package.json
index 39e9a3cfe..63139aa39 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "minimist": "^1.2.0",
     "mocha": "^4.0.0",
     "mocha-phantomjs-core": "^2.1.0",
-    "name-suggestion-index": "0.1.2",
+    "name-suggestion-index": "0.1.3",
     "npm-run-all": "^4.0.0",
     "phantomjs-prebuilt": "~2.1.11",
     "request": "^2.81.0",