diff --git a/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php b/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php
index 82b4536c1..1fb175601 100644
--- a/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php
+++ b/framework/core/src/Api/Serializer/BasicDiscussionSerializer.php
@@ -46,7 +46,7 @@ class BasicDiscussionSerializer extends AbstractSerializer
      */
     protected function startUser($discussion)
     {
-        return $this->hasOne($discussion, 'Flarum\Api\Serializer\UserBasicSerializer');
+        return $this->hasOne($discussion, 'Flarum\Api\Serializer\BasicUserSerializer');
     }
 
     /**
@@ -54,7 +54,7 @@ class BasicDiscussionSerializer extends AbstractSerializer
      */
     protected function startPost($discussion)
     {
-        return $this->hasOne($discussion, 'Flarum\Api\Serializer\PostBasicSerializer');
+        return $this->hasOne($discussion, 'Flarum\Api\Serializer\BasicPostSerializer');
     }
 
     /**
@@ -62,7 +62,7 @@ class BasicDiscussionSerializer extends AbstractSerializer
      */
     protected function lastUser($discussion)
     {
-        return $this->hasOne($discussion, 'Flarum\Api\Serializer\UserBasicSerializer');
+        return $this->hasOne($discussion, 'Flarum\Api\Serializer\BasicUserSerializer');
     }
 
     /**
@@ -70,7 +70,7 @@ class BasicDiscussionSerializer extends AbstractSerializer
      */
     protected function lastPost($discussion)
     {
-        return $this->hasOne($discussion, 'Flarum\Api\Serializer\PostBasicSerializer');
+        return $this->hasOne($discussion, 'Flarum\Api\Serializer\BasicPostSerializer');
     }
 
     /**
@@ -86,6 +86,6 @@ class BasicDiscussionSerializer extends AbstractSerializer
      */
     protected function relevantPosts($discussion)
     {
-        return $this->hasMany($discussion, 'Flarum\Api\Serializer\PostBasicSerializer');
+        return $this->hasMany($discussion, 'Flarum\Api\Serializer\BasicPostSerializer');
     }
 }
diff --git a/framework/core/src/Api/Serializer/BasicPostSerializer.php b/framework/core/src/Api/Serializer/BasicPostSerializer.php
index 7bee512bd..2988a6343 100644
--- a/framework/core/src/Api/Serializer/BasicPostSerializer.php
+++ b/framework/core/src/Api/Serializer/BasicPostSerializer.php
@@ -57,7 +57,7 @@ class BasicPostSerializer extends AbstractSerializer
      */
     protected function user($post)
     {
-        return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer');
+        return $this->hasOne($post, 'Flarum\Api\Serializer\BasicUserSerializer');
     }
 
     /**
@@ -65,6 +65,6 @@ class BasicPostSerializer extends AbstractSerializer
      */
     protected function discussion($post)
     {
-        return $this->hasOne($post, 'Flarum\Api\Serializer\DiscussionBasicSerializer');
+        return $this->hasOne($post, 'Flarum\Api\Serializer\BasicDiscussionSerializer');
     }
 }
diff --git a/framework/core/src/Api/Serializer/NotificationSerializer.php b/framework/core/src/Api/Serializer/NotificationSerializer.php
index a599ffe31..bfbd8e943 100644
--- a/framework/core/src/Api/Serializer/NotificationSerializer.php
+++ b/framework/core/src/Api/Serializer/NotificationSerializer.php
@@ -57,7 +57,7 @@ class NotificationSerializer extends AbstractSerializer
      */
     protected function user($notification)
     {
-        return $this->hasOne($notification, 'Flarum\Api\Serializer\UserBasicSerializer');
+        return $this->hasOne($notification, 'Flarum\Api\Serializer\BasicUserSerializer');
     }
 
     /**
@@ -65,7 +65,7 @@ class NotificationSerializer extends AbstractSerializer
      */
     protected function sender($notification)
     {
-        return $this->hasOne($notification, 'Flarum\Api\Serializer\UserBasicSerializer');
+        return $this->hasOne($notification, 'Flarum\Api\Serializer\BasicUserSerializer');
     }
 
     /**