diff --git a/makibot/modules/admin.py b/makibot/modules/admin.py
index 68b841b..9d374e5 100644
--- a/makibot/modules/admin.py
+++ b/makibot/modules/admin.py
@@ -8,11 +8,11 @@
 from telegram.ext.dispatcher import run_async
 from telegram.utils.helpers import escape_markdown, mention_html
 
-from tg_bot import dispatcher
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.chat_status import bot_admin, can_promote, user_admin, can_pin
-from tg_bot.modules.helper_funcs.extraction import extract_user
-from tg_bot.modules.log_channel import loggable
+from makibot import dispatcher
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.chat_status import bot_admin, can_promote, user_admin, can_pin
+from makibot.modules.helper_funcs.extraction import extract_user
+from makibot.modules.log_channel import loggable
 
 
 @run_async
diff --git a/makibot/modules/afk.py b/makibot/modules/afk.py
index c02c607..3d207e7 100644
--- a/makibot/modules/afk.py
+++ b/makibot/modules/afk.py
@@ -4,10 +4,10 @@
 from telegram import MessageEntity
 from telegram.ext import Filters, MessageHandler, run_async
 
-from tg_bot import dispatcher
-from tg_bot.modules.disable import DisableAbleCommandHandler, DisableAbleRegexHandler
-from tg_bot.modules.sql import afk_sql as sql
-from tg_bot.modules.users import get_user_id
+from makibot import dispatcher
+from makibot.modules.disable import DisableAbleCommandHandler, DisableAbleRegexHandler
+from makibot.modules.sql import afk_sql as sql
+from makibot.modules.users import get_user_id
 
 AFK_GROUP = 7
 AFK_REPLY_GROUP = 8
diff --git a/makibot/modules/antiflood.py b/makibot/modules/antiflood.py
index ba760f7..2fb55d4 100644
--- a/makibot/modules/antiflood.py
+++ b/makibot/modules/antiflood.py
@@ -6,10 +6,10 @@
 from telegram.ext import Filters, MessageHandler, CommandHandler, run_async
 from telegram.utils.helpers import mention_html
 
-from tg_bot import dispatcher
-from tg_bot.modules.helper_funcs.chat_status import is_user_admin, user_admin, can_restrict
-from tg_bot.modules.log_channel import loggable
-from tg_bot.modules.sql import antiflood_sql as sql
+from makibot import dispatcher
+from makibot.modules.helper_funcs.chat_status import is_user_admin, user_admin, can_restrict
+from makibot.modules.log_channel import loggable
+from makibot.modules.sql import antiflood_sql as sql
 
 FLOOD_GROUP = 3
 
diff --git a/makibot/modules/backups.py b/makibot/modules/backups.py
index 832a946..26f493a 100644
--- a/makibot/modules/backups.py
+++ b/makibot/modules/backups.py
@@ -6,9 +6,9 @@
 from telegram.error import BadRequest
 from telegram.ext import CommandHandler, run_async
 
-from tg_bot import dispatcher, LOGGER
-from tg_bot.__main__ import DATA_IMPORT
-from tg_bot.modules.helper_funcs.chat_status import user_admin
+from makibot import dispatcher, LOGGER
+from makibot.__main__ import DATA_IMPORT
+from makibot.modules.helper_funcs.chat_status import user_admin
 
 
 @run_async
diff --git a/makibot/modules/bans.py b/makibot/modules/bans.py
index 5489959..c43ca68 100644
--- a/makibot/modules/bans.py
+++ b/makibot/modules/bans.py
@@ -6,13 +6,13 @@
 from telegram.ext import run_async, CommandHandler, Filters
 from telegram.utils.helpers import mention_html
 
-from tg_bot import dispatcher, BAN_STICKER, LOGGER
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.chat_status import bot_admin, user_admin, is_user_ban_protected, can_restrict, \
+from makibot import dispatcher, BAN_STICKER, LOGGER
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.chat_status import bot_admin, user_admin, is_user_ban_protected, can_restrict, \
     is_user_admin, is_user_in_chat
