diff --git a/tailbone/views/batch/core.py b/tailbone/views/batch/core.py
index 681aa51a..570da23f 100644
--- a/tailbone/views/batch/core.py
+++ b/tailbone/views/batch/core.py
@@ -706,7 +706,7 @@ class BatchMasterView(MasterView):
             return self.handler.get_execute_title(batch)
         return "Execute Batch"
 
-    def handler_action(self, batch, action, **kwargs):
+    def handler_action(self, batch, batch_action, **kwargs):
         """
         View which will attempt to refresh all data for the batch.  What
         exactly this means will depend on the type of batch etc.
@@ -718,11 +718,11 @@ class BatchMasterView(MasterView):
         user_uuid = user.uuid if user else None
         username = user.username if user else None
 
-        key = '{}.{}'.format(self.model_class.__tablename__, action)
+        key = '{}.{}'.format(self.model_class.__tablename__, batch_action)
         progress = SessionProgress(self.request, key)
 
         # must ensure versioning is *disabled* during action, if handler says so
-        allow_versioning = self.handler.allow_versioning(action)
+        allow_versioning = self.handler.allow_versioning(batch_action)
         if not allow_versioning and self.rattail_config.versioning_enabled():
             can_cancel = False
 
@@ -738,21 +738,21 @@ class BatchMasterView(MasterView):
             thread.start()
 
             # launch thread to invoke handler action
-            thread = Thread(target=self.action_subprocess_thread, args=(batch.uuid, port, username, action, progress))
+            thread = Thread(target=self.action_subprocess_thread, args=(batch.uuid, port, username, batch_action, progress))
             thread.start()
 
         else: # either versioning is disabled, or handler doesn't mind
             can_cancel = True
 
             # launch thread to populate batch; that will update session progress directly
-            target = getattr(self, '{}_thread'.format(action))
+            target = getattr(self, '{}_thread'.format(batch_action))
             thread = Thread(target=target, args=(batch.uuid, user_uuid, progress), kwargs=kwargs)
             thread.start()
 
         return self.render_progress(progress, {
             'can_cancel': can_cancel,
             'cancel_url': self.get_action_url('view', batch),
-            'cancel_msg': "{} of batch was canceled.".format(action.capitalize()),
+            'cancel_msg': "{} of batch was canceled.".format(batch_action.capitalize()),
         })
 
     def progress_thread(self, sock, success_url, progress):