--- a/setup.py	Fri Jun 02 17:53:09 2023 +0200
+++ b/setup.py	Fri Jun 02 18:26:16 2023 +0200
@@ -21,9 +21,9 @@
 import os
 import textwrap
 
-NAME = "libervia-desktop"
+NAME = "libervia-desktop_kivy"
 # NOTE: directory is still "cagou" for compatibility reason, should be changed for 0.9
-DIR_NAME = "cagou"
+DIR_NAME = "libervia/desktop_kivy"
 
 install_requires = [
     'kivy >=2.0.0, <2.2.0',
@@ -38,7 +38,7 @@
 is_dev_version = VERSION.endswith('D')
 
 
-def cagou_dev_version():
+def desktop_kivy_dev_version():
     """Use mercurial data to compute version"""
     def version_scheme(version):
         return VERSION.replace('D', '.dev0')
@@ -55,16 +55,17 @@
 setup(
     name=NAME,
     version=VERSION,
-    description="Desktop/Android frontend for Libervia XMPP client",
+    description="Desktop/Android frontend (Kivy version) for Libervia XMPP client",
     long_description=textwrap.dedent("""\
-        Libervia Desktop (Cagou) is a desktop/Android frontend for Libervia.
+        Libervia Desktop Kivy is a Desktop/Android frontend for Libervia.
+        This is an alternative version using the Kivy framework.
         It provides native graphical interface with a modern user interface,
         using touch screen abilitiy when available, and with split ability inspired from
         Blender
         """),
-    author="Association « Salut à Toi »",
+    author="Libervia Team",
     author_email="contact@goffi.org",
-    url="https://salut-a-toi.org",
+    url="https://libervia.org",
     classifiers=[
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.7",
@@ -83,15 +84,15 @@
     packages=find_packages(),
     entry_points={
         "console_scripts": [
-            "libervia-desktop = cagou:run",
-            "libervia-mobile = cagou:run",
-            "cagou = cagou:run",
+            "libervia-desktop_kivy = libervia.desktop_kivy:run",
+            "libervia-mobile = libervia.desktop_kivy:run",
+            "cagou = libervia.desktop_kivy:run",
             ],
         },
     zip_safe=False,
     setup_requires=["setuptools_scm"] if is_dev_version else [],
-    use_scm_version=cagou_dev_version if is_dev_version else False,
+    use_scm_version=desktop_kivy_dev_version if is_dev_version else False,
     install_requires=install_requires,
-    package_data={"": ["*.kv"], "cagou": ["VERSION"]},
+    package_data={"": ["*.kv"], "libervia.desktop_kivy": ["VERSION"]},
     python_requires=">=3.7",
 )