diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb
index 81f504584e4bbc1958b0beb5ae5ed6588ad06dac..99fa70a6ec1266785535c454fbe5bfdcd8219c1b 100644
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -3,7 +3,7 @@ module Gitlab
     extend self
 
     def export_path(relative_path:)
-      File.join(storage_path, relative_path, "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_gitlab_export")
+      File.join(storage_path, relative_path)
     end
 
     def project_atts
@@ -18,8 +18,6 @@ module Gitlab
       Gitlab::ImportExport::ImportExportReader.project_tree
     end
 
-    private
-
     def storage_path
       File.join(Settings.shared['path'], 'tmp/project_exports')
     end
diff --git a/lib/gitlab/import_export/saver.rb b/lib/gitlab/import_export/saver.rb
index f26804d240289e974e79142b6d91dcfa013d7c85..f87e0fdc7ea20a628220d7fcf5b62a42a5ead753 100644
--- a/lib/gitlab/import_export/saver.rb
+++ b/lib/gitlab/import_export/saver.rb
@@ -31,7 +31,7 @@ module Gitlab
       end
 
       def archive_file
-        @archive_file ||= File.join(@storage_path, '..', 'project.tar.gz')
+        @archive_file ||= File.join(@storage_path, '..', "#{Time.now.strftime('%Y-%m-%d_%H-%M-%3N')}_project_export.tar.gz")
       end
     end
   end
diff --git a/lib/gitlab/sidekiq_middleware/memory_killer.rb b/lib/gitlab/sidekiq_middleware/memory_killer.rb
index 372327433252885eeaf3beeb542aaa6d4580fd60..ae85b294d31526c1304259980ae583755d275655 100644
--- a/lib/gitlab/sidekiq_middleware/memory_killer.rb
+++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb
@@ -29,8 +29,8 @@ module Gitlab
             "in #{GRACE_TIME} seconds"
           sleep(GRACE_TIME)
 
-          Sidekiq.logger.warn "sending SIGUSR1 to PID #{Process.pid}"
-          Process.kill('SIGUSR1', Process.pid)
+          Sidekiq.logger.warn "sending SIGTERM to PID #{Process.pid}"
+          Process.kill('SIGTERM', Process.pid)
 
           Sidekiq.logger.warn "waiting #{SHUTDOWN_WAIT} seconds before sending "\
             "#{SHUTDOWN_SIGNAL} to PID #{Process.pid}"