diff --git a/docs/source/api/bound-methods.rst b/docs/source/api/bound-methods.rst
index 2f2200ab..83b3dbbe 100644
--- a/docs/source/api/bound-methods.rst
+++ b/docs/source/api/bound-methods.rst
@@ -81,13 +81,13 @@ CallbackQuery
 ^^^^^^^^^^^^^
 
 .. hlist::
-    :columns: 5
+    :columns: 3
 
     - :meth:`~CallbackQuery.answer`
-    - :meth:`~CallbackQuery.edit_text`
-    - :meth:`~CallbackQuery.edit_caption`
-    - :meth:`~CallbackQuery.edit_media`
-    - :meth:`~CallbackQuery.edit_reply_markup`
+    - :meth:`~CallbackQuery.edit_message_text`
+    - :meth:`~CallbackQuery.edit_message_caption`
+    - :meth:`~CallbackQuery.edit_message_media`
+    - :meth:`~CallbackQuery.edit_message_reply_markup`
 
 InlineQuery
 ^^^^^^^^^^^
@@ -141,10 +141,10 @@ Details
 
 .. CallbackQuery
 .. automethod:: CallbackQuery.answer()
-.. automethod:: CallbackQuery.edit_text()
-.. automethod:: CallbackQuery.edit_caption()
-.. automethod:: CallbackQuery.edit_media()
-.. automethod:: CallbackQuery.edit_reply_markup()
+.. automethod:: CallbackQuery.edit_message_text()
+.. automethod:: CallbackQuery.edit_message_caption()
+.. automethod:: CallbackQuery.edit_message_media()
+.. automethod:: CallbackQuery.edit_message_reply_markup()
 
 .. InlineQuery
 .. automethod:: InlineQuery.answer()
diff --git a/pyrogram/client/types/bots_and_keyboards/callback_query.py b/pyrogram/client/types/bots_and_keyboards/callback_query.py
index 4bb4a7e4..6872d65b 100644
--- a/pyrogram/client/types/bots_and_keyboards/callback_query.py
+++ b/pyrogram/client/types/bots_and_keyboards/callback_query.py
@@ -173,14 +173,14 @@ class CallbackQuery(Object, Update):
             cache_time=cache_time
         )
 
-    def edit_text(
+    def edit_message_text(
         self,
         text: str,
         parse_mode: str = "",
         disable_web_page_preview: bool = None,
         reply_markup: "pyrogram.InlineKeyboardMarkup" = None
     ) -> Union["pyrogram.Message", bool]:
-        """Bound method *edit_text* of :obj:`CallbackQuery`.
+        """Bound method *edit_message_text* of :obj:`CallbackQuery`.
 
         Parameters:
             text (``str``):
@@ -224,13 +224,13 @@ class CallbackQuery(Object, Update):
             reply_markup=reply_markup
         )
 
-    def edit_caption(
+    def edit_message_caption(
         self,
         caption: str,
         parse_mode: str = "",
         reply_markup: "pyrogram.InlineKeyboardMarkup" = None
     ) -> Union["pyrogram.Message", bool]:
-        """Bound method *edit_caption* of :obj:`Message`.
+        """Bound method *edit_message_caption* of :obj:`CallbackQuery`.
 
         Parameters:
             caption (``str``):
@@ -270,12 +270,12 @@ class CallbackQuery(Object, Update):
             reply_markup=reply_markup
         )
 
-    def edit_media(
+    def edit_message_media(
         self,
         media: "pyrogram.InputMedia",
         reply_markup: "pyrogram.InlineKeyboardMarkup" = None
     ) -> Union["pyrogram.Message", bool]:
-        """Bound method *edit_media* of :obj:`Message`.
+        """Bound method *edit_message_media* of :obj:`CallbackQuery`.
 
         Parameters:
             media (:obj:`InputMedia`):
@@ -310,11 +310,11 @@ class CallbackQuery(Object, Update):
             reply_markup=reply_markup
         )
 
-    def edit_reply_markup(
+    def edit_message_reply_markup(
         self,
         reply_markup: "pyrogram.InlineKeyboardMarkup" = None
     ) -> Union["pyrogram.Message", bool]:
-        """Bound method *edit_reply_markup* of :obj:`Message`.
+        """Bound method *edit_message_reply_markup* of :obj:`CallbackQuery`.
 
         Parameters:
             reply_markup (:obj:`InlineKeyboardMarkup`):