diff --git a/app/models/repository.rb b/app/models/repository.rb
index cf8ba4530a1..6bfdf2255f2 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -151,12 +151,12 @@ class Repository
     return nil unless commit
 
     # Build file path
-    file_name = self.path + "-" + commit.id.to_s + ".tar.gz"
-    storage_path = Rails.root.join("tmp", "repositories", self.path_with_namespace)
+    file_name = self.path_with_namespace + "-" + commit.id.to_s + ".tar.gz"
+    storage_path = Rails.root.join("tmp", "repositories")
     file_path = File.join(storage_path, file_name)
 
     # Put files into a directory before archiving
-    prefix = self.path + "/"
+    prefix = self.path_with_namespace + "/"
 
     # Create file if not exists
     unless File.exists?(file_path)