diff --git a/lib/tasks/elasticsearch_batch_op.rake b/lib/tasks/elasticsearch_batch_op.rake
index 4be382367..b9933cf75 100644
--- a/lib/tasks/elasticsearch_batch_op.rake
+++ b/lib/tasks/elasticsearch_batch_op.rake
@@ -1,17 +1,11 @@
 namespace :importer do
-  task :import_all => :environment do
-    Rake::Task["importer:importuser"].execute
-    Rake::Task["importer:importproject"].execute
-    Rake::Task["importer:importcourse"].execute
-    Rake::Task["importer:importattachment"].execute
-    Rake::Task["importer:importmemo"].execute
-  end
+
   task :importuser => :environment do
     ENV['CLASS']='User'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
   task :importproject => :environment do
 
@@ -19,27 +13,30 @@ namespace :importer do
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
   task :importcourse => :environment do
     ENV['CLASS']='Course'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
   task :importattachment => :environment do
     ENV['CLASS']='Attachment'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
   task :importmemo => :environment do
     ENV['CLASS']='Memo'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
+
+  desc "Run all tasks"
+  task :all => [:importuser,:importproject,:importcourse,:importattachment,:importmemo]
 end
\ No newline at end of file