diff --git a/swh/deposit/cli/__init__.py b/swh/deposit/cli/__init__.py
index 5a209626f41ea2a6a41b947a068d4ef70218cf01..f07c40601a12c6c639c43a2da8e68597a64da87d 100644
--- a/swh/deposit/cli/__init__.py
+++ b/swh/deposit/cli/__init__.py
@@ -24,7 +24,7 @@ def cli(ctx, log_level):
 
 def main():
     logging.basicConfig()
-    from . import deposit  # noqa
+    from . import client  # noqa
     try:
         from . import admin  # noqa
     except ImportError:  # server part is optional
diff --git a/swh/deposit/cli/admin.py b/swh/deposit/cli/admin.py
index 9b9183351dcc2024f166a2a679858cef616228a1..53aab62d86568e4de3dd6f09fdfb735523aa77ce 100644
--- a/swh/deposit/cli/admin.py
+++ b/swh/deposit/cli/admin.py
@@ -6,10 +6,10 @@
 import click
 
 from swh.deposit.config import setup_django_for
-from swh.deposit.cli import cli
+from swh.deposit.cli import deposit
 
 
-@cli.group('admin')
+@deposit.group('admin')
 @click.option('--config-file', '-C', default=None,
               type=click.Path(exists=True, dir_okay=False,),
               help="Optional extra configuration file.")
diff --git a/swh/deposit/cli/deposit.py b/swh/deposit/cli/client.py
similarity index 100%
rename from swh/deposit/cli/deposit.py
rename to swh/deposit/cli/client.py