--- a/make-rules/prep-git.mk	Tue May 26 16:02:42 2015 -0500
+++ b/make-rules/prep-git.mk	Tue May 26 22:07:16 2015 -0500
@@ -34,7 +34,7 @@
 ifdef GIT_REPO$(1)
 ifdef GIT_COMMIT_ID$(1)
 
-COMPONENT_SRC$(1) = $(COMPONENT_NAME)-$(COMPONENT_VERSION)-$$(GIT_COMMIT_ID$(1))
+COMPONENT_SRC$(1) = $$(COMPONENT_NAME$(1))-$$(GIT_COMMIT_ID$(1))
 COMPONENT_ARCHIVE$(1) = $$(COMPONENT_SRC$(1)).tar.gz
 
 CLEAN_PATHS += $$(COMPONENT_SRC$(1))

--- a/make-rules/prep-hg.mk	Tue May 26 16:02:42 2015 -0500
+++ b/make-rules/prep-hg.mk	Tue May 26 22:07:16 2015 -0500
@@ -34,7 +34,7 @@
 ifdef HG_REPO$(1)
 ifdef HG_REV$(1)
 
-COMPONENT_SRC$(1) = $(COMPONENT_NAME)-$(COMPONENT_VERSION)-$$(HG_REV$(1))
+COMPONENT_SRC$(1) = $$(COMPONENT_NAME$(1))-$(COMPONENT_VERSION)-$$(HG_REV$(1))
 COMPONENT_ARCHIVE$(1) = $$(COMPONENT_SRC$(1)).tar.bz2
 
 CLEAN_PATHS += $$(COMPONENT_SRC$(1))

--- a/make-rules/prep-svn.mk	Tue May 26 16:02:42 2015 -0500
+++ b/make-rules/prep-svn.mk	Tue May 26 22:07:16 2015 -0500
@@ -34,7 +34,7 @@
 ifdef SVN_REPO$(1)
 ifdef SVN_REV$(1)
 
-COMPONENT_SRC$(1) = $(COMPONENT_NAME)-$(COMPONENT_VERSION)-$$(SVN_REV$(1))
+COMPONENT_SRC$(1) = $$(COMPONENT_NAME$(1))-$$(SVN_REV$(1))
 COMPONENT_ARCHIVE$(1) = $$(COMPONENT_SRC$(1)).tar.bz2
 
 CLEAN_PATHS += $$(COMPONENT_SRC$(1))