diff --git a/Controller.php b/Controller.php
index 9be979f..5b3e10b 100644
--- a/Controller.php
+++ b/Controller.php
@@ -18,7 +18,7 @@ use Modules\Calendar\Models\CalendarMapper;
 use Modules\Navigation\Models\Navigation;
 use Modules\Navigation\Views\NavigationView;
 use phpOMS\Contract\RenderableInterface;
-use phpOMS\Datatypes\SmartDateTime;
+use phpOMS\Stdlib\Base\SmartDateTime;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
diff --git a/Models/AcceptStatus.php b/Models/AcceptStatus.php
index 30ae3fc..98209da 100644
--- a/Models/AcceptStatus.php
+++ b/Models/AcceptStatus.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Accept status enum.
diff --git a/Models/AvailableStatus.php b/Models/AvailableStatus.php
index d6818dc..fc6f2de 100644
--- a/Models/AvailableStatus.php
+++ b/Models/AvailableStatus.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Available status enum.
diff --git a/Models/Calendar.php b/Models/Calendar.php
index 947a470..d3a6fe7 100644
--- a/Models/Calendar.php
+++ b/Models/Calendar.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\SmartDateTime;
+use phpOMS\Stdlib\Base\SmartDateTime;
 
 /**
  * Calendar class.
diff --git a/Models/Event.php b/Models/Event.php
index c782bdc..e7d427d 100644
--- a/Models/Event.php
+++ b/Models/Event.php
@@ -16,7 +16,7 @@ namespace Modules\Calendar\Models;
 
 use phpOMS\Account\Account;
 use phpOMS\Account\NullAccount;
-use phpOMS\Datatypes\Location;
+use phpOMS\Stdlib\Base\Location;
 
 /**
  * Event class.
diff --git a/Models/EventStatus.php b/Models/EventStatus.php
index 2560843..156a44e 100644
--- a/Models/EventStatus.php
+++ b/Models/EventStatus.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Event type enum.
diff --git a/Models/EventType.php b/Models/EventType.php
index e70ba2b..21d96ab 100644
--- a/Models/EventType.php
+++ b/Models/EventType.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Event type enum.
diff --git a/Models/FrequencyInterval.php b/Models/FrequencyInterval.php
index dc2f681..bc41873 100644
--- a/Models/FrequencyInterval.php
+++ b/Models/FrequencyInterval.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Frequency interval type enum.
diff --git a/Models/FrequencyRelative.php b/Models/FrequencyRelative.php
index 8265c7a..4453565 100644
--- a/Models/FrequencyRelative.php
+++ b/Models/FrequencyRelative.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Frequency relative type enum.
diff --git a/Models/FrequencyType.php b/Models/FrequencyType.php
index 51c9077..9ca3155 100644
--- a/Models/FrequencyType.php
+++ b/Models/FrequencyType.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Frequency type enum.
diff --git a/Models/IntervalType.php b/Models/IntervalType.php
index 60f54af..189d18e 100644
--- a/Models/IntervalType.php
+++ b/Models/IntervalType.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Interval type type enum.
diff --git a/Models/Schedule.php b/Models/Schedule.php
index 9ab22b8..9e505e2 100644
--- a/Models/Schedule.php
+++ b/Models/Schedule.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Exception\InvalidEnumValue;
+use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
 
 /**
  * Schedule class.
diff --git a/Models/ScheduleStatus.php b/Models/ScheduleStatus.php
index 2eb82cf..87b120b 100644
--- a/Models/ScheduleStatus.php
+++ b/Models/ScheduleStatus.php
@@ -14,7 +14,7 @@
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
 
-use phpOMS\Datatypes\Enum;
+use phpOMS\Stdlib\Base\Enum;
 
 /**
  * Schedule status enum.