diff --git a/src/Eppie.App/Eppie.App.Shared/Services/StorageItemsService.cs b/src/Eppie.App/Eppie.App.Shared/Services/StorageItemsService.cs
index ef20667e..d7342367 100644
--- a/src/Eppie.App/Eppie.App.Shared/Services/StorageItemsService.cs
+++ b/src/Eppie.App/Eppie.App.Shared/Services/StorageItemsService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
-using Tuvi.App.Shared.Behaviors;
+using Eppie.App.UI.Behaviors;
 using Tuvi.App.ViewModels;
 using Tuvi.App.ViewModels.Services;
 using Windows.Storage;
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/AccountSettingsPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/AccountSettingsPage.xaml
index 332e44c3..a0cd12fb 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/AccountSettingsPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/AccountSettingsPage.xaml
@@ -1,7 +1,7 @@
 <local:AccountSettingsPageBase x:Class="Tuvi.App.Shared.Views.AccountSettingsPage"
                                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                               xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                               xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                                xmlns:controls="using:Tuvi.App.Shared.Controls"
                                xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                                xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/DecentralizedAccountSettingsPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/DecentralizedAccountSettingsPage.xaml
index 1bc4a125..ae70f87d 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/DecentralizedAccountSettingsPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/DecentralizedAccountSettingsPage.xaml
@@ -1,7 +1,7 @@
 <local:DecentralizedAccountSettingsPageBase x:Class="Tuvi.App.Shared.Views.DecentralizedAccountSettingsPage"
                                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                            xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                                            xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                                             xmlns:controls="using:Tuvi.App.Shared.Controls"
                                             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                                             xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/IdentityManagerPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/IdentityManagerPage.xaml
index ea0d1360..7b276aeb 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/IdentityManagerPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/IdentityManagerPage.xaml
@@ -1,7 +1,7 @@
 <local:IdentityManagerPageBase x:Class="Tuvi.App.Shared.Views.IdentityManagerPage"
                                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                               xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                               xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                                xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                                xmlns:entities="using:Tuvi.Core.Entities"
                                xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/MainPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/MainPage.xaml
index 9c706b93..025c14fd 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/MainPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/MainPage.xaml
@@ -1,7 +1,7 @@
 <local:MainPageBase x:Class="Tuvi.App.Shared.Views.MainPage"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                    xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                     xmlns:controls="using:Tuvi.App.Shared.Controls"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/MessagePage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/MessagePage.xaml
index 92bef40a..dff7804c 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/MessagePage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/MessagePage.xaml
@@ -1,7 +1,7 @@
 <local:MessagePageBase x:Class="Tuvi.App.Shared.Views.MessagePage"
                        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                       xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                       xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                        xmlns:controls="using:Tuvi.App.Shared.Controls"
                        xmlns:eppie_controls="using:Eppie.App.UI.Controls"
                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/NewMessagePage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/NewMessagePage.xaml
index f6faee94..f20af1d0 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/NewMessagePage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/NewMessagePage.xaml
@@ -2,7 +2,7 @@
                           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                           xmlns:android="http://uno.ui/android"
-                          xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                          xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                           xmlns:controls="using:Tuvi.App.Shared.Controls"
                           xmlns:eppie_controls="using:Eppie.App.UI.Controls"
                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/PasswordPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/PasswordPage.xaml
index dcae4812..2e06249a 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/PasswordPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/PasswordPage.xaml
@@ -1,7 +1,7 @@
 <local:PasswordPageBase x:Class="Tuvi.App.Shared.Views.PasswordPage"
                         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                        xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                        xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                         xmlns:controls="using:Tuvi.App.Shared.Controls"
                         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                         xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/PgpKeyPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/PgpKeyPage.xaml
