diff --git a/hostmngr/files/etc/config/hostmngr b/hostmngr/files/etc/config/hosts
similarity index 100%
rename from hostmngr/files/etc/config/hostmngr
rename to hostmngr/files/etc/config/hosts
diff --git a/map-topology/files/etc/firewall.hosts b/hostmngr/files/etc/firewall.hosts
similarity index 100%
rename from map-topology/files/etc/firewall.hosts
rename to hostmngr/files/etc/firewall.hosts
diff --git a/hostmngr/files/etc/init.d/hostmngr b/hostmngr/files/etc/init.d/hostmngr
index 88ff33e00..b21988c30 100755
--- a/hostmngr/files/etc/init.d/hostmngr
+++ b/hostmngr/files/etc/init.d/hostmngr
@@ -7,7 +7,7 @@ USE_PROCD=1
 
 start_service() {
 	procd_open_instance
-        procd_set_param command "/usr/sbin/hostmngr" "--config hostmngr" "-o"  "/tmp/hostmngr.log" "-f"
+        procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
 #	procd_set_param respawn
 	procd_set_param limits core="unlimited"
 #	procd_set_param stdout 1
@@ -17,7 +17,7 @@ start_service() {
 
 service_triggers()
 {
-	procd_add_reload_trigger "hostmngr"
+	procd_add_reload_trigger "hosts"
 }
 
 reload_service() {
diff --git a/map-topology/files/etc/uci-defaults/992-firewall_host.ucidefaults b/hostmngr/files/etc/uci-defaults/992-firewall_host.ucidefaults
similarity index 100%
rename from map-topology/files/etc/uci-defaults/992-firewall_host.ucidefaults
rename to hostmngr/files/etc/uci-defaults/992-firewall_host.ucidefaults
diff --git a/map-topology/files/etc/config/hosts b/map-topology/files/etc/config/hosts
deleted file mode 100644
index 19115d1da..000000000
--- a/map-topology/files/etc/config/hosts
+++ /dev/null
@@ -1,5 +0,0 @@
-
-config global 'global'
-	option ageing_timer '1440'
-	option reboot_persistent '0'
-	list ifname 'br-lan'