diff --git a/core/lib/utils/app_logger.dart b/core/lib/utils/app_logger.dart
index 7d7f5a79f..7664a65b1 100644
--- a/core/lib/utils/app_logger.dart
+++ b/core/lib/utils/app_logger.dart
@@ -42,7 +42,7 @@ void log(String? value, {Level level = Level.info}) {
     }
   }
   // ignore: avoid_print
-  print('[TeamMail] $logsStr');
+  print('[TwakeMail] $logsStr');
 }
 
 void logError(String? value) => log(value, level: Level.error);
diff --git a/docs/configuration/oidc_configuration.md b/docs/configuration/oidc_configuration.md
index 1dcfc8063..51f42480d 100644
--- a/docs/configuration/oidc_configuration.md
+++ b/docs/configuration/oidc_configuration.md
@@ -9,7 +9,7 @@
 - Other configurations depend on the platform:
 
 #### Web:
-- `DOMAIN_REDIRECT_URL`:  URL of your TeamMail web application
+- `DOMAIN_REDIRECT_URL`:  URL of your TwakeMail web application
 - `WEB_OIDC_CLIENT_ID`: Client ID of your OIDC application
 
 #### Mobile:
diff --git a/fcm/README.md b/fcm/README.md
index 2bdcff902..994a1f4f1 100644
--- a/fcm/README.md
+++ b/fcm/README.md
@@ -1,3 +1,3 @@
 # fcm
 
-TeamMail FCM extension
\ No newline at end of file
+TwakeMail FCM extension
\ No newline at end of file
diff --git a/fcm/pubspec.yaml b/fcm/pubspec.yaml
index ae1e8acd9..fc1464a52 100644
--- a/fcm/pubspec.yaml
+++ b/fcm/pubspec.yaml
@@ -1,5 +1,5 @@
 name: fcm
-description: TeamMail FCM extension
+description: TwakeMail FCM extension
 publish_to: 'none'
 
 version: 1.0.0+1
diff --git a/ios/TwakeCore/Logger/TwakeLogger.swift b/ios/TwakeCore/Logger/TwakeLogger.swift
index 4a5a16dcd..18f8f7e2b 100644
--- a/ios/TwakeCore/Logger/TwakeLogger.swift
+++ b/ios/TwakeCore/Logger/TwakeLogger.swift
@@ -4,6 +4,6 @@ class TwakeLogger {
     static let shared: TwakeLogger = TwakeLogger()
     
     func log(message: String) {
-        debugPrint(message)
+        debugPrint("[TwakeMail] \(message)")
     }
 }
diff --git a/lib/features/push_notification/presentation/utils/fcm_utils.dart b/lib/features/push_notification/presentation/utils/fcm_utils.dart
index 3045cccde..74416fa4a 100644
--- a/lib/features/push_notification/presentation/utils/fcm_utils.dart
+++ b/lib/features/push_notification/presentation/utils/fcm_utils.dart
@@ -25,7 +25,7 @@ class FcmUtils {
 
   static FcmUtils get instance => _instance;
 
-  static const String hashCodeKey = 'TeamMail';
+  static const String hashCodeKey = 'TwakeMail';
   static final List<TypeName> defaultFirebaseRegistrationTypes = [
     TypeName.emailType,
     TypeName.mailboxType,