diff --git a/app/services/projects/import_export/repo_bundler.rb b/app/services/projects/import_export/repo_bundler.rb
index b0b2df1c14cd46eb4051a8632e36f3d5ef7b60c3..d43fb4ea09e64852f567c6ef23d0fab96d88c342 100644
--- a/app/services/projects/import_export/repo_bundler.rb
+++ b/app/services/projects/import_export/repo_bundler.rb
@@ -27,7 +27,7 @@ module Projects
       end
 
       def project_filename
-        "#{@project.namespace}#{@project.name}.bundle"
+        "#{@project.name}.bundle"
       end
 
       def path_to_repo
diff --git a/app/services/projects/import_export/wiki_repo_bundler.rb b/app/services/projects/import_export/wiki_repo_bundler.rb
index 793c8efd142e5d4d29300380f621ed15f9aee7b4..bf69936503d1bfa39ad9f062e3480036a0b66626 100644
--- a/app/services/projects/import_export/wiki_repo_bundler.rb
+++ b/app/services/projects/import_export/wiki_repo_bundler.rb
@@ -18,6 +18,10 @@ module Projects
 
       private
 
+      def project_filename
+        "#{@project.name}.wiki.bundle"
+      end
+
       def path_to_repo
         @wiki.repository.path_to_repo
       end
diff --git a/spec/services/projects/import_export/wiki_repo_bundler_spec.rb b/spec/services/projects/import_export/wiki_repo_bundler_spec.rb
index 351419d061902044701e4cd330250194d7aafa98..a589f81c5f9f4611005c619f6fac1211eee038fd 100644
--- a/spec/services/projects/import_export/wiki_repo_bundler_spec.rb
+++ b/spec/services/projects/import_export/wiki_repo_bundler_spec.rb
@@ -8,10 +8,13 @@ describe Projects::ImportExport::WikiRepoBundler, services: true do
     let(:export_path) { "#{Dir::tmpdir}/project_tree_saver_spec" }
     let(:shared) { Projects::ImportExport::Shared.new(relative_path: project.path_with_namespace) }
     let(:wiki_bundler) { Projects::ImportExport::WikiRepoBundler.new(project: project, shared: shared) }
+    let!(:project_wiki) { ProjectWiki.new(project, user) }
 
     before(:each) do
       project.team << [user, :master]
       allow_any_instance_of(Projects::ImportExport).to receive(:storage_path).and_return(export_path)
+      project_wiki.wiki
+      project_wiki.create_page("index", "test content")
     end
 
     after(:each) do