diff --git a/firewall/acl_security.pl b/firewall/acl_security.pl
index 9e568a1ff..9ccfa7daf 100755
--- a/firewall/acl_security.pl
+++ b/firewall/acl_security.pl
@@ -1,5 +1,5 @@
 
-do 'firewall4-lib.pl';
+do 'firewall-lib.pl';
 @acl_features = ("newchain", "delchain", "policy", "apply", "unapply", "bootup", "setup", "cluster");
 
 # acl_security_form(&options)
diff --git a/firewall/backup_config.pl b/firewall/backup_config.pl
index 2d9899f2d..663cabb33 100755
--- a/firewall/backup_config.pl
+++ b/firewall/backup_config.pl
@@ -1,5 +1,5 @@
 
-do 'firewall4-lib.pl';
+do 'firewall-lib.pl';
 
 # backup_config_files()
 # Returns files and directories that can be backed up
diff --git a/firewall/cgi_args.pl b/firewall/cgi_args.pl
index 253590062..27d76676f 100755
--- a/firewall/cgi_args.pl
+++ b/firewall/cgi_args.pl
@@ -1,5 +1,5 @@
 
-do 'firewall4-lib.pl';
+do 'firewall-lib.pl';
 
 sub cgi_args
 {
diff --git a/firewall/install_check.pl b/firewall/install_check.pl
index 0d2fb5b04..cbc3043b2 100755
--- a/firewall/install_check.pl
+++ b/firewall/install_check.pl
@@ -1,6 +1,6 @@
 # install_check.pl
 
-do 'firewall4-lib.pl';
+do 'firewall-lib.pl';
 
 # is_installed(mode)
 # For mode 1, returns 2 if the server is installed and configured for use by
diff --git a/firewall/log_parser.pl b/firewall/log_parser.pl
index 0498cc569..645daf70b 100755
--- a/firewall/log_parser.pl
+++ b/firewall/log_parser.pl
@@ -1,7 +1,7 @@
 # log_parser.pl
 # Functions for parsing this module's logs
 
-do 'firewall4-lib.pl';
+do 'firewall-lib.pl';
 
 # parse_webmin_log(user, script, action, type, object, &params)
 # Converts logged information from this module into human-readable form
diff --git a/firewall/open-ports.pl b/firewall/open-ports.pl
index 7f8fbb16c..53d737edf 100755
--- a/firewall/open-ports.pl
+++ b/firewall/open-ports.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 # Open some ports on the firewall. Exit statuses are :
 # 0 - Nothing needed to be done
 # 1 - Given ports were opened up
@@ -13,7 +13,7 @@ $ENV{'WEBMIN_VAR'} = "/var/webmin";
 if ($0 =~ /^(.*\/)[^\/]+$/) {
 	chdir($1);
 	}
-require './firewall4-lib.pl';
+require './firewall-lib.pl';
 if ($module_name ne 'firewall') {
 	print STDERR "Command must be run with full path\n";
 	exit(5);