-from tg_bot.modules.helper_funcs.extraction import extract_user_and_text
-from tg_bot.modules.helper_funcs.string_handling import extract_time
-from tg_bot.modules.log_channel import loggable
+from makibot.modules.helper_funcs.extraction import extract_user_and_text
+from makibot.modules.helper_funcs.string_handling import extract_time
+from makibot.modules.log_channel import loggable
 
 
 @run_async
diff --git a/makibot/modules/blacklist.py b/makibot/modules/blacklist.py
index dc912ce..b92ee72 100644
--- a/makibot/modules/blacklist.py
+++ b/makibot/modules/blacklist.py
@@ -6,12 +6,12 @@
 from telegram.error import BadRequest
 from telegram.ext import CommandHandler, MessageHandler, Filters, run_async
 
-import tg_bot.modules.sql.blacklist_sql as sql
-from tg_bot import dispatcher, LOGGER
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.chat_status import user_admin, user_not_admin
-from tg_bot.modules.helper_funcs.extraction import extract_text
-from tg_bot.modules.helper_funcs.misc import split_message
+import makibot.modules.sql.blacklist_sql as sql
+from makibot import dispatcher, LOGGER
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.chat_status import user_admin, user_not_admin
+from makibot.modules.helper_funcs.extraction import extract_text
+from makibot.modules.helper_funcs.misc import split_message
 
 BLACKLIST_GROUP = 11
 
diff --git a/makibot/modules/cust_filters.py b/makibot/modules/cust_filters.py
index edc0e09..8ef09ff 100644
--- a/makibot/modules/cust_filters.py
+++ b/makibot/modules/cust_filters.py
@@ -8,14 +8,14 @@
 from telegram.ext import CommandHandler, MessageHandler, DispatcherHandlerStop, run_async
 from telegram.utils.helpers import escape_markdown
 
-from tg_bot import dispatcher, LOGGER
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.chat_status import user_admin
-from tg_bot.modules.helper_funcs.extraction import extract_text
-from tg_bot.modules.helper_funcs.filters import CustomFilters
-from tg_bot.modules.helper_funcs.misc import build_keyboard
-from tg_bot.modules.helper_funcs.string_handling import split_quotes, button_markdown_parser
-from tg_bot.modules.sql import cust_filters_sql as sql
+from makibot import dispatcher, LOGGER
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.chat_status import user_admin
+from makibot.modules.helper_funcs.extraction import extract_text
+from makibot.modules.helper_funcs.filters import CustomFilters
+from makibot.modules.helper_funcs.misc import build_keyboard
+from makibot.modules.helper_funcs.string_handling import split_quotes, button_markdown_parser
+from makibot.modules.sql import cust_filters_sql as sql
 
 HANDLER_GROUP = 10
 BASIC_FILTER_STRING = "*Filters in this chat:*\n"
diff --git a/makibot/modules/disable.py b/makibot/modules/disable.py
index f87569d..2e23ae5 100644
--- a/makibot/modules/disable.py
+++ b/makibot/modules/disable.py
@@ -5,18 +5,18 @@
 from telegram.ext import CommandHandler, RegexHandler, Filters
 from telegram.utils.helpers import escape_markdown
 
-from tg_bot import dispatcher
-from tg_bot.modules.helper_funcs.handlers import CMD_STARTERS
-from tg_bot.modules.helper_funcs.misc import is_module_loaded
+from makibot import dispatcher
+from makibot.modules.helper_funcs.handlers import CMD_STARTERS
+from makibot.modules.helper_funcs.misc import is_module_loaded
 
 FILENAME = __name__.rsplit(".", 1)[-1]
 
 # If module is due to be loaded, then setup all the magical handlers
 if is_module_loaded(FILENAME):
