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,7 +7,7 @@
 
 from swh.scheduler.task import Task as SchedulerTask
 
-from .mimetype import ContentMimetypeIndexer, MimetypeRangeIndexer
+from .mimetype import MimetypeIndexer, MimetypeRangeIndexer
 from .language import ContentLanguageIndexer
 from .ctags import CtagsIndexer
 from .fossology_license import (
@@ -65,7 +65,7 @@
 
     """
     task_queue = 'swh_indexer_content_mimetype'
-    Indexer = ContentMimetypeIndexer
+    Indexer = MimetypeIndexer
 
 
 class ContentRangeMimetype(StatusTask):
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():