diff --git a/swh/indexer/__init__.py b/swh/indexer/__init__.py
index 8020958..eafbb92 100644
--- a/swh/indexer/__init__.py
+++ b/swh/indexer/__init__.py
@@ -1,31 +1,31 @@
 # Copyright (C) 2016-2018  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 
 INDEXER_CLASSES = {
-    'mimetype': 'swh.indexer.mimetype.ContentMimetypeIndexer',
-    'language': 'swh.indexer.language.ContentLanguageIndexer',
-    'ctags': 'swh.indexer.ctags.CtagsIndexer',
-    'fossology_license':
+    'indexer_mimetype': 'swh.indexer.mimetype.ContentMimetypeIndexer',
+    'indexer_language': 'swh.indexer.language.ContentLanguageIndexer',
+    'indexer_ctags': 'swh.indexer.ctags.CtagsIndexer',
+    'indexer_fossology_license':
     'swh.indexer.fossology_license.ContentFossologyLicenseIndexer',
 }
 
 
 TASK_NAMES = {
-    'orchestrator_all': 'swh.indexer.tasks.OrchestratorAllContents',
-    'orchestrator_text': 'swh.indexer.tasks.OrchestratorTextContents',
-    'mimetype': 'swh.indexer.tasks.ContentMimetype',
-    'language': 'swh.indexer.tasks.ContentLanguage',
-    'ctags': 'swh.indexer.tasks.Ctags',
-    'fossology_license': 'swh.indexer.tasks.ContentFossologyLicense',
-    'rehash': 'swh.indexer.tasks.RecomputeChecksums',
-    'revision_metadata': 'swh.indexer.tasks.RevisionMetadata',
-    'origin_intrinsic_metadata': 'swh.indexer.tasks.OriginMetadata',
+    'indexer_orchestrator_all': 'swh.indexer.tasks.OrchestratorAllContents',
+    'indexer_orchestrator_text': 'swh.indexer.tasks.OrchestratorTextContents',
+    'indexer_mimetype': 'swh.indexer.tasks.ContentMimetype',
+    'indexer_language': 'swh.indexer.tasks.ContentLanguage',
+    'indexer_ctags': 'swh.indexer.tasks.Ctags',
+    'indexer_fossology_license': 'swh.indexer.tasks.ContentFossologyLicense',
+    'indexer_rehash': 'swh.indexer.tasks.RecomputeChecksums',
+    'indexer_revision_metadata': 'swh.indexer.tasks.RevisionMetadata',
+    'indexer_origin_intrinsic_metadata': 'swh.indexer.tasks.OriginMetadata',
 }
 
 
 __all__ = [
     'INDEXER_CLASSES', 'TASK_NAMES',
 ]