diff --git a/js/src/common/models/Post.js b/js/src/common/models/Post.js
index b9c1127c3..1b87e6722 100644
--- a/js/src/common/models/Post.js
+++ b/js/src/common/models/Post.js
@@ -16,7 +16,7 @@ Object.assign(Post.prototype, {
   contentPlain: computed('contentHtml', getPlainContent),
 
   editedAt: Model.attribute('editedAt', Model.transformDate),
-  editUser: Model.hasOne('editUser'),
+  editedUser: Model.hasOne('editedUser'),
   isEdited: computed('editedAt', editedAt => !!editedAt),
 
   hiddenAt: Model.attribute('hiddenAt', Model.transformDate),
diff --git a/js/src/forum/components/PostEdited.js b/js/src/forum/components/PostEdited.js
index 3b8bc6f90..021307040 100644
--- a/js/src/forum/components/PostEdited.js
+++ b/js/src/forum/components/PostEdited.js
@@ -18,10 +18,10 @@ export default class PostEdited extends Component {
 
   view() {
     const post = this.props.post;
-    const editUser = post.editUser();
+    const editedUser = post.editedUser();
     const editedInfo = extractText(app.translator.trans(
       'core.forum.post.edited_tooltip',
-      {user: editUser, ago: humanTime(post.editedAt())}
+      {user: editedUser, ago: humanTime(post.editedAt())}
     ));
     if (editedInfo !== this.oldEditedInfo) {
       this.shouldUpdateTooltip = true;
diff --git a/src/Api/Controller/ListPostsController.php b/src/Api/Controller/ListPostsController.php
index 609839fa4..dbec57c47 100644
--- a/src/Api/Controller/ListPostsController.php
+++ b/src/Api/Controller/ListPostsController.php
@@ -32,7 +32,7 @@ class ListPostsController extends AbstractListController
     public $include = [
         'user',
         'user.groups',
-        'editUser',
+        'editedUser',
         'hideUser',
         'discussion'
     ];
diff --git a/src/Api/Controller/ShowDiscussionController.php b/src/Api/Controller/ShowDiscussionController.php
index 4c439d9fb..0cf94b253 100644
--- a/src/Api/Controller/ShowDiscussionController.php
+++ b/src/Api/Controller/ShowDiscussionController.php
@@ -44,7 +44,7 @@ class ShowDiscussionController extends AbstractShowController
         'posts.discussion',
         'posts.user',
         'posts.user.groups',
-        'posts.editUser',
+        'posts.editedUser',
         'posts.hideUser'
     ];
 
diff --git a/src/Api/Controller/ShowPostController.php b/src/Api/Controller/ShowPostController.php
index f269b7ebc..da88668c9 100644
--- a/src/Api/Controller/ShowPostController.php
+++ b/src/Api/Controller/ShowPostController.php
@@ -29,7 +29,7 @@ class ShowPostController extends AbstractShowController
     public $include = [
         'user',
         'user.groups',
-        'editUser',
+        'editedUser',
         'hideUser',
         'discussion'
     ];
diff --git a/src/Api/Controller/UpdatePostController.php b/src/Api/Controller/UpdatePostController.php
index fe2db5ed9..7ec36e8e5 100644
--- a/src/Api/Controller/UpdatePostController.php
+++ b/src/Api/Controller/UpdatePostController.php
@@ -28,7 +28,7 @@ class UpdatePostController extends AbstractShowController
      * {@inheritdoc}
      */
     public $include = [
-        'editUser',
+        'editedUser',
         'discussion'
     ];
 
diff --git a/src/Api/Serializer/PostSerializer.php b/src/Api/Serializer/PostSerializer.php
index 888b32c3d..c4996ecf4 100644
--- a/src/Api/Serializer/PostSerializer.php
+++ b/src/Api/Serializer/PostSerializer.php
@@ -92,7 +92,7 @@ class PostSerializer extends BasicPostSerializer
     /**
      * @return \Tobscure\JsonApi\Relationship
      */
-    protected function editUser($post)
+    protected function editedUser($post)
     {
         return $this->hasOne($post, BasicUserSerializer::class);
     }
diff --git a/src/Post/Post.php b/src/Post/Post.php
index 899949a6d..947495545 100644
--- a/src/Post/Post.php
+++ b/src/Post/Post.php
@@ -34,7 +34,7 @@ use Illuminate\Database\Eloquent\Builder;
  * @property int|null $hidden_user_id
  * @property \Flarum\Discussion\Discussion|null $discussion
  * @property User|null $user
- * @property User|null $editUser
+ * @property User|null $editedUser
  * @property User|null $hideUser
  * @property string $ip_address
  * @property bool $is_private
@@ -167,7 +167,7 @@ class Post extends AbstractModel
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function editUser()
+    public function editedUser()
     {
         return $this->belongsTo(User::class, 'edited_user_id');
     }