diff --git a/app/models/project.rb b/app/models/project.rb
index 617dbf9a925127dea5756c7be3ad9efc5a6b1d2d..4cffb1b7dc1476492a673cef37710c047ea52efe 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -350,8 +350,8 @@ class Project < ActiveRecord::Base
     end
 
     # Deletes gitlab project export files older than 24 hours
-    def archive_gitlab_exports!
-      Gitlab::Popen.popen(%W(find #{export_path} -not -path #{export_path} -mmin +1440 -delete))
+    def remove_gitlab_exports!
+      Gitlab::Popen.popen(%W(find #{Gitlab::ImportExport.storage_path} -not -path #{Gitlab::ImportExport.storage_path} -mmin +1440 -delete))
     end
   end
 
@@ -1111,6 +1111,6 @@ class Project < ActiveRecord::Base
   end
 
   def export_path
-    File.join(ImportExport.storage_path, path_with_namespace)
+    File.join(Gitlab::ImportExport.storage_path, path_with_namespace)
   end
 end
diff --git a/app/workers/gitlab_project_archive_worker.rb b/app/workers/gitlab_remove_project_export_worker.rb
similarity index 54%
rename from app/workers/gitlab_project_archive_worker.rb
rename to app/workers/gitlab_remove_project_export_worker.rb
index 63e7086d41a99dabb0b9ea2b20beebebca996c5b..1d91897d52039b91b54e48e541d8914578409110 100644
--- a/app/workers/gitlab_project_archive_worker.rb
+++ b/app/workers/gitlab_remove_project_export_worker.rb
@@ -1,9 +1,9 @@
-class GitlabProjectArchiveWorker
+class GitlabRemoveProjectExportWorker
   include Sidekiq::Worker
 
   sidekiq_options queue: :default
 
   def perform
-    Project.archive_gitlab_exports!
+    Project.remove_gitlab_exports!
   end
 end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 64cfc0f5357dec62f9d938804ccb137bfb631e7e..7a9aa632fcf01be3ef7f0e7da8207da735fdd300 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -288,9 +288,9 @@ Settings.cron_jobs['admin_email_worker']['job_class'] = 'AdminEmailWorker'
 Settings.cron_jobs['repository_archive_cache_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['repository_archive_cache_worker']['cron'] ||= '0 * * * *'
 Settings.cron_jobs['repository_archive_cache_worker']['job_class'] = 'RepositoryArchiveCacheWorker'
-Settings.cron_jobs['gitlab_project_archive_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['gitlab_project_archive_worker']['cron'] ||= '0 * * * *'
-Settings.cron_jobs['gitlab_project_archive_worker']['job_class'] = 'GitlabProjectArchiveWorker'
+Settings.cron_jobs['gitlab_remove_project_export_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['gitlab_remove_project_export_worker']['cron'] ||= '0 * * * *'
+Settings.cron_jobs['gitlab_remove_project_export_worker']['job_class'] = 'GitlabRemoveProjectExportWorker'
 
 #
 # GitLab Shell