diff --git a/Shorewall-core/configure b/Shorewall-core/configure
index 6fb055198..c192c24b4 100755
--- a/Shorewall-core/configure
+++ b/Shorewall-core/configure
@@ -195,8 +195,8 @@ elif [ -n "${options[VARDIR]}" ]; then
     fi
 fi
 
-if [ -z "${options[SYSTEMDDIR]}" ]; then
-    $options[SYSTEMDDIR]="${options[SYSTEMD]}"
+if [ -z "${options[SERVICEDIR]}" ]; then
+    $options[SERVICEDIR]="${options[SYSTEMD]}"
 fi
 
 for on in \
@@ -213,7 +213,7 @@ for on in \
     INITFILE \
     AUXINITSOURCE \
     AUXINITFILE \
-    SYSTEMDDIR \
+    SERVICEDIR \
     SERVICEFILE \
     SYSCONFFILE \
     SYSCONFDIR \
diff --git a/Shorewall-core/configure.pl b/Shorewall-core/configure.pl
index 8ddec6852..a21b4d7de 100755
--- a/Shorewall-core/configure.pl
+++ b/Shorewall-core/configure.pl
@@ -154,7 +154,7 @@ if ( $options{VARLIB} ) {
     $options{VARDIR} = '${VARLIB}/${PRODUCT}';
 }
 
-$options{SYSTEMDDIR}=$options{SYSTEMD} unless $options{SYSTEMDDIR};
+$options{SERVICEDIR}=$options{SYSTEMD} unless $options{SERVICEDIR};
 
 for ( qw/ HOST
 	  PREFIX
@@ -169,7 +169,7 @@ for ( qw/ HOST
 	  INITFILE
 	  AUXINITSOURCE
 	  AUXINITFILE
-	  SYSTEMDDIR
+	  SERVICEDIR
           SERVICEFILE
 	  SYSCONFFILE
 	  SYSCONFDIR
diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh
index af635bf76..e9643850c 100755
--- a/Shorewall-core/install.sh
+++ b/Shorewall-core/install.sh
@@ -329,13 +329,13 @@ if [ -n "${SYSCONFDIR}" ]; then
     chmod 755 ${DESTDIR}${SYSCONFDIR}
 fi
 
-if [ -z "${SYSTEMDDIR}" ]; then
-    SYSTEMDDIR="$SYSTEMD"
+if [ -z "${SERVICEDIR}" ]; then
+    SERVICEDIR="$SYSTEMD"
 fi
 
-if [ -n "${SYSTEMDDIR}" ]; then
-    mkdir -p ${DESTDIR}${SYSTEMDDIR}
-    chmod 755 ${DESTDIR}${SYSTEMDDIR}
+if [ -n "${SERVICEDIR}" ]; then
+    mkdir -p ${DESTDIR}${SERVICEDIR}
+    chmod 755 ${DESTDIR}${SERVICEDIR}
 fi
 
 mkdir -p ${DESTDIR}${SBINDIR}
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 6a292a301..2e09c7cf5 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -330,16 +330,16 @@ fi
 #
 # Install the .service file
 #
-if [ -z "${SYSTEMDDIR}" ]; then
-    SYSTEMDDIR="$SYSTEMD"
+if [ -z "${SERVICEDIR}" ]; then
+    SERVICEDIR="$SYSTEMD"
 fi
 
-if [ -n "$SYSTEMDDIR" ]; then
-    mkdir -p ${DESTDIR}${SYSTEMDDIR}
+if [ -n "$SERVICEDIR" ]; then
+    mkdir -p ${DESTDIR}${SERVICEDIR}
     [ -z "$SERVICEFILE" ] && SERVICEFILE=$PRODUCT.service
-    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service
-    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service
-    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service"
+    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
+    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
+    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service"
     if [ -n "$DESTDIR" -o $configure -eq 0 ]; then
 	mkdir -p ${DESTDIR}${SBINDIR}
         chmod 755 ${DESTDIR}${SBINDIR}
@@ -519,7 +519,7 @@ if [ -z "$DESTDIR" ]; then
 	    # not by the installer
 	    /bin/true
 	else
-	    if [ -n "$SYSTEMDDIR" ]; then
+	    if [ -n "$SERVICEDIR" ]; then
 		if systemctl enable shorewall-init.service; then
 		    echo "Shorewall Init will start automatically at boot"
 		fi
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 3cc17033b..453a84a43 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -392,16 +392,16 @@ fi
 #
 # Install the .service file
 #
-if [ -z "${SYSTEMDDIR}" ]; then
-    SYSTEMDDIR="$SYSTEMD"
+if [ -z "${SERVICEDIR}" ]; then
+    SERVICEDIR="$SYSTEMD"
 fi
 
-if [ -n "$SYSTEMDDIR" ]; then
-    mkdir -p ${DESTDIR}${SYSTEMDDIR}
+if [ -n "$SERVICEDIR" ]; then
+    mkdir -p ${DESTDIR}${SERVICEDIR}
     [ -z "$SERVICEFILE" ] && SERVICEFILE=$PRODUCT.service
-    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service
-    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service
-    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service"
+    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
+    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
+    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service"
 fi
 #
 # Install the config file
@@ -543,7 +543,7 @@ if [ ${SHAREDIR} != /usr/share ]; then
 fi
 
 if [ $configure -eq 1 -a -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${mac}" ]; then
-    if [ -n "$SYSTEMDDIR" ]; then
+    if [ -n "$SERVICEDIR" ]; then
 	if systemctl enable ${PRODUCT}.service; then
 	    echo "$Product will start automatically at boot"
 	fi
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 147a27013..088206304 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -425,16 +425,16 @@ fi
 #
 # Install the .service file
 #
-if [ -z "${SYSTEMDDIR}" ]; then
-    SYSTEMDDIR="$SYSTEMD"
+if [ -z "${SERVICEDIR}" ]; then
+    SERVICEDIR="$SYSTEMD"
 fi
 
-if [ -n "$SYSTEMDDIR" ]; then
-    mkdir -p ${DESTDIR}${SYSTEMDDIR}
+if [ -n "$SERVICEDIR" ]; then
+    mkdir -p ${DESTDIR}${SERVICEDIR}
     [ -z "$SERVICEFILE" ] && SERVICEFILE=$PRODUCT.service
-    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service
-    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service
-    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SYSTEMDDIR}/$PRODUCT.service"
+    run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
+    [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SERVICEDIR}/$PRODUCT.service
+    echo "Service file $SERVICEFILE installed as ${DESTDIR}${SERVICEDIR}/$PRODUCT.service"
 fi
 
 #
@@ -1180,7 +1180,7 @@ if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PR
 fi
 
 if [ $configure -eq 1 -a -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${mac}" ]; then
-    if [ -n "$SYSTEMDDIR" ]; then
+    if [ -n "$SERVICEDIR" ]; then
 	if systemctl enable ${PRODUCT}.service; then
 	    echo "$Product will start automatically at boot"
 	fi