index 06172226..3831331e 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/PgpKeyPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/PgpKeyPage.xaml
@@ -1,7 +1,7 @@
 <local:PgpKeyPageBase x:Class="Tuvi.App.Shared.Views.PgpKeyPage"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                      xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                       xmlns:extensions="using:Tuvi.App.Shared.Extensions"
                       xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/PgpKeysPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/PgpKeysPage.xaml
index d84bf379..2ac81f24 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/PgpKeysPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/PgpKeysPage.xaml
@@ -1,7 +1,7 @@
 <local:PgpKeysPageBase x:Class="Tuvi.App.Shared.Views.PgpKeysPage"
                        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                       xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                       xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                        xmlns:extensions="using:Tuvi.App.Shared.Extensions"
                        xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/ProtonAccountSettingsPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/ProtonAccountSettingsPage.xaml
index 622f88fb..7cc548d3 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/ProtonAccountSettingsPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/ProtonAccountSettingsPage.xaml
@@ -1,7 +1,7 @@
 <local:ProtonAccountSettingsPageBase x:Class="Tuvi.App.Shared.Views.ProtonAccountSettingsPage"
                                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                     xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                                     xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                                      xmlns:controls="using:Tuvi.App.Shared.Controls"
                                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                                      xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/SeedGeneratePage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/SeedGeneratePage.xaml
index b29a6b10..8353ae4d 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/SeedGeneratePage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/SeedGeneratePage.xaml
@@ -1,7 +1,7 @@
 <local:SeedGeneratePageBase x:Class="Tuvi.App.Shared.Views.SeedGeneratePage"
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                            xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                             xmlns:controls="using:Tuvi.App.Shared.Controls"
                             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                             xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/SeedRestorePage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/SeedRestorePage.xaml
index fab25402..341d146f 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/SeedRestorePage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/SeedRestorePage.xaml
@@ -1,7 +1,7 @@
 <local:SeedRestorePageBase x:Class="Tuvi.App.Shared.Views.SeedRestorePage"
                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                           xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                           xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                            xmlns:controls="using:Tuvi.App.Shared.Controls"
                            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                            xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/SelectEmailProviderPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/SelectEmailProviderPage.xaml
index f5b33852..7956172a 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/SelectEmailProviderPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/SelectEmailProviderPage.xaml
@@ -1,7 +1,7 @@
 <local:SelectEmailProviderPageBase x:Class="Tuvi.App.Shared.Views.SelectEmailProviderPage"
                                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                   xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                                   xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                                    xmlns:controls="using:Tuvi.App.Shared.Controls"
                                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                                    xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.Shared/Views/SettingsPage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/SettingsPage.xaml
