diff --git a/src/script/nix-prefetch-bzr b/src/script/nix-prefetch-bzr
index 574703d4..baff9266 100755
--- a/src/script/nix-prefetch-bzr
+++ b/src/script/nix-prefetch-bzr
@@ -26,8 +26,7 @@ repoName=$(echo $url | sed '
   s,.*/\([^/]\+\)/tags/\([^/]\+\)/*$,\1-\2,;t
   s,.*/\([^/]\+\)/*$,\1,;t
 ')
-dstFile=$repoName-r$rev
-test -n "$rev" || dstFile=$repoName
+dstFile=source
 
 # If the hash was given, a file with that hash may already be in the
 # store.
diff --git a/src/script/nix-prefetch-git b/src/script/nix-prefetch-git
index 2c1d9891..0846c7ec 100755
--- a/src/script/nix-prefetch-git
+++ b/src/script/nix-prefetch-git
@@ -226,7 +226,7 @@ else
   # If the hash was given, a file with that hash may already be in the
   # store.
   if test -n "$expHash"; then
-      finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export)
+      finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" source)
       if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
           finalPath=
       fi
diff --git a/src/script/nix-prefetch-hg b/src/script/nix-prefetch-hg
index 4d78c68a..adb25537 100755
--- a/src/script/nix-prefetch-hg
+++ b/src/script/nix-prefetch-hg
@@ -23,7 +23,7 @@ test -n "$rev" || rev="tip"
 # If the hash was given, a file with that hash may already be in the
 # store.
 if test -n "$expHash"; then
-    finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" hg-archive)
+    finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" source)
     if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
         finalPath=
     fi