diff --git a/avdd b/avdd
index 92514f6..d8770ec 100755
--- a/avdd
+++ b/avdd
@@ -43,8 +43,10 @@ DEFAULT_PRE=' '
 DEFAULT_SEP_L='| '
 DEFAULT_SEP_R=' '
 DEFAULT_SUF=' '
-MOD_DIR="$(dirname "$0")"/mod
-FIFO=/tmp/avdd-fifo-"$("$(dirname "$0")"/rpid $$)"
+DIR="$(dirname "$0")"
+MOD_DIR="${DIR}/mod"
+DAEMON="$(basename "$0")"
+FIFO="/tmp/${DAEMON}-fifo-$("${DIR}/rpid" $$)"
 
 mod_list="${1-${DEFAULT_MOD_LIST}}"
 
diff --git a/avds b/avds
index 15c9281..a562b82 100755
--- a/avds
+++ b/avds
@@ -75,7 +75,7 @@ if [[ "${mod_list}" =~ ^\>\>\*\  ]]; then
   mod_list="${mod_list:4}"
   is_request_all=1
 else
-  fifo=/tmp/avdd-fifo-"$("$(dirname "$0")"/rpid $$)"
+  fifo="/tmp/${DAEMON}-fifo-$("$(dirname "$0")/rpid" $$)"
 fi
 
 when="${2:-0}"