diff --git a/docs/source/api/types.rst b/docs/source/api/types.rst
index 118c4261..644f8bb2 100644
--- a/docs/source/api/types.rst
+++ b/docs/source/api/types.rst
@@ -57,8 +57,8 @@ Messages & Media
     - :class:`Poll`
     - :class:`PollOption`
 
-Keyboards
-^^^^^^^^^
+Bots & Keyboards
+^^^^^^^^^^^^^^^^
 
 .. hlist::
     :columns: 4
@@ -140,7 +140,7 @@ Details
 .. autoclass:: Poll()
 .. autoclass:: PollOption()
 
-..  Keyboards
+..  Bots & Keyboards
 .. autoclass:: ReplyKeyboardMarkup()
 .. autoclass:: KeyboardButton()
 .. autoclass:: ReplyKeyboardRemove()
diff --git a/pyrogram/client/filters/filters.py b/pyrogram/client/filters/filters.py
index 1d962e85..fb0a3615 100644
--- a/pyrogram/client/filters/filters.py
+++ b/pyrogram/client/filters/filters.py
@@ -19,7 +19,7 @@
 import re
 
 from .filter import Filter
-from ..types.keyboards import InlineKeyboardMarkup, ReplyKeyboardMarkup
+from ..types.bots_and_keyboards import InlineKeyboardMarkup, ReplyKeyboardMarkup
 
 
 def create(name: str, func: callable, **kwargs) -> type:
diff --git a/pyrogram/client/types/__init__.py b/pyrogram/client/types/__init__.py
index 8a725a9e..8fa55482 100644
--- a/pyrogram/client/types/__init__.py
+++ b/pyrogram/client/types/__init__.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
-from .keyboards import *
+from .bots_and_keyboards import *
 from .inline_mode import *
 from .input_media import *
 from .input_message_content import *
diff --git a/pyrogram/client/types/keyboards/__init__.py b/pyrogram/client/types/bots_and_keyboards/__init__.py
similarity index 100%
rename from pyrogram/client/types/keyboards/__init__.py
rename to pyrogram/client/types/bots_and_keyboards/__init__.py
diff --git a/pyrogram/client/types/keyboards/callback_game.py b/pyrogram/client/types/bots_and_keyboards/callback_game.py
similarity index 100%
rename from pyrogram/client/types/keyboards/callback_game.py
rename to pyrogram/client/types/bots_and_keyboards/callback_game.py
diff --git a/pyrogram/client/types/keyboards/callback_query.py b/pyrogram/client/types/bots_and_keyboards/callback_query.py
similarity index 100%
rename from pyrogram/client/types/keyboards/callback_query.py
rename to pyrogram/client/types/bots_and_keyboards/callback_query.py
diff --git a/pyrogram/client/types/keyboards/force_reply.py b/pyrogram/client/types/bots_and_keyboards/force_reply.py
similarity index 100%
rename from pyrogram/client/types/keyboards/force_reply.py
rename to pyrogram/client/types/bots_and_keyboards/force_reply.py
diff --git a/pyrogram/client/types/keyboards/game_high_score.py b/pyrogram/client/types/bots_and_keyboards/game_high_score.py
similarity index 100%
rename from pyrogram/client/types/keyboards/game_high_score.py
rename to pyrogram/client/types/bots_and_keyboards/game_high_score.py
diff --git a/pyrogram/client/types/keyboards/inline_keyboard_button.py b/pyrogram/client/types/bots_and_keyboards/inline_keyboard_button.py
similarity index 100%
rename from pyrogram/client/types/keyboards/inline_keyboard_button.py
rename to pyrogram/client/types/bots_and_keyboards/inline_keyboard_button.py
diff --git a/pyrogram/client/types/keyboards/inline_keyboard_markup.py b/pyrogram/client/types/bots_and_keyboards/inline_keyboard_markup.py
similarity index 100%
rename from pyrogram/client/types/keyboards/inline_keyboard_markup.py
rename to pyrogram/client/types/bots_and_keyboards/inline_keyboard_markup.py
diff --git a/pyrogram/client/types/keyboards/keyboard_button.py b/pyrogram/client/types/bots_and_keyboards/keyboard_button.py
similarity index 100%
rename from pyrogram/client/types/keyboards/keyboard_button.py
rename to pyrogram/client/types/bots_and_keyboards/keyboard_button.py
diff --git a/pyrogram/client/types/keyboards/reply_keyboard_markup.py b/pyrogram/client/types/bots_and_keyboards/reply_keyboard_markup.py
similarity index 100%
rename from pyrogram/client/types/keyboards/reply_keyboard_markup.py
rename to pyrogram/client/types/bots_and_keyboards/reply_keyboard_markup.py
diff --git a/pyrogram/client/types/keyboards/reply_keyboard_remove.py b/pyrogram/client/types/bots_and_keyboards/reply_keyboard_remove.py
similarity index 100%
rename from pyrogram/client/types/keyboards/reply_keyboard_remove.py
rename to pyrogram/client/types/bots_and_keyboards/reply_keyboard_remove.py