diff --git a/Makefile b/Makefile
index a3b2bf0eb..0ea19a48a 100644
--- a/Makefile
+++ b/Makefile
@@ -221,14 +221,14 @@ dist: config.mk
 	make distclean
 	mv config.status.old config.status
 	mv config.sh.old config.sh
-	rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
-	mkdir -p $(NAME)-$(VERSION)/test
-	cp -a $(DISTFILES) $(NAME)-$(VERSION)
-	cp -a $(DISTFILES_TEST) $(NAME)-$(VERSION)/test
-	rm -rf $(NAME)-$(VERSION)/src/tools
-	find $(NAME)-$(VERSION) -name .svn -delete
-	tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION)
-	rm -fr $(NAME)-$(VERSION)
+	rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz
+	mkdir -p $(TARNAME)-$(VERSION)/test
+	cp -a $(DISTFILES) $(TARNAME)-$(VERSION)
+	cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test
+	rm -rf $(TARNAME)-$(VERSION)/src/tools
+	find $(TARNAME)-$(VERSION) -name .svn -delete
+	tar -cJvf $(TARNAME)-$(VERSION).tar.xz $(TARNAME)-$(VERSION)
+	rm -fr $(TARNAME)-$(VERSION)
 
 asc: config.mk
 	./mkasc.sh $(VERSION)
@@ -240,11 +240,11 @@ deb-apparmor: dist config.sh
 	./mkdeb.sh -apparmor --enable-apparmor
 
 test-compile: dist config.mk
-	cd test/compile; ./compile.sh $(NAME)-$(VERSION)
+	cd test/compile; ./compile.sh $(TARNAME)-$(VERSION)
 
 .PHONY: rpms
 rpms: src/man config.mk
-	./platform/rpm/mkrpm.sh $(NAME) $(VERSION)
+	./platform/rpm/mkrpm.sh $(TARNAME) $(VERSION)
 
 extras: all
 	$(MAKE) -C extras/firetools
diff --git a/mkdeb.sh b/mkdeb.sh
index a98261ba6..5f65e80b2 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -14,8 +14,8 @@ EXTRA_VERSION=$1
 
 test "$#" -gt 0 && shift
 
-CODE_ARCHIVE="$NAME-$VERSION.tar.xz"
-CODE_DIR="$NAME-$VERSION"
+CODE_ARCHIVE="$TARNAME-$VERSION.tar.xz"
+CODE_DIR="$TARNAME-$VERSION"
 INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian"
 DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN"