diff --git a/data/configuration.yaml b/data/configuration.yaml
index 9291a342c..b23ce8d06 100644
--- a/data/configuration.yaml
+++ b/data/configuration.yaml
@@ -1,9 +1,9 @@
-default: 
-  mqtt: 
+default:
+  mqtt:
     server: "mqtt://localhost"
-    base_topic: xiaomi
-  serial: 
+    base_topic: zigbee2mqtt
+  serial:
     port: /dev/ttyACM0
   allowJoin: true
-
 user:
+  devices: {}
diff --git a/package.json b/package.json
index 2a465e6fa..27e2898d8 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,9 @@
   "author": "Koen Kanters",
   "license": "GPL-3.0",
   "bugs": {
-    "url": "https://github.com/Koenkk/xiaomi-zb2mqtt/issues"
+    "url": "https://github.com/Koenkk/zigbee2mqtt/issues"
   },
-  "homepage": "https://github.com/Koenkk/xiaomi-zb2mqtt/wiki",
+  "homepage": "https://github.com/Koenkk/zigbee2mqtt/wiki",
   "dependencies": {
     "mqtt": "*",
     "winston": "*",