diff --git a/src/ifplugd.action b/src/ifplugd.action
index 42d1c5a..a1c8dee 100755
--- a/src/ifplugd.action
+++ b/src/ifplugd.action
@@ -4,7 +4,7 @@
 
 . /usr/lib/network/globals
 
-PROFILE_FILE="$STATE_DIR/ifplugd_$1.profile"
+PROFILE_FILE="$STATE_DIR/ifplugd-$1.profile"
 
 case "$2" in
   up)
diff --git a/src/lib/connections/mobile_ppp b/src/lib/connections/mobile_ppp
index 0890373..11cb41e 100644
--- a/src/lib/connections/mobile_ppp
+++ b/src/lib/connections/mobile_ppp
@@ -11,7 +11,7 @@ quote_word() {
 }
 
 mobile_ppp_up() {
-    local options_dir="$STATE_DIR/mobile_ppp.$Interface.$Profile"
+    local options_dir="$STATE_DIR/mobile_ppp-$Interface-$Profile"
 
     network_ready
 
@@ -83,7 +83,7 @@ EOF
 
 mobile_ppp_down() {
     local options_dir pidfile pid
-    options_dir="$STATE_DIR/mobile_ppp.$Interface.$Profile"
+    options_dir="$STATE_DIR/mobile_ppp-$Interface-$Profile"
     pidfile="/var/run/ppp-$Profile.pid"
 
     if [[ -r $pidfile ]]; then
diff --git a/src/lib/connections/pppoe b/src/lib/connections/pppoe
index 15e4db5..96cda80 100644
--- a/src/lib/connections/pppoe
+++ b/src/lib/connections/pppoe
@@ -8,7 +8,7 @@ quote_word() {
 }
 
 pppoe_up() {
-    local options="$STATE_DIR/pppoe.$Interface.$Profile/options"
+    local options="$STATE_DIR/pppoe-$Interface-$Profile/options"
 
     if ! is_interface "$Interface"; then
         report_error "Interface '$Interface' does not exist"
@@ -61,7 +61,7 @@ EOF
 
 pppoe_down() {
     local options pidfile pid
-    options="$STATE_DIR/pppoe.$Interface.$Profile/options"
+    options="$STATE_DIR/pppoe-$Interface-$Profile/options"
     pidfile="/var/run/ppp-$Profile.pid"
 
     if [[ -r $pidfile ]]; then
diff --git a/src/lib/dhcp/dhclient b/src/lib/dhcp/dhclient
index 87e9a92..397adda 100644
--- a/src/lib/dhcp/dhclient
+++ b/src/lib/dhcp/dhclient
@@ -8,7 +8,7 @@ dhclient_start() {
       *) return 1;;
     esac
     [[ $2 == "noaddr" ]] && options+=" -S"
-    if ! do_debug do_readable dhclient -$1 -q -e "TIMEOUT=${TimeoutDHCP:-30}" -pf "$pidfile" $options "$Interface"; then
+    if ! do_debug do_readable dhclient "-$1" -q -e "TIMEOUT=${TimeoutDHCP:-30}" -pf "$pidfile" $options "$Interface"; then
         report_error "DHCP IPv$1 lease attempt failed on interface '$Interface'"
         return 1
     fi
@@ -18,7 +18,7 @@ dhclient_stop() {
     local stop="-x" pidfile="/run/dhclient-$Interface-$1.pid"
     if [[ -f $pidfile ]]; then
         is_yes "${DHCPReleaseOnStop:-no}" && stop="-r"
-        do_debug dhclient -$1 -q $stop "$Interface" -pf "$pidfile" > /dev/null
+        do_debug dhclient "-$1" -q $stop "$Interface" -pf "$pidfile" > /dev/null
     fi
 }
 
diff --git a/src/lib/dhcp/dhcpcd b/src/lib/dhcp/dhcpcd
index c88047f..ef1245d 100644
--- a/src/lib/dhcp/dhcpcd
+++ b/src/lib/dhcp/dhcpcd
@@ -13,7 +13,7 @@ dhcpcd_start() {
     fi
     # If using own dns, tell dhcpcd to NOT replace resolv.conf
     [[ $DNS ]] && options+=" -C resolv.conf"
-    if ! do_debug do_readable dhcpcd -$1 -q -t "${TimeoutDHCP:-30}" $options "$Interface"; then
+    if ! do_debug do_readable dhcpcd "-$1" -q -t "${TimeoutDHCP:-30}" $options "$Interface"; then
         report_error "DHCP IPv$1 lease attempt failed on interface '$Interface'"
         return 1
     fi
@@ -23,7 +23,7 @@ dhcpcd_stop() {
     local stop="-x"
     if [[ -f "/run/dhcpcd-$Interface-$1.pid" ]]; then
         is_yes "${DHCPReleaseOnStop:-no}" && stop="-k"
-        do_debug dhcpcd -$1 -q $stop "$Interface" > /dev/null
+        do_debug dhcpcd "-$1" -q $stop "$Interface" > /dev/null
     fi
 }
 
diff --git a/src/lib/wpa b/src/lib/wpa
index b61f93b..e7d873d 100644
--- a/src/lib/wpa
+++ b/src/lib/wpa
@@ -64,29 +64,29 @@ wpa_wait_while_state() {
 # $2: interface driver(s)
 # $3: configuration file
 wpa_start() {
-    local interface=$1 driver=$2 configuration=$3
-    local pidfile="/run/wpa_supplicant_$interface.pid"
+    local interface=$1 driver=$2 config_file=$3
+    local pidfile="/run/wpa_supplicant-$interface.pid"
 
     if ! type wpa_supplicant &> /dev/null; then
         report_error "You need to install 'wpa_supplicant'"
         return 127
     fi
 
-    if [[ $configuration ]]; then
-        configuration="-c$configuration"
+    if [[ $config_file ]]; then
+        config_file="-c$config_file"
     else
         WPA_CTRL_DIR="/run/wpa_supplicant"
-        configuration="-C$WPA_CTRL_DIR"
+        config_file="-C$WPA_CTRL_DIR"
     fi
 
     do_debug wpa_supplicant -q -B -P "$pidfile" -i "$interface" -D "$driver" \
-                            "$configuration" $WPAOptions >&2
+                            "$config_file" $WPAOptions >&2
 
     # Wait up to one second for the pid file to appear
     if ! timeout_wait 1 '[[ -f $pidfile ]]'; then
         # Remove the configuration file if it was generated
-        configuration="$STATE_DIR/wpa_supplicant_$interface.conf"
-        [[ -f $configuration && -O $configuration ]] && rm -f "$configuration"
+        config_file="$STATE_DIR/wpa_supplicant-$interface.conf"
+        [[ -f $config_file && -O $config_file ]] && rm -f "$config_file"
         return 1
     fi
 }
@@ -94,7 +94,8 @@ wpa_start() {
 ## Stop an instance of the wpa supplicant
 # $1: interface name
 wpa_stop() {
-    local interface=$1 config_file="$STATE_DIR/wpa_supplicant_$1.conf"
+    local interface=$1 config_file="$STATE_DIR/wpa_supplicant-$1.conf"
+    local pidfile="/run/wpa_supplicant-$interface.pid"
     # We need this as long as wpa_cli has a different default than netctl
     if [[ -z $WPA_CTRL_DIR && -z $WPAConfigFile ]]; then
         WPA_CTRL_DIR="/run/wpa_supplicant"
@@ -107,8 +108,8 @@ wpa_stop() {
     [[ -f $config_file && -O $config_file ]] && rm -f "$config_file"
 
     # Wait up to one second for the pid file to be removed
-    if ! timeout_wait 1 '[[ ! -f "/run/wpa_supplicant_$interface.pid" ]]'; then
-        kill "$(< "/run/wpa_supplicant_$interface.pid")" &> /dev/null
+    if ! timeout_wait 1 '[[ ! -f $pidfile ]]'; then
+        kill "$(< "$pidfile")" &> /dev/null
     fi
 }
 
@@ -192,7 +193,7 @@ wpa_unquote() {
 ## Create a configuration file for wpa_supplicant without any network blocks
 # $1: interface name
 wpa_make_config_file() {
-    local config_file="$STATE_DIR/wpa_supplicant_$1.conf"
+    local config_file="$STATE_DIR/wpa_supplicant-$1.conf"
 
     if [[ -e $config_file ]]; then
         report_debug "The anticipated filename '$config_file' is not available"
diff --git a/src/netctl-auto b/src/netctl-auto
index b25d258..f78efe3 100755
--- a/src/netctl-auto
+++ b/src/netctl-auto
@@ -8,6 +8,7 @@
 : ${ACTIOND:=wpa_actiond -p /run/wpa_supplicant}
 : ${ACTION_SCRIPT:=$SUBR_DIR/auto.action}
 
+
 usage() {
     cat << END
 Usage: netctl-auto {COMMAND} ...
@@ -81,7 +82,7 @@ profile_enable_disable() {
     local action="$1" profile="$2"
     local id interfaces wpa_cmd
 
-    if [[ -n "$profile" ]]; then
+    if [[ $profile ]]; then
         read -r interfaces id < <(get_wpa_network_id "$profile") || return 1
     else
         interfaces=$(list_netctl_auto_interfaces)
@@ -197,7 +198,7 @@ list() {
 # $1: interface
 start() {
     local interface="$1"
-    local pidfile="$STATE_DIR/wpa_actiond_$1.pid"
+    local pidfile="$STATE_DIR/wpa_actiond-$interface.pid"
 
     if wpa_is_active "$interface"; then
         exit_error "The interface ($interface) is already in use"
@@ -247,7 +248,7 @@ start() {
 # $1: interface
 stop() {
     local interface="$1"
-    local pidfile="$STATE_DIR/wpa_actiond_$1.pid"
+    local pidfile="$STATE_DIR/wpa_actiond-$interface.pid"
 
     [[ -e "$pidfile" ]] && kill "$(< "$pidfile")"
     if [[ -x "$PROFILE_DIR/interfaces/$interface" ]]; then
@@ -259,6 +260,7 @@ stop() {
     return 0
 }
 
+
 case $# in
   1)
     case $1 in
@@ -292,4 +294,5 @@ case $# in
     exit_error "$(usage)";;
 esac
 
+
 # vim: ft=sh ts=4 et sw=4:
diff --git a/src/netctl.in b/src/netctl.in
index ea1c9aa..37c095c 100644
--- a/src/netctl.in
+++ b/src/netctl.in
@@ -97,7 +97,7 @@ unit_enable() {
     do_readable touch "$unit"
     echo ".include @systemdsystemunitdir@/netctl@.service" > "$unit"
     echo -e "\n[Unit]" >> "$unit"
-    [[ -n $Description ]] && echo "Description=$Description" >> "$unit"
+    [[ $Description ]] && echo "Description=$Description" >> "$unit"
     declare -p BindsToInterfaces &> /dev/null || BindsToInterfaces=$Interface
     if (( ${#BindsToInterfaces[@]} )); then
         : ${InterfaceRoot=sys/subsystem/net/devices/}