-    from tg_bot.modules.helper_funcs.chat_status import user_admin, is_user_admin
+    from makibot.modules.helper_funcs.chat_status import user_admin, is_user_admin
     from telegram.ext.dispatcher import run_async
 
-    from tg_bot.modules.sql import disable_sql as sql
+    from makibot.modules.sql import disable_sql as sql
 
     DISABLE_CMDS = []
     DISABLE_OTHER = []
diff --git a/makibot/modules/global_bans.py b/makibot/modules/global_bans.py
index 6566d57..4d4cd48 100644
--- a/makibot/modules/global_bans.py
+++ b/makibot/modules/global_bans.py
@@ -7,13 +7,13 @@
 from telegram.ext import run_async, CommandHandler, MessageHandler, Filters
 from telegram.utils.helpers import mention_html
 
-import tg_bot.modules.sql.global_bans_sql as sql
-from tg_bot import dispatcher, OWNER_ID, SUDO_USERS, SUPPORT_USERS, STRICT_GBAN
-from tg_bot.modules.helper_funcs.chat_status import user_admin, is_user_admin
-from tg_bot.modules.helper_funcs.extraction import extract_user, extract_user_and_text
-from tg_bot.modules.helper_funcs.filters import CustomFilters
-from tg_bot.modules.helper_funcs.misc import send_to_list
-from tg_bot.modules.sql.users_sql import get_all_chats
+import makibot.modules.sql.global_bans_sql as sql
+from makibot import dispatcher, OWNER_ID, SUDO_USERS, SUPPORT_USERS, STRICT_GBAN
+from makibot.modules.helper_funcs.chat_status import user_admin, is_user_admin
+from makibot.modules.helper_funcs.extraction import extract_user, extract_user_and_text
+from makibot.modules.helper_funcs.filters import CustomFilters
+from makibot.modules.helper_funcs.misc import send_to_list
+from makibot.modules.sql.users_sql import get_all_chats
 
 GBAN_ENFORCE_GROUP = 6
 
diff --git a/makibot/modules/helper_funcs/chat_status.py b/makibot/modules/helper_funcs/chat_status.py
index 421d0a8..cd87bf0 100644
--- a/makibot/modules/helper_funcs/chat_status.py
+++ b/makibot/modules/helper_funcs/chat_status.py
@@ -3,7 +3,7 @@
 
 from telegram import User, Chat, ChatMember, Update, Bot
 
-from tg_bot import DEL_CMDS, SUDO_USERS, WHITELIST_USERS
+from makibot import DEL_CMDS, SUDO_USERS, WHITELIST_USERS
 
 
 def can_delete(chat: Chat, bot_id: int) -> bool:
diff --git a/makibot/modules/helper_funcs/extraction.py b/makibot/modules/helper_funcs/extraction.py
index ce21814..a89d6ce 100644
--- a/makibot/modules/helper_funcs/extraction.py
+++ b/makibot/modules/helper_funcs/extraction.py
@@ -3,8 +3,8 @@
 from telegram import Message, MessageEntity
 from telegram.error import BadRequest
 
-from tg_bot import LOGGER
-from tg_bot.modules.users import get_user_id
+from makibot import LOGGER
+from makibot.modules.users import get_user_id
 
 
 def id_from_reply(message):
diff --git a/makibot/modules/helper_funcs/filters.py b/makibot/modules/helper_funcs/filters.py
index 3f14b12..876ff52 100644
--- a/makibot/modules/helper_funcs/filters.py
+++ b/makibot/modules/helper_funcs/filters.py
@@ -1,7 +1,7 @@
 from telegram import Message
 from telegram.ext import BaseFilter
 
-from tg_bot import SUPPORT_USERS, SUDO_USERS
+from makibot import SUPPORT_USERS, SUDO_USERS
 
 
 class CustomFilters(object):
