diff --git a/lib/pleroma/web/api_spec/operations/chat_operation.ex b/lib/pleroma/web/api_spec/operations/chat_operation.ex
index 88b9db048..fc9d4608a 100644
--- a/lib/pleroma/web/api_spec/operations/chat_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/chat_operation.ex
@@ -6,8 +6,8 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
   alias OpenApiSpex.Operation
   alias OpenApiSpex.Schema
   alias Pleroma.Web.ApiSpec.Schemas.ChatMessageCreateRequest
-  alias Pleroma.Web.ApiSpec.Schemas.ChatMessageResponse
-  alias Pleroma.Web.ApiSpec.Schemas.ChatResponse
+  alias Pleroma.Web.ApiSpec.Schemas.ChatMessage
+  alias Pleroma.Web.ApiSpec.Schemas.Chat
 
   import Pleroma.Web.ApiSpec.Helpers
 
@@ -37,7 +37,7 @@ def create_operation do
           Operation.response(
             "The created or existing chat",
             "application/json",
-            ChatResponse
+            Chat
           )
       },
       security: [
@@ -103,7 +103,7 @@ def post_chat_message_operation do
           Operation.response(
             "The newly created ChatMessage",
             "application/json",
-            ChatMessageResponse
+            ChatMessage
           )
       },
       security: [
@@ -119,7 +119,7 @@ def chats_response do
       title: "ChatsResponse",
       description: "Response schema for multiple Chats",
       type: :array,
-      items: ChatResponse,
+      items: Chat,
       example: [
         %{
           "account" => %{
@@ -180,7 +180,7 @@ def chat_messages_response do
       title: "ChatMessagesResponse",
       description: "Response schema for multiple ChatMessages",
       type: :array,
-      items: ChatMessageResponse,
+      items: ChatMessage,
       example: [
         %{
           "emojis" => [
diff --git a/lib/pleroma/web/api_spec/schemas/chat_response.ex b/lib/pleroma/web/api_spec/schemas/chat.ex
similarity index 96%
rename from lib/pleroma/web/api_spec/schemas/chat_response.ex
rename to lib/pleroma/web/api_spec/schemas/chat.ex
index aa435165d..4d385d6ab 100644
--- a/lib/pleroma/web/api_spec/schemas/chat_response.ex
+++ b/lib/pleroma/web/api_spec/schemas/chat.ex
@@ -2,13 +2,13 @@
 # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.Web.ApiSpec.Schemas.ChatResponse do
+defmodule Pleroma.Web.ApiSpec.Schemas.Chat do
   alias OpenApiSpex.Schema
 
   require OpenApiSpex
 
   OpenApiSpex.schema(%{
-    title: "ChatResponse",
+    title: "Chat",
     description: "Response schema for a Chat",
     type: :object,
     properties: %{
diff --git a/lib/pleroma/web/api_spec/schemas/chat_message_response.ex b/lib/pleroma/web/api_spec/schemas/chat_message.ex
similarity index 91%
rename from lib/pleroma/web/api_spec/schemas/chat_message_response.ex
rename to lib/pleroma/web/api_spec/schemas/chat_message.ex
index 707c9808b..7c93b0c83 100644
--- a/lib/pleroma/web/api_spec/schemas/chat_message_response.ex
+++ b/lib/pleroma/web/api_spec/schemas/chat_message.ex
@@ -2,13 +2,13 @@
 # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.Web.ApiSpec.Schemas.ChatMessageResponse do
+defmodule Pleroma.Web.ApiSpec.Schemas.ChatMessage do
   alias OpenApiSpex.Schema
 
   require OpenApiSpex
 
   OpenApiSpex.schema(%{
-    title: "ChatMessageResponse",
+    title: "ChatMessage",
     description: "Response schema for a ChatMessage",
     type: :object,
     properties: %{