diff --git a/overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.digipeater-only.conf b/overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.digipeater.conf
similarity index 100%
rename from overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.digipeater-only.conf
rename to overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.digipeater.conf
diff --git a/overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.simple-packet.conf b/overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.simple.conf
similarity index 100%
rename from overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.simple-packet.conf
rename to overlay/opt/emcomm-tools/conf/template.d/packet/direwolf.simple.conf
diff --git a/scripts/install-yaac.sh b/scripts/install-yaac.sh
index 2e6e2b3..1693b6e 100755
--- a/scripts/install-yaac.sh
+++ b/scripts/install-yaac.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 # Author  : Gaston Gonzalez
 # Date    : 3 November 2024
+# Updated : 7 November 2024
 # Purpose : Install YAAC
-set -e
-trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
-trap 'et-log "\"${last_command}\" command failed with exit code $?."' ERR
 
 VERSION=latest
 ZIP_FILE=YAAC.zip
@@ -13,18 +11,12 @@ LINK_PATH=/opt/yaac
 
 et-log "Installing YAAC..."
 
-if [ ! -e ${ET_DIST_DIR}/${ZIP_FILE} ]; then
+URL=https://www.ka2ddo.org/ka2ddo/${ZIP_FILE}
 
-  URL=https://www.ka2ddo.org/ka2ddo/${ZIP_FILE}
+et-log "Downloading YAAC: ${URL}"
+curl -s -L -o ${ZIP_FILE} --fail ${URL}
 
-  et-log "Downloading YAAC: ${URL}"
-  curl -s -L -o ${ZIP_FILE} --fail ${URL}
-
-  [ ! -e ${ET_DIST_DIR} ] && mkdir ${ET_DIST_DIR}
-  [ ! -e ${ET_SRC_DIR} ] && mkdir ${ET_SRC_DIR}
-  
-  mv -v ${ZIP_FILE} ${ET_DIST_DIR}
-fi
+mv -v ${ZIP_FILE} ${ET_DIST_DIR}
 
 CWD_DIR=$(pwd)
 
diff --git a/tests/test-yaac.sh b/tests/test-yaac.sh
new file mode 100755
index 0000000..3e23ee3
--- /dev/null
+++ b/tests/test-yaac.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Author   : Gaston Gonzalez
+# Date     : 7 November 2024
+# Purpose  : Test YAAC installation
+
+[ -e /opt/yaac/YAAC.jar ]
+exit $?