diff --git a/makibot/modules/helper_funcs/misc.py b/makibot/modules/helper_funcs/misc.py
index bb24600..5dd0333 100644
--- a/makibot/modules/helper_funcs/misc.py
+++ b/makibot/modules/helper_funcs/misc.py
@@ -4,7 +4,7 @@
 from telegram import MAX_MESSAGE_LENGTH, InlineKeyboardButton, Bot, ParseMode
 from telegram.error import TelegramError
 
-from tg_bot import LOAD, NO_LOAD
+from makibot import LOAD, NO_LOAD
 
 
 class EqInlineKeyboardButton(InlineKeyboardButton):
diff --git a/makibot/modules/helper_funcs/msg_types.py b/makibot/modules/helper_funcs/msg_types.py
index 2248a8a..b0dbfd3 100644
--- a/makibot/modules/helper_funcs/msg_types.py
+++ b/makibot/modules/helper_funcs/msg_types.py
@@ -2,7 +2,7 @@
 
 from telegram import Message
 
-from tg_bot.modules.helper_funcs.string_handling import button_markdown_parser
+from makibot.modules.helper_funcs.string_handling import button_markdown_parser
 
 
 @unique
diff --git a/makibot/modules/locks.py b/makibot/modules/locks.py
index a01d534..347895a 100644
--- a/makibot/modules/locks.py
+++ b/makibot/modules/locks.py
@@ -9,13 +9,13 @@
 from telegram.ext.dispatcher import run_async
 from telegram.utils.helpers import mention_html
 
-import tg_bot.modules.sql.locks_sql as sql
-from tg_bot import dispatcher, SUDO_USERS, LOGGER
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.chat_status import can_delete, is_user_admin, user_not_admin, user_admin, \
+import makibot.modules.sql.locks_sql as sql
+from makibot import dispatcher, SUDO_USERS, LOGGER
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.chat_status import can_delete, is_user_admin, user_not_admin, user_admin, \
     bot_can_delete, is_bot_admin
