diff --git a/swh/indexer/fossology_license.py b/swh/indexer/fossology_license.py
--- a/swh/indexer/fossology_license.py
+++ b/swh/indexer/fossology_license.py
@@ -50,7 +50,7 @@
 class MixinFossologyLicenseIndexer:
     """Mixin fossology license indexer.
 
-    See :class:`ContentFossologyLicenseIndexer` and
+    See :class:`FossologyLicenseIndexer` and
     :class:`FossologyLicenseRangeIndexer`
 
     """
@@ -138,7 +138,7 @@
             results, conflict_update=(policy_update == 'update-dups'))
 
 
-class ContentFossologyLicenseIndexer(
+class FossologyLicenseIndexer(
         MixinFossologyLicenseIndexer, DiskIndexer, ContentIndexer):
     """Indexer in charge of:
 
diff --git a/swh/indexer/language.py b/swh/indexer/language.py
--- a/swh/indexer/language.py
+++ b/swh/indexer/language.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2017  The Software Heritage developers
+# 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
@@ -107,7 +107,7 @@
     }
 
 
-class ContentLanguageIndexer(ContentIndexer):
+class LanguageIndexer(ContentIndexer):
     """Indexer in charge of:
 
     - filtering out content already indexed
diff --git a/swh/indexer/mimetype.py b/swh/indexer/mimetype.py
--- a/swh/indexer/mimetype.py
+++ b/swh/indexer/mimetype.py
@@ -31,7 +31,7 @@
 class MixinMimetypeIndexer:
     """Mixin mimetype indexer.
 
-    See :class:`ContentMimetypeIndexer` and :class:`MimetypeRangeIndexer`
+    See :class:`MimetypeIndexer` and :class:`MimetypeRangeIndexer`
 
     """
     ADDITIONAL_CONFIG = {
@@ -95,7 +95,7 @@
             results, conflict_update=(policy_update == 'update-dups'))
 
 
-class ContentMimetypeIndexer(MixinMimetypeIndexer, ContentIndexer):
+class MimetypeIndexer(MixinMimetypeIndexer, ContentIndexer):
     """Mimetype Indexer working on list of content identifiers.
 
     It:
@@ -106,11 +106,6 @@
     - computes {mimetype, encoding} from that content
     - stores result in storage
 
-    FIXME:
-
-    1. Rename redundant ContentMimetypeIndexer to MimetypeIndexer
-    2. Do we keep it afterwards? ~> i think this can be used with the journal
-
     """
     def filter(self, ids):
         """Filter out known sha1s and return only missing ones.
diff --git a/swh/indexer/tasks.py b/swh/indexer/tasks.py
--- a/swh/indexer/tasks.py
+++ b/swh/indexer/tasks.py
@@ -7,11 +7,11 @@
 
 from swh.scheduler.task import Task as SchedulerTask
 
-from .mimetype import ContentMimetypeIndexer, MimetypeRangeIndexer
-from .language import ContentLanguageIndexer
+from .mimetype import MimetypeIndexer, MimetypeRangeIndexer
+from .language import LanguageIndexer
 from .ctags import CtagsIndexer
 from .fossology_license import (
-    ContentFossologyLicenseIndexer, FossologyLicenseRangeIndexer
+    FossologyLicenseIndexer, FossologyLicenseRangeIndexer
 )
 from .rehash import RecomputeChecksums
 from .metadata import RevisionMetadataIndexer, OriginMetadataIndexer
@@ -65,7 +65,7 @@
 
     """
     task_queue = 'swh_indexer_content_mimetype'
-    Indexer = ContentMimetypeIndexer
+    Indexer = MimetypeIndexer
 
 
 class ContentRangeMimetype(StatusTask):
@@ -82,7 +82,7 @@
     """
     task_queue = 'swh_indexer_content_language'
 
-    Indexer = ContentLanguageIndexer
+    Indexer = LanguageIndexer
 
 
 class Ctags(Task):
@@ -99,7 +99,7 @@
 
     """
     task_queue = 'swh_indexer_content_fossology_license'
-    Indexer = ContentFossologyLicenseIndexer
+    Indexer = FossologyLicenseIndexer
 
 
 class ContentRangeFossologyLicense(StatusTask):
diff --git a/swh/indexer/tests/test_fossology_license.py b/swh/indexer/tests/test_fossology_license.py
--- a/swh/indexer/tests/test_fossology_license.py
+++ b/swh/indexer/tests/test_fossology_license.py
@@ -9,7 +9,7 @@
 from unittest.mock import patch
 
 from swh.indexer.fossology_license import (
-    ContentFossologyLicenseIndexer, FossologyLicenseRangeIndexer,
+    FossologyLicenseIndexer, FossologyLicenseRangeIndexer,
     compute_license
 )
 
@@ -60,7 +60,7 @@
 
 
 class FossologyLicenseTestIndexer(
-        NoDiskIndexer, InjectLicenseIndexer, ContentFossologyLicenseIndexer):
+        NoDiskIndexer, InjectLicenseIndexer, FossologyLicenseIndexer):
     """Specific fossology license whose configuration is enough to satisfy
        the indexing checks.
 
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
@@ -5,14 +5,14 @@
 
 import unittest
 from swh.indexer import language
-from swh.indexer.language import ContentLanguageIndexer
+from swh.indexer.language import LanguageIndexer
 from swh.indexer.tests.test_utils import (
     BasicMockIndexerStorage, MockObjStorage, CommonContentIndexerTest,
     CommonIndexerWithErrorsTest, CommonIndexerNoTool, BASE_TEST_CONFIG
 )
 
 
-class LanguageTestIndexer(ContentLanguageIndexer):
+class LanguageTestIndexer(LanguageIndexer):
     """Specific language whose configuration is enough to satisfy the
        indexing tests.
     """
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
@@ -37,9 +37,6 @@
     def parse_config_file(self, *args, **kwargs):
         assert False, 'should not be called; the rev indexer configures it.'
 
-    def prepare(self):
-        super().prepare()
-
 
 class RevisionMetadataTestIndexer(RevisionMetadataIndexer):
     """Specific indexer whose configuration is enough to satisfy the
@@ -54,10 +51,6 @@
             'tools': TRANSLATOR_TOOL,
         }
 
-    def prepare(self):
-        super().prepare()
-        self.tools = list(self.register_tools(self.config['tools']))
-
 
 class Metadata(unittest.TestCase):
     """
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
@@ -9,7 +9,7 @@
 from unittest.mock import patch
 
 from swh.indexer.mimetype import (
-    ContentMimetypeIndexer, MimetypeRangeIndexer, compute_mimetype_encoding
+    MimetypeIndexer, MimetypeRangeIndexer, compute_mimetype_encoding
 )
 
 from swh.indexer.tests.test_utils import (
@@ -43,7 +43,7 @@
             })
 
 
-class MimetypeTestIndexer(ContentMimetypeIndexer):
+class MimetypeTestIndexer(MimetypeIndexer):
     """Specific mimetype indexer instance whose configuration is enough to
        satisfy the indexing tests.
 
diff --git a/swh/indexer/tests/test_utils.py b/swh/indexer/tests/test_utils.py
--- a/swh/indexer/tests/test_utils.py
+++ b/swh/indexer/tests/test_utils.py
@@ -241,7 +241,7 @@
     '02fb2c89e14f7fab46701478c83779c7beb7b069': b"""
     import unittest
     import logging
-    from swh.indexer.mimetype import ContentMimetypeIndexer
+    from swh.indexer.mimetype import MimetypeIndexer
     from swh.indexer.tests.test_utils import MockObjStorage
 
     class MockStorage():