diff -U 3 -dHrN -- a/health_caldav/setup.py b/health_caldav/setup.py
--- a/health_caldav/setup.py	2021-01-29 00:16:22.579731378 +0100
+++ b/health_caldav/setup.py	2021-04-28 19:09:21.063707816 +0200
@@ -47,13 +47,13 @@
     url='https://www.gnuhealth.org',
     download_url='http://ftp.gnu.org/gnu/health/',
     keywords='GNUHealth calendar caldav',
-    package_dir={'trytond.modules.calendar': '.'},
+    package_dir={'trytond.modules.health_caldav': '.'},
     packages=[
-        'trytond.modules.calendar',
-        'trytond.modules.calendar.tests',
+        'trytond.modules.health_caldav',
+        'trytond.modules.health_caldav.tests',
         ],
     package_data={
-        'trytond.modules.calendar': (info.get('xml', [])
+        'trytond.modules.health_caldav': (info.get('xml', [])
             + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
         },
     classifiers=[
@@ -79,7 +79,7 @@
     zip_safe=False,
     entry_points="""
     [trytond.modules]
-    calendar = trytond.modules.calendar
+    calendar = trytond.modules.health_caldav
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
diff -U 3 -dHrN -- a/health_webdav3_server/setup.py b/health_webdav3_server/setup.py
--- a/health_webdav3_server/setup.py	2021-02-14 01:56:43.480016164 +0100
+++ b/health_webdav3_server/setup.py	2021-04-28 15:15:55.966534040 +0200
@@ -63,13 +63,13 @@
     url='https://www.gnuhealth.org',
     download_url='http://ftp.gnu.org/gnu/health/',
     keywords='webdav GNUHealth',
-    package_dir={'trytond.modules.webdav': '.'},
+    package_dir={'trytond.modules.gnuhealth_webdav3_server': '.'},
     packages=[
-        'trytond.modules.webdav',
-        'trytond.modules.webdav.tests',
+        'trytond.modules.gnuhealth_webdav3_server',
+        'trytond.modules.gnuhealth_webdav3_server.tests',
         ],
     package_data={
-        'trytond.modules.webdav': (info.get('xml', [])
+        'trytond.modules.gnuhealth_webdav3_server': (info.get('xml', [])
             + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
                 'icons/*.svg', 'tests/*.rst']),
         },
@@ -93,7 +93,7 @@
     zip_safe=False,
     entry_points="""
     [trytond.modules]
-    webdav = trytond.modules.webdav
+    webdav = trytond.modules.gnuhealth_webdav3_server
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',