diff --git a/Shorewall-lite/default.debian b/Shorewall-lite/default.debian
index f66f56dee..8593d6b63 100644
--- a/Shorewall-lite/default.debian
+++ b/Shorewall-lite/default.debian
@@ -12,8 +12,6 @@ startup=0
 #    wait_interface="ppp0"
 # or
 #    wait_interface="ppp0 ppp1"
-# or, if you have defined  in /etc/shorewall/params
-#    wait_interface=
 
 #
 # Startup options -- if you specify '-f' then Shorewall will use the last saved
diff --git a/Shorewall-lite/help b/Shorewall-lite/help
index b38d61522..f6859b210 100755
--- a/Shorewall-lite/help
+++ b/Shorewall-lite/help
@@ -8,7 +8,7 @@
 #     (c) 2003-2006 - Tom Eastep (teastep@shorewall.net)
 #                     Steve Herber (herber@thing.com)
 #
-#	This file should be placed in /usr/share/shorewall/help
+#	This file should be placed in /usr/share/shorewall-lite/help
 #
 #	Shorewall documentation is available at http://shorewall.sourceforge.net
 #
@@ -97,7 +97,7 @@ dump)
 
 forget)
 	echo "forget: forget [ <file name> ]
-    Deletes /var/lib/shorewall/<file name>. If no <file name> is given then
+    Deletes /var/lib/shorewall-lite/<file name>. If no <file name> is given then
     the file specified by RESTOREFILE in shorewall.conf is removed.
 
     See also \"help save\""
@@ -190,7 +190,7 @@ restore)
 	echo "restore: restore [ -n ] [ <file name> ]
     Restore Shorewall to a state saved using the 'save' command
     Existing connections are maintained. The <file name> names a restore file in
-    /var/lib/shorewall created using \"shorewall save\"; if no <file name> is given
+    /var/lib/shorewall-lite created using \"shorewall save\"; if no <file name> is given
     then Shorewall will be restored from the file specified by the RESTOREFILE
     option in shorewall.conf.
 
@@ -201,8 +201,8 @@ restore)
 
 save)
 	echo "save: save [ <file name> ]
-    The dynamic data is stored in /var/lib/shorewall/save. The state of the
-    firewall is stored in /var/lib/shorewall/<file name> for use by the 'shorewall restore'
+    The dynamic data is stored in /var/lib/shorewall-lite/save. The state of the
+    firewall is stored in /var/lib/shorewall-lite/<file name> for use by the 'shorewall restore'
     and 'shorewall -f start' commands. If <file name> is not given then the state is saved
     in the file specified by the RESTOREFILE option in shorewall.conf.
 
@@ -217,7 +217,7 @@ show)
     shorewall [-x] show <chain> [ <chain> ... ]  - produce a verbose report about the IPtable chain(s).
     (iptables -L chain -n -v)
 
-    shorewall show actions - produce a list of builtin actions and actions defined in /usr/share/shorewall/actions.std and /etc/shorewall
+    shorewall show actions - produce a list of builtin actions and actions defined in /usr/share/shorewall-lite/actions.std and /etc/shorewall-lite
 
     shorewall [-x] show mangle - produce a verbose report about the mangle table.
     (iptables -t mangle -L -n -v)
@@ -257,9 +257,9 @@ start)
 stop)
 	echo "stop: stop
     Stops the firewall.  All existing connections, except those
-    listed in /etc/shorewall/routestopped, are taken down.
+    listed in routestopped, are taken down.
     The only new traffic permitted through the firewall
-    is from systems listed in /etc/shorewall/routestopped."
+    is from systems listed in routestopped."
 	;;
 
 status)
diff --git a/Shorewall-lite/init.debian.sh b/Shorewall-lite/init.debian.sh
index c175b71bb..b021419fc 100755
--- a/Shorewall-lite/init.debian.sh
+++ b/Shorewall-lite/init.debian.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 SRWL=/usr/share/shorewall-lite/shorewall
-WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
+WAIT_FOR_IFUP=/usr/share/shorewall-lite/wait4ifup
 # Note, set INITLOG to /dev/null if you do not want to
 # keep logs of the firewall (not recommended)
 INITLOG=/var/log/shorewall-init.log
@@ -43,13 +43,6 @@ not_configured () {
 	exit 0
 }
 
-# parse the shorewall params file in order to use params in
-# /etc/default/shorewall
-if [ -f "/etc/shorewall/params" ]
-then
-	. /etc/shorewall/params
-fi
-
 # check if shorewall is configured or not
 if [ -f "/etc/default/shorewall-lite" ]
 then
@@ -123,7 +116,7 @@ case "$1" in
      shorewall_restart
      ;;
   *)
-     echo "Usage: /etc/init.d/shorewall {start|stop|refresh|restart|force-reload}"
+     echo "Usage: /etc/init.d/shorewall-lite {start|stop|refresh|restart|force-reload}"
      exit 1
 esac
 
diff --git a/Shorewall-lite/shorewall b/Shorewall-lite/shorewall
index eee7689ac..38b89b24c 100755
--- a/Shorewall-lite/shorewall
+++ b/Shorewall-lite/shorewall
@@ -6,7 +6,7 @@
 #
 #     (c) 1999,2000,2001,2002,2003,2004,2005,2006 - Tom Eastep (teastep@shorewall.net)
 #
-#	This file should be placed in /sbin/shorewall.
+#	This file should be placed in /usr/share/shorewall-lite/shorewall.
 #
 #	Shorewall documentation is available at http://shorewall.sourceforge.net
 #
@@ -26,9 +26,6 @@
 #	If an error occurs while starting or restarting the firewall, the
 #	firewall is automatically stopped.
 #
-#	The firewall uses configuration files in /etc/shorewall/ - skeleton
-#	files is included with the firewall.
-#
 #	Commands are:
 #
 #          shorewall dump                          Dumps all Shorewall-related information