diff --git a/elements/dhcp-all-interfaces/README.md b/elements/dhcp-all-interfaces/README.md
index 6857f942..480b2f37 100644
--- a/elements/dhcp-all-interfaces/README.md
+++ b/elements/dhcp-all-interfaces/README.md
@@ -6,6 +6,6 @@ to know ahead of time which one is which, so we will simply run a
 DHCP client on all interfaces with real MAC addresses (except lo) that
 are visible on the first boot.
 
-The script /usr/local/sbin/generate-interfaces-file.sh will be called
+The script /usr/local/sbin/dhcp-all-interfaces.sh will be called
 early in each boot and will scan available network interfaces and
 ensure they are configured properly before networking services are started.
diff --git a/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces b/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
index df486709..eaa51c71 100755
--- a/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
+++ b/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
@@ -3,7 +3,7 @@ set -x
 
 SCRIPTDIR=$(dirname $0)
 
-install -D -g root -o root -m 0755 ${SCRIPTDIR}/generate-interfaces-file.sh /usr/local/sbin/generate-interfaces-file.sh
+install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.sh /usr/local/sbin/dhcp-all-interfaces.sh
 
 DIB_INIT_SYSTEM=$(dib-init-system)
 if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then
diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf
index 8cdbef00..bc0e7471 100644
--- a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf
+++ b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf
@@ -1,4 +1,4 @@
-# Call a script to generate an /etc/network/interfaces file to DHCP all available interfaces
+# Call a script to generate a /etc/network/interfaces file to DHCP all available interfaces
 # Then remove this config file so the script is never run again
 
 description "DHCP any connected, but unconfigured network interfaces"
@@ -8,4 +8,4 @@ instance $INTERFACE
 
 task
 
-exec /usr/local/sbin/generate-interfaces-file.sh
+exec /usr/local/sbin/dhcp-all-interfaces.sh
diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.service b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.service
index b38476f0..e19c9240 100644
--- a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.service
+++ b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.service
@@ -6,7 +6,7 @@ Before=network.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/sbin/generate-interfaces-file.sh
+ExecStart=/usr/local/sbin/dhcp-all-interfaces.sh
 RemainAfterExit=yes
 
 [Install]
diff --git a/elements/dhcp-all-interfaces/install.d/generate-interfaces-file.sh b/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh
similarity index 100%
rename from elements/dhcp-all-interfaces/install.d/generate-interfaces-file.sh
rename to elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh