diff --git a/swh/indexer/cli.py b/swh/indexer/cli.py
--- a/swh/indexer/cli.py
+++ b/swh/indexer/cli.py
@@ -270,7 +270,7 @@
         brokers=brokers,
         prefix=prefix,
         group_id=group_id,
-        object_types=["origin_visit"],
+        object_types=["origin_visit_status"],
         stop_after_objects=stop_after_objects,
     )
 
diff --git a/swh/indexer/journal_client.py b/swh/indexer/journal_client.py
--- a/swh/indexer/journal_client.py
+++ b/swh/indexer/journal_client.py
@@ -14,8 +14,8 @@
 def process_journal_objects(messages, *, scheduler, task_names):
     """Worker function for `JournalClient.process(worker_fn)`, after
     currification of `scheduler` and `task_names`."""
-    assert set(messages) == {"origin_visit"}, set(messages)
-    process_origin_visits(messages["origin_visit"], scheduler, task_names)
+    assert set(messages) == {"origin_visit_status"}, set(messages)
+    process_origin_visits(messages["origin_visit_status"], scheduler, task_names)
 
 
 def process_origin_visits(visits, scheduler, task_names):
diff --git a/swh/indexer/tests/test_cli.py b/swh/indexer/tests/test_cli.py
--- a/swh/indexer/tests/test_cli.py
+++ b/swh/indexer/tests/test_cli.py
@@ -354,7 +354,7 @@
 
     STATUS = {"status": "full", "origin": {"url": "file://dev/0000",}}
     producer.produce(
-        topic=kafka_prefix + ".origin_visit",
+        topic=f"{kafka_prefix}.origin_visit_status",
         key=b"bogus",
         value=value_to_kafka(STATUS),
     )
diff --git a/swh/indexer/tests/test_journal_client.py b/swh/indexer/tests/test_journal_client.py
--- a/swh/indexer/tests/test_journal_client.py
+++ b/swh/indexer/tests/test_journal_client.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 The Software Heritage developers
+# Copyright (C) 2019-2020 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
@@ -10,10 +10,10 @@
 
 
 class JournalClientTest(unittest.TestCase):
-    def testOneOriginVisit(self):
+    def test_one_origin_visit_status(self):
         mock_scheduler = Mock()
         messages = {
-            "origin_visit": [{"status": "full", "origin": "file:///dev/zero",},]
+            "origin_visit_status": [{"status": "full", "origin": "file:///dev/zero",},]
         }
         process_journal_objects(
             messages,
@@ -39,10 +39,10 @@
             ),
         )
 
-    def testOriginVisitLegacy(self):
+    def test_origin_visit_legacy(self):
         mock_scheduler = Mock()
         messages = {
-            "origin_visit": [
+            "origin_visit_status": [
                 {"status": "full", "origin": {"url": "file:///dev/zero",}},
             ]
         }
@@ -70,10 +70,10 @@
             ),
         )
 
-    def testOneOriginVisitBatch(self):
+    def test_one_origin_visit_batch(self):
         mock_scheduler = Mock()
         messages = {
-            "origin_visit": [
+            "origin_visit_status": [
                 {"status": "full", "origin": "file:///dev/zero",},
                 {"status": "full", "origin": "file:///tmp/foobar",},
             ]
@@ -106,10 +106,10 @@
         )
 
     @patch("swh.indexer.journal_client.MAX_ORIGINS_PER_TASK", 2)
-    def testOriginVisitBatches(self):
+    def test_origin_visit_batches(self):
         mock_scheduler = Mock()
         messages = {
-            "origin_visit": [
+            "origin_visit_status": [
                 {"status": "full", "origin": "file:///dev/zero",},
                 {"status": "full", "origin": "file:///tmp/foobar",},
                 {"status": "full", "origin": "file:///tmp/spamegg",},