diff --git a/docs/dev-info.rst b/docs/dev-info.rst
--- a/docs/dev-info.rst
+++ b/docs/dev-info.rst
@@ -72,7 +72,7 @@
   	    slicing: 0:1/1:5
   	    root: /home/storage/swh-storage/
 
-  	destination_queue: swh.indexer.tasks.SWHOrchestratorTextContentsTask
+  	destination_task: swh.indexer.tasks.SWHOrchestratorTextContentsTask
   	rescheduling_task: swh.indexer.tasks.SWHContentMimetypeTask
 
 
diff --git a/swh/indexer/mimetype.py b/swh/indexer/mimetype.py
--- a/swh/indexer/mimetype.py
+++ b/swh/indexer/mimetype.py
@@ -40,7 +40,7 @@
 
     """
     ADDITIONAL_CONFIG = {
-        'destination_queue': ('str', None),
+        'destination_task': ('str', None),
         'tools': ('dict', {
             'name': 'file',
             'version': '1:5.30-1+deb9u1',
@@ -55,11 +55,11 @@
 
     def prepare(self):
         super().prepare()
-        destination_queue = self.config.get('destination_queue')
-        if destination_queue:
-            self.task_destination = utils.get_task(destination_queue)
+        destination_task = self.config.get('destination_task')
+        if destination_task:
+            self.destination_task = utils.get_task(destination_task)
         else:
-            self.task_destination = None
+            self.destination_task = None
         self.tool = self.tools[0]
 
     def filter(self, ids):
@@ -141,8 +141,8 @@
               - encoding (bytes): encoding in bytes
 
         """
-        if self.task_destination:
-            self.task_destination.delay(list(self._filter_text(results)))
+        if self.destination_task:
+            self.destination_task.delay(list(self._filter_text(results)))
 
 
 @click.command()
diff --git a/swh/indexer/tests/test_language.py b/swh/indexer/tests/test_language.py
--- a/swh/indexer/tests/test_language.py
+++ b/swh/indexer/tests/test_language.py
@@ -30,7 +30,7 @@
     """
     def prepare(self):
         self.config = {
-            'destination_queue': None,
+            'destination_task': None,
             'rescheduling_task': None,
             'tools':  {
                 'name': 'pygments',
@@ -45,7 +45,7 @@
         self.idx_storage = _MockIndexerStorage()
         self.log = logging.getLogger('swh.indexer')
         self.objstorage = MockObjStorage()
-        self.task_destination = None
+        self.destination_task = None
         self.rescheduling_task = self.config['rescheduling_task']
         self.tool_config = self.config['tools']['configuration']
         self.max_content_size = self.tool_config['max_content_size']
diff --git a/swh/indexer/tests/test_metadata.py b/swh/indexer/tests/test_metadata.py
--- a/swh/indexer/tests/test_metadata.py
+++ b/swh/indexer/tests/test_metadata.py
@@ -27,7 +27,7 @@
         self.idx_storage = MockIndexerStorage()
         self.log = logging.getLogger('swh.indexer')
         self.objstorage = MockObjStorage()
-        self.task_destination = None
+        self.destination_task = None
         self.rescheduling_task = self.config['rescheduling_task']
         self.tools = self.register_tools(self.config['tools'])
         self.tool = self.tools[0]
@@ -63,7 +63,7 @@
         self.idx_storage = MockIndexerStorage()
         self.log = logging.getLogger('swh.indexer')
         self.objstorage = MockObjStorage()
-        self.task_destination = None
+        self.destination_task = None
         self.rescheduling_task = self.config['rescheduling_task']
         self.tools = self.register_tools(self.config['tools'])
         self.tool = self.tools[0]
diff --git a/swh/indexer/tests/test_mimetype.py b/swh/indexer/tests/test_mimetype.py
--- a/swh/indexer/tests/test_mimetype.py
+++ b/swh/indexer/tests/test_mimetype.py
@@ -33,7 +33,7 @@
     """
     def prepare(self):
         self.config = {
-            'destination_queue': None,
+            'destination_task': None,
             'rescheduling_task': None,
             'tools': {
                 'name': 'file',
@@ -47,9 +47,9 @@
         self.idx_storage = _MockIndexerStorage()
         self.log = logging.getLogger('swh.indexer')
         self.objstorage = MockObjStorage()
-        self.task_destination = None
+        self.destination_task = None
         self.rescheduling_task = self.config['rescheduling_task']
-        self.destination_queue = self.config['destination_queue']
+        self.destination_task = self.config['destination_task']
         self.tools = self.register_tools(self.config['tools'])
         self.tool = self.tools[0]