diff --git a/src/bitmessagekivy/baseclass/addressbook.py b/src/bitmessagekivy/baseclass/addressbook.py
index d80c3fbe..0b3386eb 100644
--- a/src/bitmessagekivy/baseclass/addressbook.py
+++ b/src/bitmessagekivy/baseclass/addressbook.py
@@ -20,14 +20,14 @@ from kivy.properties import (
 from kivy.uix.screenmanager import Screen
 from kivy.app import App
 
-from bitmessagekivy.get_platform import platform
-from bitmessagekivy import kivy_helper_search
-from bitmessagekivy.baseclass.common import (
+from pybitmessage.bitmessagekivy.get_platform import platform
+from pybitmessage.bitmessagekivy import kivy_helper_search
+from pybitmessage.bitmessagekivy.baseclass.common import (
     avatarImageFirstLetter, toast, empty_screen_label,
     ThemeClsColor, SwipeToDeleteItem, kivy_state_variables
 )
-from bitmessagekivy.baseclass.popup import SavedAddressDetailPopup
-from bitmessagekivy.baseclass.addressbook_widgets import HelperAddressBook
+from pybitmessage.bitmessagekivy.baseclass.popup import SavedAddressDetailPopup
+from pybitmessage.bitmessagekivy.baseclass.addressbook_widgets import HelperAddressBook
 from debug import logger
 from helper_sql import sqlExecute
 
diff --git a/src/bitmessagekivy/baseclass/common.py b/src/bitmessagekivy/baseclass/common.py
index db95e565..daeb701c 100644
--- a/src/bitmessagekivy/baseclass/common.py
+++ b/src/bitmessagekivy/baseclass/common.py
@@ -23,7 +23,7 @@ from kivymd.toast import kivytoast
 from kivymd.uix.card import MDCardSwipe
 from kivymd.uix.chip import MDChip
 
-from bitmessagekivy.get_platform import platform
+from pybitmessage.bitmessagekivy.get_platform import platform
 
 
 ThemeClsColor = [0.12, 0.58, 0.95, 1]
@@ -35,7 +35,7 @@ data_screens = {
         "Factory": "MailDetail()",
         "name_screen": "mailDetail",
         "object": 0,
-        "Import": "from bitmessagekivy.baseclass.maildetail import MailDetail",
+        "Import": "from pybitmessage.bitmessagekivy.baseclass.maildetail import MailDetail",
     },
 }
 
diff --git a/src/bitmessagekivy/baseclass/common_mail_detail.py b/src/bitmessagekivy/baseclass/common_mail_detail.py
index 773d60ca..f914f6da 100644
--- a/src/bitmessagekivy/baseclass/common_mail_detail.py
+++ b/src/bitmessagekivy/baseclass/common_mail_detail.py
@@ -3,8 +3,8 @@
     All Common widgets of kivy are managed here.
 """
 
-from bitmessagekivy.baseclass.maildetail import MailDetail
-from bitmessagekivy.baseclass.common import kivy_state_variables
+from pybitmessage.bitmessagekivy.baseclass.maildetail import MailDetail
+from pybitmessage.bitmessagekivy.baseclass.common import kivy_state_variables
 
 
 def mail_detail_screen(screen_name, msg_id, instance, folder, *args):  # pylint: disable=unused-argument
diff --git a/src/bitmessagekivy/baseclass/login.py b/src/bitmessagekivy/baseclass/login.py
index 6da79acf..a3862e68 100644
--- a/src/bitmessagekivy/baseclass/login.py
+++ b/src/bitmessagekivy/baseclass/login.py
@@ -14,7 +14,7 @@ from kivy.app import App
 
 from backend.address_generator import AddressGenerator  # pylint: disable=import-error
 from kivymd.uix.behaviors.elevation import RectangularElevationBehavior
-from bitmessagekivy.baseclass.common import toast
+from pybitmessage.bitmessagekivy.baseclass.common import toast
 from bmconfigparser import config
 
 
diff --git a/src/bitmessagekivy/baseclass/maildetail.py b/src/bitmessagekivy/baseclass/maildetail.py
index 4a724e21..a4913f26 100644
--- a/src/bitmessagekivy/baseclass/maildetail.py
+++ b/src/bitmessagekivy/baseclass/maildetail.py
@@ -25,11 +25,11 @@ from kivymd.uix.list import (
     IRightBodyTouch
 )
 
-from bitmessagekivy.baseclass.common import (
+from pybitmessage.bitmessagekivy.baseclass.common import (
     toast, avatarImageFirstLetter, ShowTimeHistoy, kivy_state_variables
 )
-from bitmessagekivy.baseclass.popup import SenderDetailPopup
-from bitmessagekivy.get_platform import platform
+from pybitmessage.bitmessagekivy.baseclass.popup import SenderDetailPopup
+from pybitmessage.bitmessagekivy.get_platform import platform
 from helper_sql import sqlQuery
 from helper_sent import delete, retrieve_message_details
 from helper_inbox import trash
diff --git a/src/bitmessagekivy/baseclass/payment.py b/src/bitmessagekivy/baseclass/payment.py
index 76037c79..6749e1bb 100644
--- a/src/bitmessagekivy/baseclass/payment.py
+++ b/src/bitmessagekivy/baseclass/payment.py
@@ -15,7 +15,7 @@ from kivymd.uix.list import (
     OneLineAvatarIconListItem
 )
 
-from bitmessagekivy.baseclass.common import toast, kivy_state_variables
+from pybitmessage.bitmessagekivy.baseclass.common import toast, kivy_state_variables
 
 
 class Payment(Screen):
diff --git a/src/bitmessagekivy/baseclass/popup.py b/src/bitmessagekivy/baseclass/popup.py
index a14b22fd..055385f1 100644
--- a/src/bitmessagekivy/baseclass/popup.py
+++ b/src/bitmessagekivy/baseclass/popup.py
@@ -15,10 +15,10 @@ from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.popup import Popup
 from kivy.app import App
 
-from bitmessagekivy import kivy_helper_search
-from bitmessagekivy.get_platform import platform
+from pybitmessage.bitmessagekivy import kivy_helper_search
+from pybitmessage.bitmessagekivy.get_platform import platform
 
-from bitmessagekivy.baseclass.common import toast
+from pybitmessage.bitmessagekivy.baseclass.common import toast
 
 from addresses import decodeAddress
 from debug import logger
diff --git a/src/bitmessagekivy/baseclass/scan_screen.py b/src/bitmessagekivy/baseclass/scan_screen.py
index 86549fb8..a06eca51 100644
--- a/src/bitmessagekivy/baseclass/scan_screen.py
+++ b/src/bitmessagekivy/baseclass/scan_screen.py
@@ -18,7 +18,7 @@ from kivy.properties import (
 )
 from kivy.uix.screenmanager import Screen
 
-from bitmessagekivy.get_platform import platform
+from pybitmessage.bitmessagekivy.get_platform import platform
 
 from debug import logger
 
diff --git a/src/bitmessagekivy/uikivysignaler.py b/src/bitmessagekivy/uikivysignaler.py
index 71bed933..b4ef3503 100644
--- a/src/bitmessagekivy/uikivysignaler.py
+++ b/src/bitmessagekivy/uikivysignaler.py
@@ -8,7 +8,7 @@ import queues
 import state
 
 from debug import logger
-from bitmessagekivy.baseclass.common import kivy_state_variables
+from pybitmessage.bitmessagekivy.baseclass.common import kivy_state_variables
 
 
 class UIkivySignaler(Thread):