diff --git a/swh/indexer/cli.py b/swh/indexer/cli.py
--- a/swh/indexer/cli.py
+++ b/swh/indexer/cli.py
@@ -217,10 +217,10 @@
     "indexer",
     type=click.Choice(
         [
-            "origin-intrinsic-metadata",
-            "extrinsic-metadata",
-            "content-mimetype",
-            "content-fossology-license",
+            "origin_intrinsic_metadata",
+            "extrinsic_metadata",
+            "content_mimetype",
+            "content_fossology_license",
             "*",
         ]
     ),
@@ -263,7 +263,7 @@
 
     * runs the indexer with the name passed as argument, if any
     * schedules tasks to run relevant indexers (currently, only
-      origin-intrinsic-metadata) on these new objects otherwise.
+      origin_intrinsic_metadata) on these new objects otherwise.
 
     Passing '*' as indexer name runs all indexers.
     """
@@ -313,7 +313,7 @@
 
     idx: Optional[BaseIndexer] = None
 
-    if indexer in ("origin-intrinsic-metadata", "*"):
+    if indexer in ("origin_intrinsic_metadata", "*"):
         from swh.indexer.metadata import OriginMetadataIndexer
 
         object_types.add("origin_visit_status")
@@ -321,7 +321,7 @@
         idx.catch_exceptions = False  # don't commit offsets if indexation failed
         worker_fns.append(idx.process_journal_objects)
 
-    if indexer in ("extrinsic-metadata", "*"):
+    if indexer in ("extrinsic_metadata", "*"):
         from swh.indexer.metadata import ExtrinsicMetadataIndexer
 
         object_types.add("raw_extrinsic_metadata")
@@ -329,7 +329,7 @@
         idx.catch_exceptions = False  # don't commit offsets if indexation failed
         worker_fns.append(idx.process_journal_objects)
 
-    if indexer in ("content-mimetype", "*"):
+    if indexer in ("content_mimetype", "*"):
         from swh.indexer.mimetype import MimetypeIndexer
 
         object_types.add("content")
@@ -337,7 +337,7 @@
         idx.catch_exceptions = False  # don't commit offsets if indexation failed
         worker_fns.append(idx.process_journal_objects)
 
-    if indexer in ("content-fossology-license", "*"):
+    if indexer in ("content_fossology_license", "*"):
         from swh.indexer.fossology_license import FossologyLicenseIndexer
 
         object_types.add("content")
diff --git a/swh/indexer/codemeta.py b/swh/indexer/codemeta.py
--- a/swh/indexer/codemeta.py
+++ b/swh/indexer/codemeta.py
@@ -214,7 +214,7 @@
                     elif value not in merged_document[key]:
                         merged_document[key].append(value)
 
-    # XXX: we should set forgefed=True when merging extrinsic-metadata documents.
+    # XXX: we should set forgefed=True when merging extrinsic_metadata documents.
     # however, this function is only used to merge multiple files of the same
     # directory (which is only for intrinsic-metadata), so it is not an issue for now
     return compact(merged_document, forgefed=False)
diff --git a/swh/indexer/metadata_dictionary/base.py b/swh/indexer/metadata_dictionary/base.py
--- a/swh/indexer/metadata_dictionary/base.py
+++ b/swh/indexer/metadata_dictionary/base.py
@@ -67,7 +67,7 @@
 
 
 class BaseExtrinsicMapping(BaseMapping):
-    """Base class for extrinsic-metadata mappings to inherit from
+    """Base class for extrinsic_metadata mappings to inherit from
 
     To implement a new mapping:
 
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
@@ -543,7 +543,7 @@
         )
 
 
-@pytest.mark.parametrize("indexer_name", ["origin-intrinsic-metadata", "*"])
+@pytest.mark.parametrize("indexer_name", ["origin_intrinsic_metadata", "*"])
 def test_cli_journal_client_index__origin_intrinsic_metadata(
     cli_runner,
     swh_config,
@@ -671,7 +671,7 @@
     assert sorted(results, key=lambda r: r.id) == expected_results
 
 
-@pytest.mark.parametrize("indexer_name", ["extrinsic-metadata", "*"])
+@pytest.mark.parametrize("indexer_name", ["extrinsic_metadata", "*"])
 def test_cli_journal_client_index__origin_extrinsic_metadata(
     cli_runner,
     swh_config,
@@ -803,7 +803,7 @@
             "-C",
             swh_config,
             "journal-client",
-            "content-mimetype",
+            "content_mimetype",
             "--broker",
             kafka_server,
             "--prefix",
@@ -884,7 +884,7 @@
             "-C",
             swh_config,
             "journal-client",
-            "content-fossology-license",
+            "content_fossology_license",
             "--broker",
             kafka_server,
             "--prefix",