diff --git a/swh/deposit/cli/__init__.py b/swh/deposit/cli/__init__.py
--- a/swh/deposit/cli/__init__.py
+++ b/swh/deposit/cli/__init__.py
@@ -24,7 +24,7 @@
 
 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
--- 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
rename from swh/deposit/cli/deposit.py
rename to swh/deposit/cli/client.py