index f061a9ac..ceb6a9d3 100644
--- a/src/Eppie.App/Eppie.App.Shared/Views/SettingsPage.xaml
+++ b/src/Eppie.App/Eppie.App.Shared/Views/SettingsPage.xaml
@@ -1,7 +1,7 @@
 <local:SettingsPageBase x:Class="Tuvi.App.Shared.Views.SettingsPage"
                         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                        xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                        xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                         xmlns:controls="using:Tuvi.App.Shared.Controls"
                         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                         xmlns:extensions="using:Tuvi.App.Shared.Extensions"
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ClipboardBehaviorBase.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ClipboardBehaviorBase.cs
index 4cb201d3..d4a61b34 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ClipboardBehaviorBase.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ClipboardBehaviorBase.cs
@@ -10,7 +10,7 @@
 using Microsoft.UI.Xaml.Controls;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     public class ClipboardBehaviorBase : Behavior<Button>, IClipboardProvider
     {
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/CopyToClipboardBehavior.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/CopyToClipboardBehavior.cs
index e8953c86..9532f450 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/CopyToClipboardBehavior.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/CopyToClipboardBehavior.cs
@@ -6,7 +6,7 @@
 using Microsoft.UI.Xaml;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     public class CopyToClipboardBehavior : ClipboardBehaviorBase
     {
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/DialogBehavior.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/DialogBehavior.cs
index 1da81523..69075e1e 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/DialogBehavior.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/DialogBehavior.cs
@@ -13,7 +13,7 @@
 using Microsoft.UI.Xaml.Controls;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     public class DialogBehavior : Behavior<Page>
     {
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/FileBehavior.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/FileBehavior.cs
index b3ebf5ff..47f9746c 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/FileBehavior.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/FileBehavior.cs
@@ -18,7 +18,7 @@
 using Microsoft.UI.Xaml.Controls;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     public class FileBehavior : Behavior<Button>, IFileOperationProvider
     {
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ItemClickCommandBehavior.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ItemClickCommandBehavior.cs
index 9b8841a8..a434997a 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ItemClickCommandBehavior.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ItemClickCommandBehavior.cs
@@ -10,7 +10,7 @@
 using Microsoft.UI.Xaml.Controls;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     // ToDo: it is not used and can be deleted
     public class ItemClickCommandBehavior : Behavior<ListViewBase>
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ListViewItemClickBehavior.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ListViewItemClickBehavior.cs
index b1f3fe70..1269ab67 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ListViewItemClickBehavior.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ListViewItemClickBehavior.cs
@@ -9,7 +9,7 @@
 using Microsoft.UI.Xaml.Controls;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     public class ListViewItemClickBehavior : Behavior<ListViewBase>
     {
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ObjectToFileBehavior.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ObjectToFileBehavior.cs
index 7517a31f..f1d53233 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ObjectToFileBehavior.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/ObjectToFileBehavior.cs
@@ -8,7 +8,7 @@
 using Microsoft.UI.Xaml;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     public class AttachmentFileBehavior : ObjectToFileBehavior<Attachment> { }
 
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/PasteFromClipboardBehavior.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/PasteFromClipboardBehavior.cs
index 60788c96..e328d515 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/PasteFromClipboardBehavior.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/PasteFromClipboardBehavior.cs
@@ -6,7 +6,7 @@
 using Microsoft.UI.Xaml;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     public class PasteFromClipboardBehavior : ClipboardBehaviorBase
     {
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/TreeViewItemInvokeBehavior.cs b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/TreeViewItemInvokeBehavior.cs
index 9c52ae31..60c8b108 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/TreeViewItemInvokeBehavior.cs
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Behaviors/TreeViewItemInvokeBehavior.cs
@@ -8,7 +8,7 @@
 using Microsoft.UI.Xaml;
 #endif
 
-namespace Tuvi.App.Shared.Behaviors
+namespace Eppie.App.UI.Behaviors
 {
     public class TreeViewItemInvokeBehavior : Behavior<TreeView>
     {
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ContactsListControl.xaml b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ContactsListControl.xaml
index 53f3744c..07a84c82 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ContactsListControl.xaml
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ContactsListControl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="Tuvi.App.Shared.Controls.ContactsListControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+             xmlns:behaviors="using:Eppie.App.UI.Behaviors"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
              xmlns:local="using:Tuvi.App.Shared.Controls"
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MailBoxesListControl.xaml b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MailBoxesListControl.xaml
index 71952ddf..b3ad5247 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MailBoxesListControl.xaml
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MailBoxesListControl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="Tuvi.App.Shared.Controls.MailBoxesListControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+             xmlns:behaviors="using:Eppie.App.UI.Behaviors"
              xmlns:converters="using:Tuvi.App.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
diff --git a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MessageListControl.xaml b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MessageListControl.xaml
index 164ffcc8..98d51c34 100644
--- a/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MessageListControl.xaml
+++ b/src/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MessageListControl.xaml
@@ -1,7 +1,7 @@
 <local:BaseUserControl x:Class="Tuvi.App.Shared.Controls.MessageListControl"
                        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                       xmlns:behaviors="using:Tuvi.App.Shared.Behaviors"
+                       xmlns:behaviors="using:Eppie.App.UI.Behaviors"
                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                        xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
                        xmlns:local="using:Tuvi.App.Shared.Controls"