diff --git a/post-install.sh b/post-install.sh
old mode 100755
new mode 100644
index 2f4ce69..6882371
--- a/post-install.sh
+++ b/post-install.sh
@@ -61,9 +61,6 @@ fi
 
 ### Finally make sure basic configuration is set correctly
 
-echo "s_$IPKG_INSTROOT_"
-echo "ss_$$IPKG_INSTROOT_"
-echo "ssa_$${IPKG_INSTROOT}_"
 if [ -z "$IPKG_INSTROOT" ]; then
 	echo "Enabling wifi device..."
 	uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi
diff --git a/post-remove.sh b/post-remove.sh
old mode 100755
new mode 100644
index 7e8f3d5..aa5820e
--- a/post-remove.sh
+++ b/post-remove.sh
@@ -4,16 +4,15 @@ if [ -f /etc/banner.default ]; then
 	mv /etc/banner.default /etc/banner
 fi
 
-rmdir /usr/share/lua/autowifi/ext/www/cgi-bin
-rm /usr/share/lua/autowifi/ext/www/admin
-rmdir /usr/share/lua/autowifi/ext/www
-rmdir /usr/share/lua/autowifi/admin
-rmdir /usr/share/lua/autowifi/ext
-rmdir /usr/share/lua/autowifi/misc
-rmdir /usr/share/lua/autowifi
+rmdir /usr/share/lua/wifibox/www/wifibox
+rmdir /usr/share/lua/wifibox/www
+rmdir /usr/share/lua/wifibox/network
+rmdir /usr/share/lua/wifibox/rest
+rmdir /usr/share/lua/wifibox/script
+rmdir /usr/share/lua/wifibox/util
+rmdir /usr/share/lua/wifibox
 rmdir /usr/share/lua
-rm /www/admin
-rmdir /www/cgi-bin
+rm /www/wifibox
 
 echo "The wifibox banner has been removed. Changes to the root profile however, have"
 echo "not been reverted, as haven't the wlan firewall zone and the radio0 device state."
diff --git a/pre-remove.sh b/pre-remove.sh
index bbe80b5..d4a35ff 100644
--- a/pre-remove.sh
+++ b/pre-remove.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$$IPKG_INSTROOT" ]; then
-	/etc/init.d/autowifi_init disable
+	/etc/init.d/wifibox_init disable
 fi
 
 exit 0
diff --git a/src/main.lua b/src/main.lua
index c51e55a..758901c 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -19,7 +19,7 @@ io.write ("Content-type: text/plain\r\n\r\n")
 local u = require("util")
 local l = require("logger")
 local wifi = require("network.wlanconfig")
-local reconf = require("network.netconf")
+local reconf = require("network.netconfig")
 local urlcode = require("util.urlcode")
 local uci = require("uci").cursor()
 local iwinfo = require("iwinfo")
diff --git a/src/network/wlanconfig.lua b/src/network/wlanconfig.lua
index 1c16dc7..da72e73 100644
--- a/src/network/wlanconfig.lua
+++ b/src/network/wlanconfig.lua
@@ -1,4 +1,4 @@
-local reconf = require("network.netconf")
+local reconf = require("network.netconfig")
 local util = require("util")
 local l = require("logger")
 local uci = require("uci").cursor()
diff --git a/src/script/d3dapi b/src/script/d3dapi
index 754a2cf..a2a366a 100755
--- a/src/script/d3dapi
+++ b/src/script/d3dapi
@@ -1,5 +1,5 @@
 #!/bin/sh
-#chmod 755 /www/cgi-bin/wfcf
+#chmod 755 /www/cgi-bin/d3dapi
 
 LUA=lua
 SCRIPT_PATH=/usr/share/lua/wifibox