diff --git a/btv b/btv
index 5646eff..206c75c 100755
--- a/btv
+++ b/btv
@@ -199,9 +199,9 @@ def serialize(snap, outdir, key, snap_from=None):
 	## prepare directories
 	##
 	if snap_from:
-		name = "%s diff from %s" %(snap.name, snap_from.name)
+		name = "%s to %s" %(snap_from.name, snap.name)
 	else:
-		name = "%s full" %(snap.name)
+		name = snap.name
 	
 	directory = os.path.join(outdir, name)
 	os.makedirs(directory)
@@ -252,8 +252,9 @@ def serialize(snap, outdir, key, snap_from=None):
 		f.write("#! /bin/sh\n\nsha512sum --check manifest.sha512\n")
 		os.chmod(f.name, 0o500)
 	
-	shutil.copy("/usr/share/btv/unpack.sh", "unpack.sh")
-	os.chmod("unpack.sh", 0o500)
+	unpack_path = os.path.join(directory, "unpack.sh")
+	shutil.copy("/usr/share/btv/unpack.sh", unpack_path)
+	os.chmod(unpack_path, 0o500)
 	
 	## fix permissions and ownership of created objects
 	outdir_stat = os.stat(outdir)