diff --git a/swh/indexer/__init__.py b/swh/indexer/__init__.py
index 8ea5175..a5f3dfd 100644
--- a/swh/indexer/__init__.py
+++ b/swh/indexer/__init__.py
@@ -1,29 +1,29 @@
-# Copyright (C) 2016  The Software Heritage developers
+# Copyright (C) 2016-2017  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':
     'swh.indexer.fossology_license.ContentFossologyLicenseIndexer',
 }
 
 
 TASK_NAMES = {
     'orchestrator_all': 'swh.indexer.tasks.SWHOrchestratorAllContentsTask',
     'orchestrator_text': 'swh.indexer.tasks.SWHOrchestratorTextContentsTask',
     'mimetype': 'swh.indexer.tasks.SWHContentMimetypeTask',
     'language': 'swh.indexer.tasks.SWHContentLanguageTask',
     'ctags': 'swh.indexer.tasks.SWHCtagsTask',
     'fossology_license': 'swh.indexer.tasks.SWHContentFossologyLicenseTask',
-    'rehash': 'swh.indexer.tasks.SWHRecomputeChecksums',
+    'rehash': 'swh.indexer.tasks.SWHRecomputeChecksumsTask',
 }
 
 
 __all__ = [
     'INDEXER_CLASSES', 'TASK_NAMES',
 ]
diff --git a/swh/indexer/tasks.py b/swh/indexer/tasks.py
index 4fb52c0..68f3e6a 100644
--- a/swh/indexer/tasks.py
+++ b/swh/indexer/tasks.py
@@ -1,90 +1,90 @@
 # Copyright (C) 2016-2017  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
 
 import logging
 
 from swh.scheduler.task import Task
 
 from .orchestrator import OrchestratorAllContentsIndexer
 from .orchestrator import OrchestratorTextContentsIndexer
 from .mimetype import ContentMimetypeIndexer
 from .language import ContentLanguageIndexer
 from .ctags import CtagsIndexer
 from .fossology_license import ContentFossologyLicenseIndexer
 from .rehash import RecomputeChecksums
 
 logging.basicConfig(level=logging.INFO)
 
 
 class SWHOrchestratorAllContentsTask(Task):
     """Main task in charge of reading batch contents (of any type) and
     broadcasting them back to other tasks.
 
     """
     task_queue = 'swh_indexer_orchestrator_content_all'
 
     def run(self, *args, **kwargs):
         OrchestratorAllContentsIndexer().run(*args, **kwargs)
 
 
 class SWHOrchestratorTextContentsTask(Task):
     """Main task in charge of reading batch contents (of type text) and
     broadcasting them back to other tasks.
 
     """
     task_queue = 'swh_indexer_orchestrator_content_text'
 
     def run(self, *args, **kwargs):
         OrchestratorTextContentsIndexer().run(*args, **kwargs)
 
 
 class SWHContentMimetypeTask(Task):
     """Task which computes the mimetype, encoding from the sha1's content.
 
     """
     task_queue = 'swh_indexer_content_mimetype'
 
     def run(self, *args, **kwargs):
         ContentMimetypeIndexer().run(*args, **kwargs)
 
 
 class SWHContentLanguageTask(Task):
     """Task which computes the language from the sha1's content.
 
     """
     task_queue = 'swh_indexer_content_language'
 
     def run(self, *args, **kwargs):
         ContentLanguageIndexer().run(*args, **kwargs)
 
 
 class SWHCtagsTask(Task):
     """Task which computes ctags from the sha1's content.
 
     """
     task_queue = 'swh_indexer_content_ctags'
 
     def run(self, *args, **kwargs):
         CtagsIndexer().run(*args, **kwargs)
 
 
 class SWHContentFossologyLicenseTask(Task):
     """Task which computes licenses from the sha1's content.
 
     """
     task_queue = 'swh_indexer_content_fossology_license'
 
     def run(self, *args, **kwargs):
         ContentFossologyLicenseIndexer().run(*args, **kwargs)
 
 
-class SWHRecomputeChecksums(Task):
+class SWHRecomputeChecksumsTask(Task):
     """Task which recomputes hashes and possibly new ones.
 
     """
     task_queue = 'swh_indexer_content_rehash'
 
     def run(self, *args, **kwargs):
         RecomputeChecksums().run(*args, **kwargs)