diff --git a/swh/loader/mercurial/tasks.py b/swh/loader/mercurial/tasks.py
--- a/swh/loader/mercurial/tasks.py
+++ b/swh/loader/mercurial/tasks.py
@@ -9,7 +9,7 @@
 
 from swh.loader.mercurial.utils import parse_visit_date
 
-from .loader import HgArchiveBundle20Loader, HgBundle20Loader
+from .from_disk import HgArchiveLoaderFromDisk, HgLoaderFromDisk
 
 
 @shared_task(name=__name__ + ".LoadMercurial")
@@ -20,11 +20,11 @@
 
     Import a mercurial tarball into swh.
 
-    Args: see :func:`HgBundle20Loader.load`.
+    Args: see :func:`HgLoaderFromDisk.load`.
 
     """
 
-    loader = HgBundle20Loader.from_configfile(
+    loader = HgLoaderFromDisk.from_configfile(
         url=url, directory=directory, visit_date=parse_visit_date(visit_date)
     )
     return loader.load()
@@ -36,9 +36,9 @@
 ):
     """Import a mercurial tarball into swh.
 
-    Args: see :func:`HgArchiveBundle20Loader.load`.
+    Args: see :func:`HgArchiveLoaderFromDisk.load`.
     """
-    loader = HgArchiveBundle20Loader.from_configfile(
+    loader = HgArchiveLoaderFromDisk.from_configfile(
         url=url, archive_path=archive_path, visit_date=parse_visit_date(visit_date)
     )
     return loader.load()
diff --git a/swh/loader/mercurial/tests/test_tasks.py b/swh/loader/mercurial/tests/test_tasks.py
--- a/swh/loader/mercurial/tests/test_tasks.py
+++ b/swh/loader/mercurial/tests/test_tasks.py
@@ -7,7 +7,7 @@
 def test_loader(
     mocker, swh_config, swh_scheduler_celery_app, swh_scheduler_celery_worker
 ):
-    mock_loader = mocker.patch("swh.loader.mercurial.loader.HgBundle20Loader.load")
+    mock_loader = mocker.patch("swh.loader.mercurial.from_disk.HgLoaderFromDisk.load")
     mock_loader.return_value = {"status": "eventful"}
 
     res = swh_scheduler_celery_app.send_task(
@@ -27,7 +27,7 @@
     mocker, swh_config, swh_scheduler_celery_app, swh_scheduler_celery_worker
 ):
     mock_loader = mocker.patch(
-        "swh.loader.mercurial.loader.HgArchiveBundle20Loader.load"
+        "swh.loader.mercurial.from_disk.HgArchiveLoaderFromDisk.load"
     )
     mock_loader.return_value = {"status": "uneventful"}