diff --git a/CHANGES.rst b/CHANGES.rst
index 906843fd..e1c5d9f1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,7 @@ Minor changes:
 - Rename ``master`` branch to ``main``, see `Issue
   <https://github.com/collective/icalendar/issues/627>`_
 - Added missing public classes and functions to API documentation.
+- Improved namespace management in the ``icalendar`` directory.
 - Add Python version badge and badge for test coverage
 - Remove 4.x badge
 - Update list of ``tox`` environments
diff --git a/docs/credits.rst b/docs/credits.rst
index 5d17ec44..7fce0509 100644
--- a/docs/credits.rst
+++ b/docs/credits.rst
@@ -74,6 +74,7 @@ icalendar contributors
 - Felix Stupp <felix.stupp@banananet.work>
 - Bastian Wegge <wegge@crossbow.de>
 - `Steve Piercy <https://github.com/stevepiercy>`_
+- Jeffrey Whewhetu <jeffwhewhetu@gmail.com>
 
 Find out who contributed::
 
diff --git a/src/icalendar/__init__.py b/src/icalendar/__init__.py
index 138cf7a6..61d6e6c9 100644
--- a/src/icalendar/__init__.py
+++ b/src/icalendar/__init__.py
@@ -44,3 +44,9 @@
 
 # Switching the timezone provider
 from icalendar.timezone import use_pytz, use_zoneinfo
+
+
+__all__ = ['Calendar', 'Event', 'Todo', 'Journal', 'Timezone', 'TimezoneStandard', 'TimezoneDaylight', 'FreeBusy', 'Alarm',
+          'ComponentFactory', 'vBinary', 'vBoolean', 'vCalAddress', 'vDatetime', 'vDate', 'vDDDTypes', 'vDuration',
+          'vFloat', 'vInt', 'vPeriod','vWeekday', 'vFrequency', 'vRecur', 'vText', 'vTime', 'vUri', 'vGeo', 'vUTCOffset',
+          'vTypesFactory', 'Parameters', 'q_split', 'q_join', 'use_pytz', 'use_zoneinfo']