diff --git a/Samples/Universal/shorewall.conf b/Samples/Universal/shorewall.conf
index 56f365329..1f48609d6 100644
--- a/Samples/Universal/shorewall.conf
+++ b/Samples/Universal/shorewall.conf
@@ -194,7 +194,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=Yes
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Samples/one-interface/shorewall.conf b/Samples/one-interface/shorewall.conf
index 6f54575b2..1800a8bac 100644
--- a/Samples/one-interface/shorewall.conf
+++ b/Samples/one-interface/shorewall.conf
@@ -205,7 +205,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=No
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Samples/three-interfaces/shorewall.conf b/Samples/three-interfaces/shorewall.conf
index 5b895380a..3c7804c5d 100644
--- a/Samples/three-interfaces/shorewall.conf
+++ b/Samples/three-interfaces/shorewall.conf
@@ -205,7 +205,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=No
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Samples/two-interfaces/shorewall.conf b/Samples/two-interfaces/shorewall.conf
index 24dfc8eda..3a907f963 100644
--- a/Samples/two-interfaces/shorewall.conf
+++ b/Samples/two-interfaces/shorewall.conf
@@ -212,7 +212,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=No
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Samples6/Universal/shorewall6.conf b/Samples6/Universal/shorewall6.conf
index d0956973b..6d1c6eb76 100644
--- a/Samples6/Universal/shorewall6.conf
+++ b/Samples6/Universal/shorewall6.conf
@@ -157,7 +157,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=Yes
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Samples6/one-interface/shorewall6.conf b/Samples6/one-interface/shorewall6.conf
index fefd8a4f8..7c9cc5fca 100644
--- a/Samples6/one-interface/shorewall6.conf
+++ b/Samples6/one-interface/shorewall6.conf
@@ -159,7 +159,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=No
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ##############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Samples6/three-interfaces/shorewall6.conf b/Samples6/three-interfaces/shorewall6.conf
index dd61b8df3..44014e3b1 100644
--- a/Samples6/three-interfaces/shorewall6.conf
+++ b/Samples6/three-interfaces/shorewall6.conf
@@ -159,7 +159,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=No
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Samples6/two-interfaces/shorewall6.conf b/Samples6/two-interfaces/shorewall6.conf
index c1ae98424..4a591a491 100644
--- a/Samples6/two-interfaces/shorewall6.conf
+++ b/Samples6/two-interfaces/shorewall6.conf
@@ -159,7 +159,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=No
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index d7a2a49e8..0770d0428 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -336,10 +336,10 @@ sub generate_script_3($) {
 
     save_progress_message 'Initializing...';
 
-    if ( $export || $config{USE_LOCAL_MODULES} ) {
+    if ( $export || $config{EXPORTMODULES} ) {
 	my $fn = find_file( $config{LOAD_HELPERS_ONLY} ? 'helpers' : 'modules' );
 
-	if ( -f $fn && ( $config{USE_LOCAL_MODULES} || ( $export && ! $fn =~ "^$globals{SHAREDIR}/" ) ) ) {
+	if ( -f $fn && ( $config{EXPORTMODULES} || ( $export && ! $fn =~ "^$globals{SHAREDIR}/" ) ) ) {
 	    emit 'echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir';
 	    emit 'cat > ${VARDIR}/.modules << EOF';
 	    open_file $fn;
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 21c6e98b2..91e42ecf5 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -484,7 +484,7 @@ sub initialize( $ ) {
 	  REQUIRE_INTERFACE => undef,
 	  FORWARD_CLEAR_MARK => undef,
 	  COMPLETE => undef,
-	  USE_LOCAL_MODULES => undef,
+	  EXPORTMODULES => undef,
 	  #
 	  # Packet Disposition
 	  #
@@ -3221,7 +3221,7 @@ sub get_configuration( $ ) {
     default_yes_no 'REQUIRE_INTERFACE'          , '';
     default_yes_no 'FORWARD_CLEAR_MARK'         , have_capability 'MARK' ? 'Yes' : '';
     default_yes_no 'COMPLETE'                   , '';
-    default_yes_no 'USE_LOCAL_MODULES'          , '';
+    default_yes_no 'EXPORTMODULES'              , '';
 
     require_capability 'MARK' , 'FOREWARD_CLEAR_MARK=Yes', 's', if $config{FORWARD_CLEAR_MARK};
 
diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf
index bee3cd58b..57d4df963 100644
--- a/Shorewall/configfiles/shorewall.conf
+++ b/Shorewall/configfiles/shorewall.conf
@@ -194,7 +194,7 @@ FORWARD_CLEAR_MARK=
 
 COMPLETE=No
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/Shorewall6/shorewall6.conf b/Shorewall6/shorewall6.conf
index e1bbfc578..b4470a20e 100644
--- a/Shorewall6/shorewall6.conf
+++ b/Shorewall6/shorewall6.conf
@@ -157,7 +157,7 @@ FORWARD_CLEAR_MARK=Yes
 
 COMPLETE=No
 
-USE_LOCAL_MODULES=Yes
+EXPORTMODULES=Yes
 
 ###############################################################################
 #			P A C K E T   D I S P O S I T I O N
diff --git a/docs/CompiledPrograms.xml b/docs/CompiledPrograms.xml
index cfbc984fe..1a55d0b85 100644
--- a/docs/CompiledPrograms.xml
+++ b/docs/CompiledPrograms.xml
@@ -444,8 +444,8 @@ clean:
         (<filename>modules</filename> or <filename>helpers</filename>) in the
         firewall's configuration directory before compilation.</para>
 
-        <para>In Shorewall 4.4.17, the USE_LOCAL_MODULES option was added to
-        shorewall.conf (and shorewall6.conf). When USE_LOCAL_MODULES=Yes, any
+        <para>In Shorewall 4.4.17, the EXPORTMODULES option was added to
+        shorewall.conf (and shorewall6.conf). When EXPORTMODULES=Yes, any
         <filename>modules</filename> or <filename>helpers</filename> file
         found on the CONFIG_PATH on the Administrative System during
         compilation will be used.</para>
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index dfdfeb0b5..10416a313 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -1846,7 +1846,7 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">USE_LOCAL_MODULES=</emphasis>[<emphasis
+        <term><emphasis role="bold">EXPORTMODULES=</emphasis>[<emphasis
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
 
         <listitem>
diff --git a/manpages6/shorewall6.conf.xml b/manpages6/shorewall6.conf.xml
index 5e358c8d0..7ba9024a0 100644
--- a/manpages6/shorewall6.conf.xml
+++ b/manpages6/shorewall6.conf.xml
@@ -1493,7 +1493,7 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">USE_LOCAL_MODULES=</emphasis>[<emphasis
+        <term><emphasis role="bold">EXPORTMODULES=</emphasis>[<emphasis
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
 
         <listitem>