diff --git a/src/bitmessagekivy/baseclass/addressbook.py b/src/bitmessagekivy/baseclass/addressbook.py
index 31b7499a..0f803e84 100644
--- a/src/bitmessagekivy/baseclass/addressbook.py
+++ b/src/bitmessagekivy/baseclass/addressbook.py
@@ -24,7 +24,7 @@ from kivy.app import App
 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,
+    avatar_image_first_letter, toast, empty_screen_label,
     ThemeClsColor, SwipeToDeleteItem, kivy_state_variables
 )
 from pybitmessage.bitmessagekivy.baseclass.popup import SavedAddressDetailPopup
@@ -86,7 +86,7 @@ class AddressBook(Screen, HelperAddressBook):
             listItem.theme_text_color = "Custom"
             listItem.text_color = ThemeClsColor
             image = os.path.join(
-                self.kivy_state.imageDir, "text_images", "{}.png".format(avatarImageFirstLetter(item[0].strip()))
+                self.kivy_state.imageDir, "text_images", "{}.png".format(avatar_image_first_letter(item[0].strip()))
             )
             message_row.ids.avater_img.source = image
             listItem.bind(on_release=partial(
diff --git a/src/bitmessagekivy/baseclass/maildetail.py b/src/bitmessagekivy/baseclass/maildetail.py
index a8a28066..21849754 100644
--- a/src/bitmessagekivy/baseclass/maildetail.py
+++ b/src/bitmessagekivy/baseclass/maildetail.py
@@ -26,7 +26,7 @@ from kivymd.uix.list import (
 )
 
 from pybitmessage.bitmessagekivy.baseclass.common import (
-    toast, avatarImageFirstLetter, ShowTimeHistoy, kivy_state_variables
+    toast, avatar_image_first_letter, show_time_history, kivy_state_variables
 )
 from pybitmessage.bitmessagekivy.baseclass.popup import SenderDetailPopup
 from pybitmessage.bitmessagekivy.get_platform import platform
@@ -133,11 +133,11 @@ class MailDetail(Screen):  # pylint: disable=too-many-instance-attributes
         self.message = body
         if len(data[0]) == 7:
             self.status = data[0][4]
-        self.time_tag = ShowTimeHistoy(data[0][4]) if self.kivy_state.detailPageType == 'inbox' \
-            else ShowTimeHistoy(data[0][6])
+        self.time_tag = show_time_history(data[0][4]) if self.kivy_state.detailPageType == 'inbox' \
+            else show_time_history(data[0][6])
         self.avatarImg = os.path.join(self.kivy_state.imageDir, 'draft-icon.png') \
             if self.kivy_state.detailPageType == 'draft' \
-            else (os.path.join(self.kivy_state.imageDir, 'text_images', '{0}.png'.format(avatarImageFirstLetter(
+            else (os.path.join(self.kivy_state.imageDir, 'text_images', '{0}.png'.format(avatar_image_first_letter(
                 self.subject.strip()))))
         self.timeinseconds = data[0][4] if self.kivy_state.detailPageType == 'inbox' else data[0][6]