-from tg_bot.modules.log_channel import loggable
-from tg_bot.modules.sql import users_sql
+from makibot.modules.log_channel import loggable
+from makibot.modules.sql import users_sql
 
 LOCK_TYPES = {'sticker': Filters.sticker,
               'audio': Filters.audio,
diff --git a/makibot/modules/log_channel.py b/makibot/modules/log_channel.py
index 0be89d7..a54a4d8 100644
--- a/makibot/modules/log_channel.py
+++ b/makibot/modules/log_channel.py
@@ -1,7 +1,7 @@
 from functools import wraps
 from typing import Optional
 
-from tg_bot.modules.helper_funcs.misc import is_module_loaded
+from makibot.modules.helper_funcs.misc import is_module_loaded
 
 FILENAME = __name__.rsplit(".", 1)[-1]
 
@@ -11,9 +11,9 @@
     from telegram.ext import CommandHandler, run_async
     from telegram.utils.helpers import escape_markdown
 
-    from tg_bot import dispatcher, LOGGER
-    from tg_bot.modules.helper_funcs.chat_status import user_admin
-    from tg_bot.modules.sql import log_channel_sql as sql
+    from makibot import dispatcher, LOGGER
+    from makibot.modules.helper_funcs.chat_status import user_admin
+    from makibot.modules.sql import log_channel_sql as sql
 
 
     def loggable(func):
diff --git a/makibot/modules/misc.py b/makibot/modules/misc.py
index 73daa91..a6b0946 100644
--- a/makibot/modules/misc.py
+++ b/makibot/modules/misc.py
@@ -10,12 +10,12 @@
 from telegram.ext import CommandHandler, run_async, Filters
 from telegram.utils.helpers import escape_markdown, mention_html
 
-from tg_bot import dispatcher, OWNER_ID, SUDO_USERS, SUPPORT_USERS, WHITELIST_USERS, BAN_STICKER
-from tg_bot.__main__ import GDPR
-from tg_bot.__main__ import STATS, USER_INFO
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.extraction import extract_user
-from tg_bot.modules.helper_funcs.filters import CustomFilters
+from makibot import dispatcher, OWNER_ID, SUDO_USERS, SUPPORT_USERS, WHITELIST_USERS, BAN_STICKER
+from makibot.__main__ import GDPR
+from makibot.__main__ import STATS, USER_INFO
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.extraction import extract_user
+from makibot.modules.helper_funcs.filters import CustomFilters
 
 RUN_STRINGS = (
     "Where do you think you're going?",
diff --git a/makibot/modules/msg_deleting.py b/makibot/modules/msg_deleting.py
index c066dbb..e8f27be 100644
--- a/makibot/modules/msg_deleting.py
+++ b/makibot/modules/msg_deleting.py
@@ -7,9 +7,9 @@
 from telegram.ext.dispatcher import run_async
 from telegram.utils.helpers import mention_html
 
-from tg_bot import dispatcher, LOGGER
-from tg_bot.modules.helper_funcs.chat_status import user_admin, can_delete
-from tg_bot.modules.log_channel import loggable
+from makibot import dispatcher, LOGGER
+from makibot.modules.helper_funcs.chat_status import user_admin, can_delete
+from makibot.modules.log_channel import loggable
 
 
 @run_async
diff --git a/makibot/modules/muting.py b/makibot/modules/muting.py
index c460f39..53e14e0 100644
--- a/makibot/modules/muting.py
+++ b/makibot/modules/muting.py
@@ -7,11 +7,11 @@
 from telegram.ext.dispatcher import run_async
 from telegram.utils.helpers import mention_html
 
-from tg_bot import dispatcher, LOGGER
-from tg_bot.modules.helper_funcs.chat_status import bot_admin, user_admin, is_user_admin, can_restrict
-from tg_bot.modules.helper_funcs.extraction import extract_user, extract_user_and_text
-from tg_bot.modules.helper_funcs.string_handling import extract_time
-from tg_bot.modules.log_channel import loggable
+from makibot import dispatcher, LOGGER
+from makibot.modules.helper_funcs.chat_status import bot_admin, user_admin, is_user_admin, can_restrict
+from makibot.modules.helper_funcs.extraction import extract_user, extract_user_and_text
+from makibot.modules.helper_funcs.string_handling import extract_time
+from makibot.modules.log_channel import loggable
 
 
 @run_async
diff --git a/makibot/modules/notes.py b/makibot/modules/notes.py
index 8b18be4..1430185 100644
--- a/makibot/modules/notes.py
+++ b/makibot/modules/notes.py
@@ -9,12 +9,12 @@
 from telegram.ext.dispatcher import run_async
 from telegram.utils.helpers import escape_markdown
 
-import tg_bot.modules.sql.notes_sql as sql
-from tg_bot import dispatcher, MESSAGE_DUMP, LOGGER
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.chat_status import user_admin
-from tg_bot.modules.helper_funcs.misc import build_keyboard, revert_buttons
-from tg_bot.modules.helper_funcs.msg_types import get_note_type
+import makibot.modules.sql.notes_sql as sql
+from makibot import dispatcher, MESSAGE_DUMP, LOGGER
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.chat_status import user_admin
+from makibot.modules.helper_funcs.misc import build_keyboard, revert_buttons
+from makibot.modules.helper_funcs.msg_types import get_note_type
 
 FILE_MATCHER = re.compile(r"^###file_id(!photo)?###:(.*?)(?:\s|$)")
 
diff --git a/makibot/modules/reporting.py b/makibot/modules/reporting.py
index 94ee362..2162e34 100644
--- a/makibot/modules/reporting.py
+++ b/makibot/modules/reporting.py
@@ -6,10 +6,10 @@
 from telegram.ext import CommandHandler, RegexHandler, run_async, Filters
 from telegram.utils.helpers import mention_html
 
-from tg_bot import dispatcher, LOGGER
-from tg_bot.modules.helper_funcs.chat_status import user_not_admin, user_admin
-from tg_bot.modules.log_channel import loggable
-from tg_bot.modules.sql import reporting_sql as sql
+from makibot import dispatcher, LOGGER
+from makibot.modules.helper_funcs.chat_status import user_not_admin, user_admin
+from makibot.modules.log_channel import loggable
+from makibot.modules.sql import reporting_sql as sql
 
 REPORT_GROUP = 5
 
diff --git a/makibot/modules/rss.py b/makibot/modules/rss.py
index 6a9a956..7362150 100644
--- a/makibot/modules/rss.py
+++ b/makibot/modules/rss.py
@@ -5,9 +5,9 @@
 from telegram import ParseMode, constants
 from telegram.ext import CommandHandler
 
-from tg_bot import dispatcher, updater
-from tg_bot.modules.helper_funcs.chat_status import user_admin
-from tg_bot.modules.sql import rss_sql as sql
+from makibot import dispatcher, updater
+from makibot.modules.helper_funcs.chat_status import user_admin
+from makibot.modules.sql import rss_sql as sql
 
 
 def show_url(bot, update, args):
diff --git a/makibot/modules/rules.py b/makibot/modules/rules.py
index 9dd1061..011ec05 100644
--- a/makibot/modules/rules.py
+++ b/makibot/modules/rules.py
@@ -6,10 +6,10 @@
 from telegram.ext import CommandHandler, run_async, Filters
 from telegram.utils.helpers import escape_markdown
 
-import tg_bot.modules.sql.rules_sql as sql
-from tg_bot import dispatcher
-from tg_bot.modules.helper_funcs.chat_status import user_admin
-from tg_bot.modules.helper_funcs.string_handling import markdown_parser
+import makibot.modules.sql.rules_sql as sql
+from makibot import dispatcher
+from makibot.modules.helper_funcs.chat_status import user_admin
+from makibot.modules.helper_funcs.string_handling import markdown_parser
 
 
 @run_async
diff --git a/makibot/modules/sed.py b/makibot/modules/sed.py
index 3758c90..0007e0d 100644
--- a/makibot/modules/sed.py
+++ b/makibot/modules/sed.py
@@ -5,8 +5,8 @@
 from telegram import Update, Bot
 from telegram.ext import run_async
 
-from tg_bot import dispatcher, LOGGER
-from tg_bot.modules.disable import DisableAbleRegexHandler
+from makibot import dispatcher, LOGGER
+from makibot.modules.disable import DisableAbleRegexHandler
 
 DELIMITERS = ("/", ":", "|", "_")
 
diff --git a/makibot/modules/translation.py b/makibot/modules/translation.py
index 8b2a3b8..3a1a001 100644
--- a/makibot/modules/translation.py
+++ b/makibot/modules/translation.py
@@ -5,7 +5,7 @@
 from telegram import Update, Bot
 from telegram.ext import CommandHandler
 
-from tg_bot import dispatcher
+from makibot import dispatcher
 
 # Open API key
 API_KEY = "6ae0c3a0-afdc-4532-a810-82ded0054236"
diff --git a/makibot/modules/userinfo.py b/makibot/modules/userinfo.py
index c356cb7..9abc7da 100644
--- a/makibot/modules/userinfo.py
+++ b/makibot/modules/userinfo.py
@@ -6,10 +6,10 @@
 from telegram.ext.dispatcher import run_async
 from telegram.utils.helpers import escape_markdown
 
-import tg_bot.modules.sql.userinfo_sql as sql
-from tg_bot import dispatcher, SUDO_USERS
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.extraction import extract_user
+import makibot.modules.sql.userinfo_sql as sql
+from makibot import dispatcher, SUDO_USERS
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.extraction import extract_user
 
 
 @run_async
diff --git a/makibot/modules/users.py b/makibot/modules/users.py
index 14a5a73..bde179c 100644
--- a/makibot/modules/users.py
+++ b/makibot/modules/users.py
@@ -8,9 +8,9 @@
 from telegram.ext import MessageHandler, Filters, CommandHandler
 from telegram.ext.dispatcher import run_async
 
-import tg_bot.modules.sql.users_sql as sql
-from tg_bot import dispatcher, OWNER_ID, LOGGER
-from tg_bot.modules.helper_funcs.filters import CustomFilters
+import makibot.modules.sql.users_sql as sql
+from makibot import dispatcher, OWNER_ID, LOGGER
+from makibot.modules.helper_funcs.filters import CustomFilters
 
 USERS_GROUP = 4
 
diff --git a/makibot/modules/warns.py b/makibot/modules/warns.py
index 74f0ad0..c64de20 100644
--- a/makibot/modules/warns.py
+++ b/makibot/modules/warns.py
@@ -9,16 +9,16 @@
 from telegram.ext import CommandHandler, run_async, DispatcherHandlerStop, MessageHandler, Filters, CallbackQueryHandler
 from telegram.utils.helpers import mention_html
 
-from tg_bot import dispatcher, BAN_STICKER
-from tg_bot.modules.disable import DisableAbleCommandHandler
-from tg_bot.modules.helper_funcs.chat_status import is_user_admin, bot_admin, user_admin_no_reply, user_admin, \
+from makibot import dispatcher, BAN_STICKER
+from makibot.modules.disable import DisableAbleCommandHandler
+from makibot.modules.helper_funcs.chat_status import is_user_admin, bot_admin, user_admin_no_reply, user_admin, \
     can_restrict
-from tg_bot.modules.helper_funcs.extraction import extract_text, extract_user_and_text, extract_user
-from tg_bot.modules.helper_funcs.filters import CustomFilters
-from tg_bot.modules.helper_funcs.misc import split_message
-from tg_bot.modules.helper_funcs.string_handling import split_quotes
-from tg_bot.modules.log_channel import loggable
-from tg_bot.modules.sql import warns_sql as sql
+from makibot.modules.helper_funcs.extraction import extract_text, extract_user_and_text, extract_user
+from makibot.modules.helper_funcs.filters import CustomFilters
+from makibot.modules.helper_funcs.misc import split_message
+from makibot.modules.helper_funcs.string_handling import split_quotes
+from makibot.modules.log_channel import loggable
+from makibot.modules.sql import warns_sql as sql
 
 WARN_HANDLER_GROUP = 9
 CURRENT_WARNING_FILTER_STRING = "<b>Current warning filters in this chat:</b>\n"
diff --git a/makibot/modules/welcome.py b/makibot/modules/welcome.py
index 2afa46b..b687039 100644
--- a/makibot/modules/welcome.py
+++ b/makibot/modules/welcome.py
@@ -7,14 +7,14 @@
 from telegram.ext import MessageHandler, Filters, CommandHandler, run_async
 from telegram.utils.helpers import mention_markdown, mention_html, escape_markdown
 
-import tg_bot.modules.sql.welcome_sql as sql
-from tg_bot import dispatcher, OWNER_ID, LOGGER
-from tg_bot.modules.helper_funcs.chat_status import user_admin
-from tg_bot.modules.helper_funcs.misc import build_keyboard, revert_buttons
-from tg_bot.modules.helper_funcs.msg_types import get_welcome_type
-from tg_bot.modules.helper_funcs.string_handling import markdown_parser, \
+import makibot.modules.sql.welcome_sql as sql
+from makibot import dispatcher, OWNER_ID, LOGGER
+from makibot.modules.helper_funcs.chat_status import user_admin
+from makibot.modules.helper_funcs.misc import build_keyboard, revert_buttons
+from makibot.modules.helper_funcs.msg_types import get_welcome_type
+from makibot.modules.helper_funcs.string_handling import markdown_parser, \
     escape_invalid_curly_brackets
-from tg_bot.modules.log_channel import loggable
+from makibot.modules.log_channel import loggable
 
 VALID_WELCOME_FORMATTERS = ['first', 'last', 'fullname', 'username', 'id', 'count', 'chatname', 'mention']