diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php
index 3df56fb..6e9d481 100755
--- a/Models/CalendarMapper.php
+++ b/Models/CalendarMapper.php
@@ -53,8 +53,8 @@ final class CalendarMapper extends DataMapperAbstract
         'events' => [
             'mapper'   => EventMapper::class,
             'table'    => 'calendar_event',
-            'external' => 'calendar_event_calendar',
-            'self'     => null,
+            'self' => 'calendar_event_calendar',
+            'external'     => null,
         ],
     ];
 
diff --git a/Models/EventMapper.php b/Models/EventMapper.php
index 7c3885f..ef949b5 100755
--- a/Models/EventMapper.php
+++ b/Models/EventMapper.php
@@ -55,7 +55,7 @@ final class EventMapper extends DataMapperAbstract
     protected static array $ownsOne = [
         'schedule' => [
             'mapper' => ScheduleMapper::class,
-            'self'   => 'calendar_event_schedule',
+            'external'   => 'calendar_event_schedule',
         ],
     ];
 
@@ -68,7 +68,7 @@ final class EventMapper extends DataMapperAbstract
     protected static array $belongsTo = [
         'createdBy' => [
             'mapper' => AccountMapper::class,
-            'self'   => 'calendar_event_created_by',
+            'external'   => 'calendar_event_created_by',
         ],
     ];
 
diff --git a/Models/ScheduleMapper.php b/Models/ScheduleMapper.php
index f92f43d..518e90e 100755
--- a/Models/ScheduleMapper.php
+++ b/Models/ScheduleMapper.php
@@ -58,7 +58,7 @@ final class ScheduleMapper extends DataMapperAbstract
     protected static array $belongsTo = [
         'createdBy' => [
             'mapper' => AccountMapper::class,
-            'self'   => 'schedule_created_by',
+            'external'   => 'schedule_created_by',
         ],
     ];