diff --git a/requirements-swh.txt b/requirements-swh.txt
index 24f0a5c..5a27d65 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,2 +1,2 @@
 # Add here internal Software Heritage dependencies, one per line.
-swh.core
+swh.core >= 0.3
diff --git a/setup.py b/setup.py
index b67d745..8aeea62 100755
--- a/setup.py
+++ b/setup.py
@@ -1,74 +1,74 @@
 #!/usr/bin/env python3
 # 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
 
 from io import open
 from os import path
 
 from setuptools import find_packages, setup
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
 with open(path.join(here, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
 
 def parse_requirements(name=None):
     if name:
         reqf = "requirements-%s.txt" % name
     else:
         reqf = "requirements.txt"
 
     requirements = []
     if not path.exists(reqf):
         return requirements
 
     with open(reqf) as f:
         for line in f.readlines():
             line = line.strip()
             if not line or line.startswith("#"):
                 continue
             requirements.append(line)
     return requirements
 
 
 # Edit this part to match your module.
 # Full sample:
 #   https://forge.softwareheritage.org/diffusion/DCORE/browse/master/setup.py
 setup(
     name="swh.<module-name>",  # example: swh.loader.pypi
     description="Software Heritage <Module's intent>",
     long_description=long_description,
     long_description_content_type="text/markdown",
     python_requires=">=3.7",
     author="Software Heritage developers",
     author_email="swh-devel@inria.fr",
     url="https://forge.softwareheritage.org/diffusion/<module-git-code>",
     packages=find_packages(),  # packages's modules
     install_requires=parse_requirements() + parse_requirements("swh"),
     tests_require=parse_requirements("test"),
     setup_requires=["setuptools-scm"],
     use_scm_version=True,
     extras_require={"testing": parse_requirements("test")},
     include_package_data=True,
     entry_points="""
         [swh.cli.subcommands]
-        <cli-name>=swh.<module>.cli:cli
+        <cli-name>=swh.<module>.cli
     """,
     classifiers=[
         "Programming Language :: Python :: 3",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
         "Development Status :: 3 - Alpha",
     ],
     project_urls={
         "Bug Reports": "https://forge.softwareheritage.org/maniphest",
         "Funding": "https://www.softwareheritage.org/donate",
         "Source": "https://forge.softwareheritage.org/source/swh-<module>",
         "Documentation": "https://docs.softwareheritage.org/devel/swh-<module>/",
     },
 )
diff --git a/swh/foo/cli.py b/swh/foo/cli.py
index cd764e9..1fab6a7 100644
--- a/swh/foo/cli.py
+++ b/swh/foo/cli.py
@@ -1,18 +1,18 @@
 import click
 
-from swh.core.cli import CONTEXT_SETTINGS
+from swh.core.cli import CONTEXT_SETTINGS, swh as swh_cli_group
 
 
-@click.group(name="foo", context_settings=CONTEXT_SETTINGS)
+@swh_cli_group(name="foo", context_settings=CONTEXT_SETTINGS)
 @click.pass_context
-def cli(ctx):
+def foo_cli_group(ctx):
     """Foo main command.
     """
 
 
-@cli.command()
+@foo_cli_group.command()
 @click.option("--bar", help="Something")
 @click.pass_context
 def bar(ctx, bar):
     """Do something."""
     click.echo("bar")