diff --git a/scripts/ci/debsrcbuilder.sh b/scripts/ci/debsrcbuilder.sh
index ee83b6325b..63e3a3db97 100755
--- a/scripts/ci/debsrcbuilder.sh
+++ b/scripts/ci/debsrcbuilder.sh
@@ -24,22 +24,23 @@ input_distro=$3
 distro=${input_distro:="unstable"}
 
 dst_version="$major.$minor.$micro"
-dst_name="freeswitch-$dst_version"
+dst_name="freeswitch-${dst_version}"
 dst_parent="/tmp/"
-dst_dir="/tmp/$dst_name"
-dst_full_version="$dst_version.$build"
-dst_full_name="freeswitch-$dst_full_version"
+dst_dir="/tmp/${dst_name}"
+dst_full_version="${dst_version}.${build}"
+dst_full_name="freeswitch-${dst_full_version}"
 
 mkdir -p $src_repo/debbuild/
 
-tar xjf src_dist/$dst_name.tar.bz2 -C $src_repo/debbuild/
-mv $src_repo/debbuild/$dst_name $src_repo/debbuild/$dst_full_name
-mv src_dist/$dst_name.tar.bz2 $src_repo/debbuild/freeswitch_${dst_full_version}.orig.tar.bz2
+tar xjf src_dist/${dst_name}.tar.bz2 -C ${src_repo}/debbuild/
+mv ${src_repo}/debbuild/${dst_name} ${src_repo}/debbuild/${dst_full_name}
+mv src_dist/${dst_name}.tar.bz2 \
+  ${src_repo}/debbuild/freeswitch_${dst_full_version}.orig.tar.bz2
 
 # Build the debian source package first, from the source tar file.
-echo "changing directory to $src_repo/debbuild/$dst_full_name"
+echo "changing directory to ${src_repo}/debbuild/${dst_full_name}"
 
-cd $src_repo/debbuild/$dst_full_name
+cd ${src_repo}/debbuild/${dst_full_name}
 
 dch -v "${dst_full_version}-1" -M --force-distribution -D "$distro" "Nightly Build"
 
@@ -52,8 +53,8 @@ if [ $status -gt 0 ]; then
 else
   cat 1>&2 <<EOF
 ----------------------------------------------------------------------
-The v$ver-$build DEB-SRCs have been rolled, now we
-just need to push them to the YUM Repo
+The ${dst_full_name} DEB-SRCs have been rolled, now we
+just need to push them to the Debian repo
 ----------------------------------------------------------------------
 EOF
 fi
diff --git a/scripts/ci/src_tarball.sh b/scripts/ci/src_tarball.sh
index 1067f0902d..9dd755fae4 100755
--- a/scripts/ci/src_tarball.sh
+++ b/scripts/ci/src_tarball.sh
@@ -61,20 +61,20 @@ cd $dst_parent
 
 ls
 
-tar -cvf $dst_name.tar $dst_name
+tar -cvf ${dst_name}.tar $dst_name
 
-# gzip -9 -c $dst_name.tar > $dst_name.tar.gz || echo "gzip not available"
-bzip2 -z -k $dst_name.tar || echo "bzip2 not available"
-# xz -z -9 -k $dst_name.tar || echo "xz / xz-utils not available"
+# gzip -9 -c ${dst_name}.tar > $dst_name.tar.gz || echo "gzip not available"
+bzip2 -z -k ${dst_name}.tar || echo "bzip2 not available"
+# xz -z -9 -k ${dst_name}.tar || echo "xz / xz-utils not available"
 
-rm -rf $dst_name.tar $dst_dir
+rm -rf ${dst_name}.tar $dst_dir
 
-mkdir -p $src_repo/src_dist
-mv -f $dst_name.tar.* $src_repo/src_dist
+mkdir -p ${src_repo}/src_dist
+mv -f ${dst_name}.tar.* ${src_repo}/src_dist
 
 cat 1>&2 <<EOF
 ----------------------------------------------------------------------
-The v$ver-$build tarballs have been rolled,
+The freeswitch-${ver}.${build} tarballs have been rolled,
 now we just need to roll packages with them
 ----------------------------------------------------------------------
 EOF