diff --git a/Bitvault.Avalonia/Bitvault - Backup.Avalonia.csproj b/Bitvault.Avalonia/Bitvault - Backup.Avalonia.csproj
deleted file mode 100644
index c884d9b..0000000
--- a/Bitvault.Avalonia/Bitvault - Backup.Avalonia.csproj	
+++ /dev/null
@@ -1,56 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<LangVersion>latest</LangVersion>
-		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-	</PropertyGroup>
-	<ItemGroup>
-		<AvaloniaResource Include="Assets\**" />
-	</ItemGroup>
-	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-		<DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.2.999-cibuild0048140-alpha" />
-		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1" />
-		<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All" />
-		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.999-cibuild0048140-alpha" />
-		<PackageReference Include="Avalonia.Labs.Controls" Version="11.0.10.1" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview1" />
-		<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.999-cibuild0048140-alpha.1" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.3.24172.9" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.3.24172.4">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.999-cibuild0048140-alpha" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\Bitvault\Bitvault.csproj" />
-	  <ProjectReference Include="..\Toolkit\Toolkit.Avalonia\Toolkit.Avalonia.csproj" />
-	  <ProjectReference Include="..\Toolkit\Toolkit.Foundation\Toolkit.Foundation.csproj" />
-	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Avalonia\Toolkit.UI.Avalonia.csproj" />
-	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Update="AddVaultContentActionView.axaml.cs">
-	    <DependentUpon>AddVaultContentActionView.axaml</DependentUpon>
-	  </Compile>
-	  <Compile Update="OpenView.axaml.cs">
-	    <DependentUpon>OpenView.axaml</DependentUpon>
-	  </Compile>
-	  <Compile Update="ManageNavigationView.axaml.cs">
-	    <DependentUpon>ManageNavigationView.axaml</DependentUpon>
-	  </Compile>
-	  <Compile Update="VaultHeaderView.axaml.cs">
-	    <DependentUpon>VaultHeaderView.axaml</DependentUpon>
-	  </Compile>
-	  <Compile Update="VaultNavigationView.axaml.cs">
-	    <DependentUpon>VaultNavigationView.axaml</DependentUpon>
-	  </Compile>
-	</ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Bitvault.Avalonia.Desktop/Program.cs b/Wallet.Avalonia.Desktop/Program.cs
similarity index 94%
rename from Bitvault.Avalonia.Desktop/Program.cs
rename to Wallet.Avalonia.Desktop/Program.cs
index b5edbd6..a26d417 100644
--- a/Bitvault.Avalonia.Desktop/Program.cs
+++ b/Wallet.Avalonia.Desktop/Program.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using System;
 
-namespace Bitvault.Avalonia.Desktop;
+namespace Wallet.Avalonia.Desktop;
 
 internal class Program
 {
diff --git a/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj b/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
similarity index 86%
rename from Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
rename to Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
index 89e119b..4e44522 100644
--- a/Bitvault.Avalonia.Desktop/Bitvault.Avalonia.Desktop.csproj
+++ b/Wallet.Avalonia.Desktop/Wallet.Avalonia.Desktop.csproj
@@ -12,6 +12,6 @@
 		<PackageReference Include="Avalonia.Desktop" Version="11.1.0-beta2" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\Bitvault.Avalonia\Bitvault.Avalonia.csproj" />
+	  <ProjectReference Include="..\Wallet.Avalonia\Wallet.Avalonia.csproj" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Bitvault.Avalonia.Desktop/app.manifest b/Wallet.Avalonia.Desktop/app.manifest
similarity index 100%
rename from Bitvault.Avalonia.Desktop/app.manifest
rename to Wallet.Avalonia.Desktop/app.manifest
diff --git a/Bitvault.Avalonia/AddItemNavigationView.axaml b/Wallet.Avalonia/AddItemNavigationView.axaml
similarity index 75%
rename from Bitvault.Avalonia/AddItemNavigationView.axaml
rename to Wallet.Avalonia/AddItemNavigationView.axaml
index b5c583d..8ebe7be 100644
--- a/Bitvault.Avalonia/AddItemNavigationView.axaml
+++ b/Wallet.Avalonia/AddItemNavigationView.axaml
@@ -1,5 +1,5 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.AddItemNavigationView"
+    x:Class="Wallet.Avalonia.AddItemNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Header="Add item"
diff --git a/Bitvault.Avalonia/AddItemNavigationView.axaml.cs b/Wallet.Avalonia/AddItemNavigationView.axaml.cs
similarity index 86%
rename from Bitvault.Avalonia/AddItemNavigationView.axaml.cs
rename to Wallet.Avalonia/AddItemNavigationView.axaml.cs
index 59c5190..3c06794 100644
--- a/Bitvault.Avalonia/AddItemNavigationView.axaml.cs
+++ b/Wallet.Avalonia/AddItemNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class AddItemNavigationView : 
     SettingsExpander
diff --git a/Bitvault.Avalonia/AllNavigationView.axaml b/Wallet.Avalonia/AllNavigationView.axaml
similarity index 95%
rename from Bitvault.Avalonia/AllNavigationView.axaml
rename to Wallet.Avalonia/AllNavigationView.axaml
index 022a45e..a47fa03 100644
--- a/Bitvault.Avalonia/AllNavigationView.axaml
+++ b/Wallet.Avalonia/AllNavigationView.axaml
@@ -1,8 +1,8 @@
 <NavigationViewItem
-    x:Class="Bitvault.Avalonia.AllNavigationView"
+    x:Class="Wallet.Avalonia.AllNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:AllNavigationViewModel"
     Content="All"
     IsSelected="{Binding Selected}">
diff --git a/Bitvault.Avalonia/AllNavigationView.axaml.cs b/Wallet.Avalonia/AllNavigationView.axaml.cs
similarity index 84%
rename from Bitvault.Avalonia/AllNavigationView.axaml.cs
rename to Wallet.Avalonia/AllNavigationView.axaml.cs
index 76a874f..1e7f925 100644
--- a/Bitvault.Avalonia/AllNavigationView.axaml.cs
+++ b/Wallet.Avalonia/AllNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class AllNavigationView : NavigationViewItem
 {
diff --git a/Bitvault.Avalonia/App.axaml b/Wallet.Avalonia/App.axaml
similarity index 89%
rename from Bitvault.Avalonia/App.axaml
rename to Wallet.Avalonia/App.axaml
index 7f9a60e..184a51e 100644
--- a/Bitvault.Avalonia/App.axaml
+++ b/Wallet.Avalonia/App.axaml
@@ -1,5 +1,5 @@
 <Application
-    x:Class="Bitvault.Avalonia.App"
+    x:Class="Wallet.Avalonia.App"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls">
diff --git a/Bitvault.Avalonia/App.axaml.cs b/Wallet.Avalonia/App.axaml.cs
similarity index 99%
rename from Bitvault.Avalonia/App.axaml.cs
rename to Wallet.Avalonia/App.axaml.cs
index 598e48f..00e98be 100644
--- a/Bitvault.Avalonia/App.axaml.cs
+++ b/Wallet.Avalonia/App.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Bitvault.Data;
+using Wallet.Data;
 using HotAvalonia;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -13,7 +13,7 @@ using System.Linq;
 using Toolkit.Avalonia;
 using Toolkit.Foundation;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class App : Application
 {
diff --git a/Bitvault.Avalonia/AppHandler.cs b/Wallet.Avalonia/AppHandler.cs
similarity index 96%
rename from Bitvault.Avalonia/AppHandler.cs
rename to Wallet.Avalonia/AppHandler.cs
index 6b64479..a9cd1c0 100644
--- a/Bitvault.Avalonia/AppHandler.cs
+++ b/Wallet.Avalonia/AppHandler.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using System.Threading.Tasks;
 using Toolkit.Foundation;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public class AppHandler(IPublisher publisher) :
     INotificationHandler<StartedEventArgs>
diff --git a/Bitvault.Avalonia/ArchiveItemActionView.axaml b/Wallet.Avalonia/ArchiveItemActionView.axaml
similarity index 90%
rename from Bitvault.Avalonia/ArchiveItemActionView.axaml
rename to Wallet.Avalonia/ArchiveItemActionView.axaml
index 302109a..3a27141 100644
--- a/Bitvault.Avalonia/ArchiveItemActionView.axaml
+++ b/Wallet.Avalonia/ArchiveItemActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ArchiveItemActionView"
+    x:Class="Wallet.Avalonia.ArchiveItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ArchiveItemActionViewModel">
     <Button
         Width="{StaticResource ButtonWidth}"
diff --git a/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs b/Wallet.Avalonia/ArchiveItemActionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/ArchiveItemActionView.axaml.cs
rename to Wallet.Avalonia/ArchiveItemActionView.axaml.cs
index d7e0944..99f7214 100644
--- a/Bitvault.Avalonia/ArchiveItemActionView.axaml.cs
+++ b/Wallet.Avalonia/ArchiveItemActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ArchiveItemActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/ArchiveNavigationView.axaml b/Wallet.Avalonia/ArchiveNavigationView.axaml
similarity index 95%
rename from Bitvault.Avalonia/ArchiveNavigationView.axaml
rename to Wallet.Avalonia/ArchiveNavigationView.axaml
index 9762d55..34fd8c6 100644
--- a/Bitvault.Avalonia/ArchiveNavigationView.axaml
+++ b/Wallet.Avalonia/ArchiveNavigationView.axaml
@@ -1,8 +1,8 @@
 <NavigationViewItem
-    x:Class="Bitvault.Avalonia.ArchiveNavigationView"
+    x:Class="Wallet.Avalonia.ArchiveNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ArchiveNavigationViewModel"
     Content="Archive"
     IsSelected="{Binding Selected, Mode=TwoWay}">
diff --git a/Bitvault.Avalonia/ArchiveNavigationView.axaml.cs b/Wallet.Avalonia/ArchiveNavigationView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/ArchiveNavigationView.axaml.cs
rename to Wallet.Avalonia/ArchiveNavigationView.axaml.cs
index 2ce946d..c1d5be6 100644
--- a/Bitvault.Avalonia/ArchiveNavigationView.axaml.cs
+++ b/Wallet.Avalonia/ArchiveNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ArchiveNavigationView : NavigationViewItem
 {
diff --git a/Bitvault.Avalonia/Assets/avalonia-logo.ico b/Wallet.Avalonia/Assets/avalonia-logo.ico
similarity index 100%
rename from Bitvault.Avalonia/Assets/avalonia-logo.ico
rename to Wallet.Avalonia/Assets/avalonia-logo.ico
diff --git a/Bitvault.Avalonia/BackActionView.axaml b/Wallet.Avalonia/BackActionView.axaml
similarity index 97%
rename from Bitvault.Avalonia/BackActionView.axaml
rename to Wallet.Avalonia/BackActionView.axaml
index a6ab3e6..3eb5115 100644
--- a/Bitvault.Avalonia/BackActionView.axaml
+++ b/Wallet.Avalonia/BackActionView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.BackActionView"
+    x:Class="Wallet.Avalonia.BackActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <UserControl.Resources>
diff --git a/Bitvault.Avalonia/BackActionView.axaml.cs b/Wallet.Avalonia/BackActionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/BackActionView.axaml.cs
rename to Wallet.Avalonia/BackActionView.axaml.cs
index 0441f4d..cb4d577 100644
--- a/Bitvault.Avalonia/BackActionView.axaml.cs
+++ b/Wallet.Avalonia/BackActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class BackActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/CategoriesNavigationView.axaml b/Wallet.Avalonia/CategoriesNavigationView.axaml
similarity index 72%
rename from Bitvault.Avalonia/CategoriesNavigationView.axaml
rename to Wallet.Avalonia/CategoriesNavigationView.axaml
index e088589..b681180 100644
--- a/Bitvault.Avalonia/CategoriesNavigationView.axaml
+++ b/Wallet.Avalonia/CategoriesNavigationView.axaml
@@ -1,5 +1,5 @@
 <NavigationViewItem
-    x:Class="Bitvault.Avalonia.CategoriesNavigationView"
+    x:Class="Wallet.Avalonia.CategoriesNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Content="Categories" />
diff --git a/Bitvault.Avalonia/CategoriesNavigationView.axaml.cs b/Wallet.Avalonia/CategoriesNavigationView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/CategoriesNavigationView.axaml.cs
rename to Wallet.Avalonia/CategoriesNavigationView.axaml.cs
index 4590361..9a48cff 100644
--- a/Bitvault.Avalonia/CategoriesNavigationView.axaml.cs
+++ b/Wallet.Avalonia/CategoriesNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class CategoriesNavigationView : NavigationViewItem
 {
diff --git a/Bitvault.Avalonia/ConfirmItemActionView.axaml b/Wallet.Avalonia/ConfirmItemActionView.axaml
similarity index 89%
rename from Bitvault.Avalonia/ConfirmItemActionView.axaml
rename to Wallet.Avalonia/ConfirmItemActionView.axaml
index 59f939f..5709e48 100644
--- a/Bitvault.Avalonia/ConfirmItemActionView.axaml
+++ b/Wallet.Avalonia/ConfirmItemActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ConfirmItemActionView"
+    x:Class="Wallet.Avalonia.ConfirmItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ConfirmItemActionViewModel">
     <Button
         Width="{StaticResource ButtonWidth}"
diff --git a/Bitvault.Avalonia/ConfirmItemActionView.axaml.cs b/Wallet.Avalonia/ConfirmItemActionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/ConfirmItemActionView.axaml.cs
rename to Wallet.Avalonia/ConfirmItemActionView.axaml.cs
index c9b2ce4..50b7e71 100644
--- a/Bitvault.Avalonia/ConfirmItemActionView.axaml.cs
+++ b/Wallet.Avalonia/ConfirmItemActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ConfirmItemActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/CreateItemActionView.axaml b/Wallet.Avalonia/CreateItemActionView.axaml
similarity index 95%
rename from Bitvault.Avalonia/CreateItemActionView.axaml
rename to Wallet.Avalonia/CreateItemActionView.axaml
index 736082a..f1d57ff 100644
--- a/Bitvault.Avalonia/CreateItemActionView.axaml
+++ b/Wallet.Avalonia/CreateItemActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.CreateItemActionView"
+    x:Class="Wallet.Avalonia.CreateItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:CreateItemActionViewModel">
     <Button
         Height="32"
diff --git a/Bitvault.Avalonia/CreateItemActionView.axaml.cs b/Wallet.Avalonia/CreateItemActionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/CreateItemActionView.axaml.cs
rename to Wallet.Avalonia/CreateItemActionView.axaml.cs
index 0e8ecd8..ad3b426 100644
--- a/Bitvault.Avalonia/CreateItemActionView.axaml.cs
+++ b/Wallet.Avalonia/CreateItemActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class CreateItemActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/CreateWalletNavigationView.axaml b/Wallet.Avalonia/CreateWalletNavigationView.axaml
similarity index 72%
rename from Bitvault.Avalonia/CreateWalletNavigationView.axaml
rename to Wallet.Avalonia/CreateWalletNavigationView.axaml
index a775857..d6490a8 100644
--- a/Bitvault.Avalonia/CreateWalletNavigationView.axaml
+++ b/Wallet.Avalonia/CreateWalletNavigationView.axaml
@@ -1,11 +1,11 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.CreateWalletNavigationView"
+    x:Class="Wallet.Avalonia.CreateWalletNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Description="Keep organized by separating your things into vaults."
+    Description="Keep organized by separating your things into Wallets."
     Header="Create a new vault">
     <SettingsExpander.Footer>
-        <Button MinWidth="132" Content="Create vault">
+        <Button MinWidth="132" Content="Create Wallet">
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Click">
                     <NavigateAction Region="self" Route="CreateWallet" />
diff --git a/Bitvault.Avalonia/CreateWalletNavigationView.axaml.cs b/Wallet.Avalonia/CreateWalletNavigationView.axaml.cs
similarity index 86%
rename from Bitvault.Avalonia/CreateWalletNavigationView.axaml.cs
rename to Wallet.Avalonia/CreateWalletNavigationView.axaml.cs
index 05eb752..d3666e5 100644
--- a/Bitvault.Avalonia/CreateWalletNavigationView.axaml.cs
+++ b/Wallet.Avalonia/CreateWalletNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class CreateWalletNavigationView : SettingsExpander
 {
diff --git a/Bitvault.Avalonia/CreateWalletView.axaml b/Wallet.Avalonia/CreateWalletView.axaml
similarity index 82%
rename from Bitvault.Avalonia/CreateWalletView.axaml
rename to Wallet.Avalonia/CreateWalletView.axaml
index ea78f9c..2c38351 100644
--- a/Bitvault.Avalonia/CreateWalletView.axaml
+++ b/Wallet.Avalonia/CreateWalletView.axaml
@@ -1,9 +1,9 @@
 <ContentDialog
-    x:Class="Bitvault.Avalonia.CreateWalletView"
+    x:Class="Wallet.Avalonia.CreateWalletView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
-    Title="Create vault"
+    xmlns:vm="using:Wallet"
+    Title="Create Wallet"
     x:DataType="vm:CreateWalletViewModel"
     CloseButtonText="Cancel"
     PrimaryButtonText="Create">
@@ -11,7 +11,7 @@
         <TextBox
             Margin="0,0,0,18"
             Text="{Binding Name}"
-            Watermark="Enter vault name" />
+            Watermark="Enter Wallet name" />
         <TextBox
             Margin="0,0,0,18"
             Classes="revealPasswordButton"
diff --git a/Bitvault.Avalonia/CreateWalletView.axaml.cs b/Wallet.Avalonia/CreateWalletView.axaml.cs
similarity index 84%
rename from Bitvault.Avalonia/CreateWalletView.axaml.cs
rename to Wallet.Avalonia/CreateWalletView.axaml.cs
index 3c3c99e..4a47851 100644
--- a/Bitvault.Avalonia/CreateWalletView.axaml.cs
+++ b/Wallet.Avalonia/CreateWalletView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class CreateWalletView : ContentDialog
 {
diff --git a/Bitvault.Avalonia/DateEntryView.axaml b/Wallet.Avalonia/DateEntryView.axaml
similarity index 80%
rename from Bitvault.Avalonia/DateEntryView.axaml
rename to Wallet.Avalonia/DateEntryView.axaml
index a880dd8..a78f580 100644
--- a/Bitvault.Avalonia/DateEntryView.axaml
+++ b/Wallet.Avalonia/DateEntryView.axaml
@@ -1,8 +1,8 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.DateEntryView"
+    x:Class="Wallet.Avalonia.DateEntryView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:DateEntryViewModel"
     Header="{Binding Key}">
     <SettingsExpander.Footer>
diff --git a/Bitvault.Avalonia/DateEntryView.axaml.cs b/Wallet.Avalonia/DateEntryView.axaml.cs
similarity index 84%
rename from Bitvault.Avalonia/DateEntryView.axaml.cs
rename to Wallet.Avalonia/DateEntryView.axaml.cs
index 92aa2de..beb2766 100644
--- a/Bitvault.Avalonia/DateEntryView.axaml.cs
+++ b/Wallet.Avalonia/DateEntryView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class DateEntryView : 
     SettingsExpander
diff --git a/Bitvault.Avalonia/DeleteItemActionView.axaml b/Wallet.Avalonia/DeleteItemActionView.axaml
similarity index 89%
rename from Bitvault.Avalonia/DeleteItemActionView.axaml
rename to Wallet.Avalonia/DeleteItemActionView.axaml
index a256ae3..bcbc00b 100644
--- a/Bitvault.Avalonia/DeleteItemActionView.axaml
+++ b/Wallet.Avalonia/DeleteItemActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.DeleteItemActionView"
+    x:Class="Wallet.Avalonia.DeleteItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:DeleteItemActionViewModel">
     <Button
         Width="{StaticResource ButtonWidth}"
diff --git a/Bitvault.Avalonia/DeleteItemActionView.axaml.cs b/Wallet.Avalonia/DeleteItemActionView.axaml.cs
similarity index 87%
rename from Bitvault.Avalonia/DeleteItemActionView.axaml.cs
rename to Wallet.Avalonia/DeleteItemActionView.axaml.cs
index d47c1b8..389f9a0 100644
--- a/Bitvault.Avalonia/DeleteItemActionView.axaml.cs
+++ b/Wallet.Avalonia/DeleteItemActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia
+namespace Wallet.Avalonia
 {
     public partial class DeleteItemActionView : UserControl
     {
diff --git a/Bitvault.Avalonia/DismissItemActionView.axaml b/Wallet.Avalonia/DismissItemActionView.axaml
similarity index 89%
rename from Bitvault.Avalonia/DismissItemActionView.axaml
rename to Wallet.Avalonia/DismissItemActionView.axaml
index 73dc14f..ebbae31 100644
--- a/Bitvault.Avalonia/DismissItemActionView.axaml
+++ b/Wallet.Avalonia/DismissItemActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.DismissItemActionView"
+    x:Class="Wallet.Avalonia.DismissItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:DismissItemActionViewModel">
     <Button
         Width="{StaticResource ButtonWidth}"
diff --git a/Bitvault.Avalonia/DismissItemActionView.axaml.cs b/Wallet.Avalonia/DismissItemActionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/DismissItemActionView.axaml.cs
rename to Wallet.Avalonia/DismissItemActionView.axaml.cs
index 576ff14..bab8195 100644
--- a/Bitvault.Avalonia/DismissItemActionView.axaml.cs
+++ b/Wallet.Avalonia/DismissItemActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class DismissItemActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/DropdownEntryView.axaml b/Wallet.Avalonia/DropdownEntryView.axaml
similarity index 98%
rename from Bitvault.Avalonia/DropdownEntryView.axaml
rename to Wallet.Avalonia/DropdownEntryView.axaml
index 7917c51..2fc6ca3 100644
--- a/Bitvault.Avalonia/DropdownEntryView.axaml
+++ b/Wallet.Avalonia/DropdownEntryView.axaml
@@ -1,8 +1,8 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.DropdownEntryView"
+    x:Class="Wallet.Avalonia.DropdownEntryView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:DropdownEntryViewModel"
     Header="{Binding Key}">
     <SettingsExpander.Footer>
diff --git a/Bitvault.Avalonia/DropdownEntryView.axaml.cs b/Wallet.Avalonia/DropdownEntryView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/DropdownEntryView.axaml.cs
rename to Wallet.Avalonia/DropdownEntryView.axaml.cs
index 8fb2b0e..4c16426 100644
--- a/Bitvault.Avalonia/DropdownEntryView.axaml.cs
+++ b/Wallet.Avalonia/DropdownEntryView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class DropdownEntryView : 
     SettingsExpander
diff --git a/Bitvault.Avalonia/EditItemActionView.axaml b/Wallet.Avalonia/EditItemActionView.axaml
similarity index 89%
rename from Bitvault.Avalonia/EditItemActionView.axaml
rename to Wallet.Avalonia/EditItemActionView.axaml
index 710eb86..f48925d 100644
--- a/Bitvault.Avalonia/EditItemActionView.axaml
+++ b/Wallet.Avalonia/EditItemActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.EditItemActionView"
+    x:Class="Wallet.Avalonia.EditItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:EditItemActionViewModel">
     <Button
         Width="{StaticResource ButtonWidth}"
diff --git a/Bitvault.Avalonia/EditItemActionView.axaml.cs b/Wallet.Avalonia/EditItemActionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/EditItemActionView.axaml.cs
rename to Wallet.Avalonia/EditItemActionView.axaml.cs
index 2e5bfe7..90d4f5c 100644
--- a/Bitvault.Avalonia/EditItemActionView.axaml.cs
+++ b/Wallet.Avalonia/EditItemActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class EditItemActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/EmptyItemCollectionView.axaml b/Wallet.Avalonia/EmptyItemCollectionView.axaml
similarity index 93%
rename from Bitvault.Avalonia/EmptyItemCollectionView.axaml
rename to Wallet.Avalonia/EmptyItemCollectionView.axaml
index 0bb1567..823709a 100644
--- a/Bitvault.Avalonia/EmptyItemCollectionView.axaml
+++ b/Wallet.Avalonia/EmptyItemCollectionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.EmptyItemCollectionView"
+    x:Class="Wallet.Avalonia.EmptyItemCollectionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:EmptyItemCollectionViewModel">
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
         <TextBlock
diff --git a/Bitvault.Avalonia/EmptyItemCollectionView.axaml.cs b/Wallet.Avalonia/EmptyItemCollectionView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/EmptyItemCollectionView.axaml.cs
rename to Wallet.Avalonia/EmptyItemCollectionView.axaml.cs
index 6519bc0..88b86d1 100644
--- a/Bitvault.Avalonia/EmptyItemCollectionView.axaml.cs
+++ b/Wallet.Avalonia/EmptyItemCollectionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class EmptyItemCollectionView : 
     UserControl
diff --git a/Bitvault.Avalonia/FavouriteItemActionView.axaml b/Wallet.Avalonia/FavouriteItemActionView.axaml
similarity index 92%
rename from Bitvault.Avalonia/FavouriteItemActionView.axaml
rename to Wallet.Avalonia/FavouriteItemActionView.axaml
index da8b967..17e0cba 100644
--- a/Bitvault.Avalonia/FavouriteItemActionView.axaml
+++ b/Wallet.Avalonia/FavouriteItemActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.FavouriteItemActionView"
+    x:Class="Wallet.Avalonia.FavouriteItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:FavouriteItemActionViewModel">
     <Button
         Width="{StaticResource ButtonWidth}"
diff --git a/Bitvault.Avalonia/FavouriteItemActionView.axaml.cs b/Wallet.Avalonia/FavouriteItemActionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/FavouriteItemActionView.axaml.cs
rename to Wallet.Avalonia/FavouriteItemActionView.axaml.cs
index 476d46e..9de11d0 100644
--- a/Bitvault.Avalonia/FavouriteItemActionView.axaml.cs
+++ b/Wallet.Avalonia/FavouriteItemActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class FavouriteItemActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/ItemCategoryCollectionView.axaml b/Wallet.Avalonia/ItemCategoryCollectionView.axaml
similarity index 88%
rename from Bitvault.Avalonia/ItemCategoryCollectionView.axaml
rename to Wallet.Avalonia/ItemCategoryCollectionView.axaml
index 2c43b9b..4e08e10 100644
--- a/Bitvault.Avalonia/ItemCategoryCollectionView.axaml
+++ b/Wallet.Avalonia/ItemCategoryCollectionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ItemCategoryCollectionView"
+    x:Class="Wallet.Avalonia.ItemCategoryCollectionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemCategoryCollectionViewModel">
     <ListBox
         Margin="2,-1,0,0"
diff --git a/Bitvault.Avalonia/ItemCategoryCollectionView.axaml.cs b/Wallet.Avalonia/ItemCategoryCollectionView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/ItemCategoryCollectionView.axaml.cs
rename to Wallet.Avalonia/ItemCategoryCollectionView.axaml.cs
index 36cad03..abbf9ef 100644
--- a/Bitvault.Avalonia/ItemCategoryCollectionView.axaml.cs
+++ b/Wallet.Avalonia/ItemCategoryCollectionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemCategoryCollectionView : 
     UserControl
diff --git a/Bitvault.Avalonia/ItemCategoryNavigationView.axaml b/Wallet.Avalonia/ItemCategoryNavigationView.axaml
similarity index 90%
rename from Bitvault.Avalonia/ItemCategoryNavigationView.axaml
rename to Wallet.Avalonia/ItemCategoryNavigationView.axaml
index 586c2ba..b4d3c3c 100644
--- a/Bitvault.Avalonia/ItemCategoryNavigationView.axaml
+++ b/Wallet.Avalonia/ItemCategoryNavigationView.axaml
@@ -1,8 +1,8 @@
 <ListBoxItem
-    x:Class="Bitvault.Avalonia.ItemCategoryNavigationView"
+    x:Class="Wallet.Avalonia.ItemCategoryNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemCategoryNavigationViewModel"
     ListBoxExtension.IsItemInvokedEnabled="True">
     <Interaction.Behaviors>
diff --git a/Bitvault.Avalonia/ItemCategoryNavigationView.axaml.cs b/Wallet.Avalonia/ItemCategoryNavigationView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/ItemCategoryNavigationView.axaml.cs
rename to Wallet.Avalonia/ItemCategoryNavigationView.axaml.cs
index 90e45b8..937d538 100644
--- a/Bitvault.Avalonia/ItemCategoryNavigationView.axaml.cs
+++ b/Wallet.Avalonia/ItemCategoryNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemCategoryNavigationView : ListBoxItem
 {
diff --git a/Bitvault.Avalonia/ItemCollectionView.axaml b/Wallet.Avalonia/ItemCollectionView.axaml
similarity index 94%
rename from Bitvault.Avalonia/ItemCollectionView.axaml
rename to Wallet.Avalonia/ItemCollectionView.axaml
index aad4362..f584df7 100644
--- a/Bitvault.Avalonia/ItemCollectionView.axaml
+++ b/Wallet.Avalonia/ItemCollectionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ItemCollectionView"
+    x:Class="Wallet.Avalonia.ItemCollectionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemCollectionViewModel">
     <Interaction.Behaviors>
         <AttachedBehaviour>
diff --git a/Bitvault.Avalonia/ItemCollectionView.axaml.cs b/Wallet.Avalonia/ItemCollectionView.axaml.cs
similarity index 91%
rename from Bitvault.Avalonia/ItemCollectionView.axaml.cs
rename to Wallet.Avalonia/ItemCollectionView.axaml.cs
index 9932245..4ae55b3 100644
--- a/Bitvault.Avalonia/ItemCollectionView.axaml.cs
+++ b/Wallet.Avalonia/ItemCollectionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemCollectionView :
     UserControl
diff --git a/Bitvault.Avalonia/ItemCommandHeaderView.axaml b/Wallet.Avalonia/ItemCommandHeaderView.axaml
similarity index 95%
rename from Bitvault.Avalonia/ItemCommandHeaderView.axaml
rename to Wallet.Avalonia/ItemCommandHeaderView.axaml
index c97f1e6..f87638b 100644
--- a/Bitvault.Avalonia/ItemCommandHeaderView.axaml
+++ b/Wallet.Avalonia/ItemCommandHeaderView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ItemCommandHeaderView"
+    x:Class="Wallet.Avalonia.ItemCommandHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemCommandHeaderViewModel">
     <UserControl.Resources>
         <ResourceDictionary>
diff --git a/Bitvault.Avalonia/ItemCommandHeaderView.axaml.cs b/Wallet.Avalonia/ItemCommandHeaderView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/ItemCommandHeaderView.axaml.cs
rename to Wallet.Avalonia/ItemCommandHeaderView.axaml.cs
index d8d5dc9..8a5712e 100644
--- a/Bitvault.Avalonia/ItemCommandHeaderView.axaml.cs
+++ b/Wallet.Avalonia/ItemCommandHeaderView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemCommandHeaderView : UserControl
 {
diff --git a/Bitvault.Avalonia/ItemContentView.axaml b/Wallet.Avalonia/ItemContentView.axaml
similarity index 76%
rename from Bitvault.Avalonia/ItemContentView.axaml
rename to Wallet.Avalonia/ItemContentView.axaml
index b1a5f0d..6ff5eb9 100644
--- a/Bitvault.Avalonia/ItemContentView.axaml
+++ b/Wallet.Avalonia/ItemContentView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ItemContentView"
+    x:Class="Wallet.Avalonia.ItemContentView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemContentViewModel">
     <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}" />
 </UserControl>
diff --git a/Bitvault.Avalonia/ItemContentView.axaml.cs b/Wallet.Avalonia/ItemContentView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/ItemContentView.axaml.cs
rename to Wallet.Avalonia/ItemContentView.axaml.cs
index 1b241ec..1a35510 100644
--- a/Bitvault.Avalonia/ItemContentView.axaml.cs
+++ b/Wallet.Avalonia/ItemContentView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemContentView : UserControl
 {
diff --git a/Bitvault.Avalonia/ItemHeaderView.axaml b/Wallet.Avalonia/ItemHeaderView.axaml
similarity index 97%
rename from Bitvault.Avalonia/ItemHeaderView.axaml
rename to Wallet.Avalonia/ItemHeaderView.axaml
index 46b4527..bfd6b0e 100644
--- a/Bitvault.Avalonia/ItemHeaderView.axaml
+++ b/Wallet.Avalonia/ItemHeaderView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ItemHeaderView"
+    x:Class="Wallet.Avalonia.ItemHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemHeaderViewModel">
     <StackPanel Grid.Column="1" Spacing="12">
         <PersonPicture
diff --git a/Bitvault.Avalonia/ItemHeaderView.axaml.cs b/Wallet.Avalonia/ItemHeaderView.axaml.cs
similarity index 82%
rename from Bitvault.Avalonia/ItemHeaderView.axaml.cs
rename to Wallet.Avalonia/ItemHeaderView.axaml.cs
index 9092122..a8c2133 100644
--- a/Bitvault.Avalonia/ItemHeaderView.axaml.cs
+++ b/Wallet.Avalonia/ItemHeaderView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemHeaderView : UserControl
 {
diff --git a/Bitvault.Avalonia/ItemNavigationView.axaml b/Wallet.Avalonia/ItemNavigationView.axaml
similarity index 96%
rename from Bitvault.Avalonia/ItemNavigationView.axaml
rename to Wallet.Avalonia/ItemNavigationView.axaml
index 490e22f..db43cea 100644
--- a/Bitvault.Avalonia/ItemNavigationView.axaml
+++ b/Wallet.Avalonia/ItemNavigationView.axaml
@@ -1,8 +1,8 @@
 <ListBoxItem
-    x:Class="Bitvault.Avalonia.ItemNavigationView"
+    x:Class="Wallet.Avalonia.ItemNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemNavigationViewModel"
     ListBoxExtension.IsItemInvokedEnabled="True">
     <ListBoxItem.Resources>
diff --git a/Bitvault.Avalonia/ItemNavigationView.axaml.cs b/Wallet.Avalonia/ItemNavigationView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/ItemNavigationView.axaml.cs
rename to Wallet.Avalonia/ItemNavigationView.axaml.cs
index 8079503..2c4fd09 100644
--- a/Bitvault.Avalonia/ItemNavigationView.axaml.cs
+++ b/Wallet.Avalonia/ItemNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemNavigationView : ListBoxItem
 {
diff --git a/Bitvault.Avalonia/ItemSectionView.axaml b/Wallet.Avalonia/ItemSectionView.axaml
similarity index 76%
rename from Bitvault.Avalonia/ItemSectionView.axaml
rename to Wallet.Avalonia/ItemSectionView.axaml
index 4a6adf9..2914a8c 100644
--- a/Bitvault.Avalonia/ItemSectionView.axaml
+++ b/Wallet.Avalonia/ItemSectionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ItemSectionView"
+    x:Class="Wallet.Avalonia.ItemSectionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemSectionViewModel">
     <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}" />
 </UserControl>
diff --git a/Bitvault.Avalonia/ItemSectionView.axaml.cs b/Wallet.Avalonia/ItemSectionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/ItemSectionView.axaml.cs
rename to Wallet.Avalonia/ItemSectionView.axaml.cs
index 75d379a..9a124a1 100644
--- a/Bitvault.Avalonia/ItemSectionView.axaml.cs
+++ b/Wallet.Avalonia/ItemSectionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemSectionView :
     UserControl
diff --git a/Bitvault.Avalonia/ItemView.axaml b/Wallet.Avalonia/ItemView.axaml
similarity index 95%
rename from Bitvault.Avalonia/ItemView.axaml
rename to Wallet.Avalonia/ItemView.axaml
index d6dc08f..e59b36d 100644
--- a/Bitvault.Avalonia/ItemView.axaml
+++ b/Wallet.Avalonia/ItemView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ItemView"
+    x:Class="Wallet.Avalonia.ItemView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ItemViewModel">
     <Interaction.Behaviors>
         <AttachedBehaviour>
diff --git a/Bitvault.Avalonia/ItemView.axaml.cs b/Wallet.Avalonia/ItemView.axaml.cs
similarity index 80%
rename from Bitvault.Avalonia/ItemView.axaml.cs
rename to Wallet.Avalonia/ItemView.axaml.cs
index e761565..d931a60 100644
--- a/Bitvault.Avalonia/ItemView.axaml.cs
+++ b/Wallet.Avalonia/ItemView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ItemView : UserControl
 {
diff --git a/Bitvault.Avalonia/MainView.axaml b/Wallet.Avalonia/MainView.axaml
similarity index 93%
rename from Bitvault.Avalonia/MainView.axaml
rename to Wallet.Avalonia/MainView.axaml
index d6326c9..92d6ac0 100644
--- a/Bitvault.Avalonia/MainView.axaml
+++ b/Wallet.Avalonia/MainView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.MainView"
+    x:Class="Wallet.Avalonia.MainView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:MainViewModel">
     <NavigationView
         FooterMenuItemsSource="{Binding Footer}"
diff --git a/Bitvault.Avalonia/MainView.axaml.cs b/Wallet.Avalonia/MainView.axaml.cs
similarity index 80%
rename from Bitvault.Avalonia/MainView.axaml.cs
rename to Wallet.Avalonia/MainView.axaml.cs
index 5479b83..26f56eb 100644
--- a/Bitvault.Avalonia/MainView.axaml.cs
+++ b/Wallet.Avalonia/MainView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class MainView : UserControl
 {
diff --git a/Bitvault.Avalonia/MainWindow.axaml b/Wallet.Avalonia/MainWindow.axaml
similarity index 89%
rename from Bitvault.Avalonia/MainWindow.axaml
rename to Wallet.Avalonia/MainWindow.axaml
index 2eb4c38..811c20b 100644
--- a/Bitvault.Avalonia/MainWindow.axaml
+++ b/Wallet.Avalonia/MainWindow.axaml
@@ -1,8 +1,8 @@
 <windowing:AppWindow
-    x:Class="Bitvault.Avalonia.MainWindow"
+    x:Class="Wallet.Avalonia.MainWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     xmlns:windowing="using:FluentAvalonia.UI.Windowing"
     x:DataType="vm:MainWindowViewModel"
     Background="Transparent"
diff --git a/Bitvault.Avalonia/MainWindow.axaml.cs b/Wallet.Avalonia/MainWindow.axaml.cs
similarity index 90%
rename from Bitvault.Avalonia/MainWindow.axaml.cs
rename to Wallet.Avalonia/MainWindow.axaml.cs
index a639308..3810a38 100644
--- a/Bitvault.Avalonia/MainWindow.axaml.cs
+++ b/Wallet.Avalonia/MainWindow.axaml.cs
@@ -1,6 +1,6 @@
 using FluentAvalonia.UI.Windowing;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class MainWindow : AppWindow
 {
diff --git a/Bitvault.Avalonia/ManageNavigationView.axaml b/Wallet.Avalonia/ManageNavigationView.axaml
similarity index 87%
rename from Bitvault.Avalonia/ManageNavigationView.axaml
rename to Wallet.Avalonia/ManageNavigationView.axaml
index 78be9bd..14906ee 100644
--- a/Bitvault.Avalonia/ManageNavigationView.axaml
+++ b/Wallet.Avalonia/ManageNavigationView.axaml
@@ -1,5 +1,5 @@
 <NavigationViewItem
-    x:Class="Bitvault.Avalonia.ManageNavigationView"
+    x:Class="Wallet.Avalonia.ManageNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Content="Manage Wallets">
diff --git a/Bitvault.Avalonia/ManageNavigationView.axaml.cs b/Wallet.Avalonia/ManageNavigationView.axaml.cs
similarity index 84%
rename from Bitvault.Avalonia/ManageNavigationView.axaml.cs
rename to Wallet.Avalonia/ManageNavigationView.axaml.cs
index b20d040..8a52370 100644
--- a/Bitvault.Avalonia/ManageNavigationView.axaml.cs
+++ b/Wallet.Avalonia/ManageNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ManageNavigationView : NavigationViewItem
 {
diff --git a/Bitvault.Avalonia/ManageView.axaml b/Wallet.Avalonia/ManageView.axaml
similarity index 84%
rename from Bitvault.Avalonia/ManageView.axaml
rename to Wallet.Avalonia/ManageView.axaml
index 4be06ad..2f9699e 100644
--- a/Bitvault.Avalonia/ManageView.axaml
+++ b/Wallet.Avalonia/ManageView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.ManageView"
+    x:Class="Wallet.Avalonia.ManageView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:ManageViewModel">
     <ScrollViewer Padding="12" HorizontalAlignment="Stretch">
         <ItemsControl
diff --git a/Bitvault.Avalonia/ManageView.axaml.cs b/Wallet.Avalonia/ManageView.axaml.cs
similarity index 81%
rename from Bitvault.Avalonia/ManageView.axaml.cs
rename to Wallet.Avalonia/ManageView.axaml.cs
index 9af58b2..13727db 100644
--- a/Bitvault.Avalonia/ManageView.axaml.cs
+++ b/Wallet.Avalonia/ManageView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class ManageView : UserControl
 {
diff --git a/Bitvault.Avalonia/MaskedTextEntryView.axaml b/Wallet.Avalonia/MaskedTextEntryView.axaml
similarity index 97%
rename from Bitvault.Avalonia/MaskedTextEntryView.axaml
rename to Wallet.Avalonia/MaskedTextEntryView.axaml
index 8cd25a9..8ad69ff 100644
--- a/Bitvault.Avalonia/MaskedTextEntryView.axaml
+++ b/Wallet.Avalonia/MaskedTextEntryView.axaml
@@ -1,8 +1,8 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.MaskedTextEntryView"
+    x:Class="Wallet.Avalonia.MaskedTextEntryView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:MaskedTextEntryViewModel"
     Header="{Binding Key}">
     <SettingsExpander.Footer>
diff --git a/Bitvault.Avalonia/MaskedTextEntryView.axaml.cs b/Wallet.Avalonia/MaskedTextEntryView.axaml.cs
similarity index 87%
rename from Bitvault.Avalonia/MaskedTextEntryView.axaml.cs
rename to Wallet.Avalonia/MaskedTextEntryView.axaml.cs
index ed45488..bfcb666 100644
--- a/Bitvault.Avalonia/MaskedTextEntryView.axaml.cs
+++ b/Wallet.Avalonia/MaskedTextEntryView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia
+namespace Wallet.Avalonia
 {
     public partial class MaskedTextEntryView :
         SettingsExpander
diff --git a/Bitvault.Avalonia/MultilineTextEntryView.axaml b/Wallet.Avalonia/MultilineTextEntryView.axaml
similarity index 97%
rename from Bitvault.Avalonia/MultilineTextEntryView.axaml
rename to Wallet.Avalonia/MultilineTextEntryView.axaml
index ca92f23..35ac13f 100644
--- a/Bitvault.Avalonia/MultilineTextEntryView.axaml
+++ b/Wallet.Avalonia/MultilineTextEntryView.axaml
@@ -1,8 +1,8 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.MultilineTextEntryView"
+    x:Class="Wallet.Avalonia.MultilineTextEntryView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:MultilineTextEntryViewModel"
     Header="{Binding Key}">
     <TextBox Text="{Binding Value}" TextWrapping="Wrap">
diff --git a/Bitvault.Avalonia/MultilineTextEntryView.axaml.cs b/Wallet.Avalonia/MultilineTextEntryView.axaml.cs
similarity index 86%
rename from Bitvault.Avalonia/MultilineTextEntryView.axaml.cs
rename to Wallet.Avalonia/MultilineTextEntryView.axaml.cs
index c619605..0e8bbd4 100644
--- a/Bitvault.Avalonia/MultilineTextEntryView.axaml.cs
+++ b/Wallet.Avalonia/MultilineTextEntryView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class MultilineTextEntryView : 
     SettingsExpander
diff --git a/Bitvault.Avalonia/OpenWalletView.axaml b/Wallet.Avalonia/OpenWalletView.axaml
similarity index 93%
rename from Bitvault.Avalonia/OpenWalletView.axaml
rename to Wallet.Avalonia/OpenWalletView.axaml
index e762152..11245a6 100644
--- a/Bitvault.Avalonia/OpenWalletView.axaml
+++ b/Wallet.Avalonia/OpenWalletView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.OpenWalletView"
+    x:Class="Wallet.Avalonia.OpenWalletView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:OpenWalletViewModel">
     <StackPanel
         HorizontalAlignment="Center"
diff --git a/Bitvault.Avalonia/OpenWalletView.axaml.cs b/Wallet.Avalonia/OpenWalletView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/OpenWalletView.axaml.cs
rename to Wallet.Avalonia/OpenWalletView.axaml.cs
index 55634d3..2c40ff5 100644
--- a/Bitvault.Avalonia/OpenWalletView.axaml.cs
+++ b/Wallet.Avalonia/OpenWalletView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class OpenWalletView : UserControl
 {
diff --git a/Bitvault.Avalonia/PasswordEntryView.axaml b/Wallet.Avalonia/PasswordEntryView.axaml
similarity index 97%
rename from Bitvault.Avalonia/PasswordEntryView.axaml
rename to Wallet.Avalonia/PasswordEntryView.axaml
index 20c9b53..70a6a1b 100644
--- a/Bitvault.Avalonia/PasswordEntryView.axaml
+++ b/Wallet.Avalonia/PasswordEntryView.axaml
@@ -1,8 +1,8 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.PasswordEntryView"
+    x:Class="Wallet.Avalonia.PasswordEntryView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:PasswordEntryViewModel"
     Header="{Binding Key}">
     <SettingsExpander.Footer>
diff --git a/Bitvault.Avalonia/PasswordEntryView.axaml.cs b/Wallet.Avalonia/PasswordEntryView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/PasswordEntryView.axaml.cs
rename to Wallet.Avalonia/PasswordEntryView.axaml.cs
index 34826c2..ee086ac 100644
--- a/Bitvault.Avalonia/PasswordEntryView.axaml.cs
+++ b/Wallet.Avalonia/PasswordEntryView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class PasswordEntryView : 
     SettingsExpander
diff --git a/Bitvault.Avalonia/SearchWalletActionView.axaml b/Wallet.Avalonia/SearchWalletActionView.axaml
similarity index 95%
rename from Bitvault.Avalonia/SearchWalletActionView.axaml
rename to Wallet.Avalonia/SearchWalletActionView.axaml
index dfdb5aa..a1cb3c6 100644
--- a/Bitvault.Avalonia/SearchWalletActionView.axaml
+++ b/Wallet.Avalonia/SearchWalletActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.SearchWalletActionView"
+    x:Class="Wallet.Avalonia.SearchWalletActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:SearchWalletActionViewModel">
     <UserControl.Resources>
         <ResourceDictionary>
diff --git a/Bitvault.Avalonia/SearchWalletActionView.axaml.cs b/Wallet.Avalonia/SearchWalletActionView.axaml.cs
similarity index 84%
rename from Bitvault.Avalonia/SearchWalletActionView.axaml.cs
rename to Wallet.Avalonia/SearchWalletActionView.axaml.cs
index 1b1ec21..c8efc88 100644
--- a/Bitvault.Avalonia/SearchWalletActionView.axaml.cs
+++ b/Wallet.Avalonia/SearchWalletActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class SearchWalletActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/StarredNavigationView.axaml b/Wallet.Avalonia/StarredNavigationView.axaml
similarity index 95%
rename from Bitvault.Avalonia/StarredNavigationView.axaml
rename to Wallet.Avalonia/StarredNavigationView.axaml
index 919ee7e..8cd98dd 100644
--- a/Bitvault.Avalonia/StarredNavigationView.axaml
+++ b/Wallet.Avalonia/StarredNavigationView.axaml
@@ -1,8 +1,8 @@
 <NavigationViewItem
-    x:Class="Bitvault.Avalonia.StarredNavigationView"
+    x:Class="Wallet.Avalonia.StarredNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:StarredNavigationViewModel"
     Content="Starred"
     IsSelected="{Binding Selected, Mode=TwoWay}">
diff --git a/Bitvault.Avalonia/StarredNavigationView.axaml.cs b/Wallet.Avalonia/StarredNavigationView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/StarredNavigationView.axaml.cs
rename to Wallet.Avalonia/StarredNavigationView.axaml.cs
index 63ea538..1b5f130 100644
--- a/Bitvault.Avalonia/StarredNavigationView.axaml.cs
+++ b/Wallet.Avalonia/StarredNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class StarredNavigationView : NavigationViewItem
 {
diff --git a/Bitvault.Avalonia/TextEntryView.axaml b/Wallet.Avalonia/TextEntryView.axaml
similarity index 97%
rename from Bitvault.Avalonia/TextEntryView.axaml
rename to Wallet.Avalonia/TextEntryView.axaml
index a32404f..284022a 100644
--- a/Bitvault.Avalonia/TextEntryView.axaml
+++ b/Wallet.Avalonia/TextEntryView.axaml
@@ -1,8 +1,8 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.TextEntryView"
+    x:Class="Wallet.Avalonia.TextEntryView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:TextEntryViewModel"
     Header="{Binding Key}">
     <SettingsExpander.Footer>
diff --git a/Bitvault.Avalonia/TextEntryView.axaml.cs b/Wallet.Avalonia/TextEntryView.axaml.cs
similarity index 84%
rename from Bitvault.Avalonia/TextEntryView.axaml.cs
rename to Wallet.Avalonia/TextEntryView.axaml.cs
index 7d14b10..f192d08 100644
--- a/Bitvault.Avalonia/TextEntryView.axaml.cs
+++ b/Wallet.Avalonia/TextEntryView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class TextEntryView : 
     SettingsExpander
diff --git a/Bitvault.Avalonia/UnarchiveItemActionView.axaml b/Wallet.Avalonia/UnarchiveItemActionView.axaml
similarity index 89%
rename from Bitvault.Avalonia/UnarchiveItemActionView.axaml
rename to Wallet.Avalonia/UnarchiveItemActionView.axaml
index f009378..b1b4a87 100644
--- a/Bitvault.Avalonia/UnarchiveItemActionView.axaml
+++ b/Wallet.Avalonia/UnarchiveItemActionView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.UnarchiveItemActionView"
+    x:Class="Wallet.Avalonia.UnarchiveItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:UnarchiveItemActionViewModel">
     <Button
         Width="{StaticResource ButtonWidth}"
diff --git a/Bitvault.Avalonia/UnarchiveItemActionView.axaml.cs b/Wallet.Avalonia/UnarchiveItemActionView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/UnarchiveItemActionView.axaml.cs
rename to Wallet.Avalonia/UnarchiveItemActionView.axaml.cs
index a6f82c1..d3b1d7f 100644
--- a/Bitvault.Avalonia/UnarchiveItemActionView.axaml.cs
+++ b/Wallet.Avalonia/UnarchiveItemActionView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class UnarchiveItemActionView : UserControl
 {
diff --git a/Bitvault.Avalonia/Bitvault.Avalonia.csproj b/Wallet.Avalonia/Wallet.Avalonia.csproj
similarity index 98%
rename from Bitvault.Avalonia/Bitvault.Avalonia.csproj
rename to Wallet.Avalonia/Wallet.Avalonia.csproj
index ab84b2e..b419693 100644
--- a/Bitvault.Avalonia/Bitvault.Avalonia.csproj
+++ b/Wallet.Avalonia/Wallet.Avalonia.csproj
@@ -30,11 +30,11 @@
 		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-beta2" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\Bitvault\Bitvault.csproj" />
 	  <ProjectReference Include="..\Toolkit\Toolkit.Avalonia\Toolkit.Avalonia.csproj" />
 	  <ProjectReference Include="..\Toolkit\Toolkit.Foundation\Toolkit.Foundation.csproj" />
 	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Avalonia\Toolkit.UI.Avalonia.csproj" />
 	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
+	  <ProjectReference Include="..\Wallet\Wallet.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Compile Update="AddItemNavigationView.axaml.cs">
diff --git a/Bitvault.Avalonia/WalletHeaderView.axaml b/Wallet.Avalonia/WalletHeaderView.axaml
similarity index 89%
rename from Bitvault.Avalonia/WalletHeaderView.axaml
rename to Wallet.Avalonia/WalletHeaderView.axaml
index 6e032f5..c548cf1 100644
--- a/Bitvault.Avalonia/WalletHeaderView.axaml
+++ b/Wallet.Avalonia/WalletHeaderView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.WalletHeaderView"
+    x:Class="Wallet.Avalonia.WalletHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:WalletHeaderViewModel">
     <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}">
         <ItemsControl.ItemsPanel>
diff --git a/Bitvault.Avalonia/WalletHeaderView.axaml.cs b/Wallet.Avalonia/WalletHeaderView.axaml.cs
similarity index 83%
rename from Bitvault.Avalonia/WalletHeaderView.axaml.cs
rename to Wallet.Avalonia/WalletHeaderView.axaml.cs
index 403abab..c41fa82 100644
--- a/Bitvault.Avalonia/WalletHeaderView.axaml.cs
+++ b/Wallet.Avalonia/WalletHeaderView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class WalletHeaderView : UserControl
 {
diff --git a/Bitvault.Avalonia/WalletNavigationView.axaml b/Wallet.Avalonia/WalletNavigationView.axaml
similarity index 99%
rename from Bitvault.Avalonia/WalletNavigationView.axaml
rename to Wallet.Avalonia/WalletNavigationView.axaml
index 7460d9a..65b0970 100644
--- a/Bitvault.Avalonia/WalletNavigationView.axaml
+++ b/Wallet.Avalonia/WalletNavigationView.axaml
@@ -1,9 +1,9 @@
 <NavigationViewItem
-    x:Class="Bitvault.Avalonia.WalletNavigationView"
+    x:Class="Wallet.Avalonia.WalletNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:Name="NavigationViewItem"
     x:DataType="vm:WalletNavigationViewModel"
     Content="{Binding Name}"
diff --git a/Bitvault.Avalonia/WalletNavigationView.axaml.cs b/Wallet.Avalonia/WalletNavigationView.axaml.cs
similarity index 85%
rename from Bitvault.Avalonia/WalletNavigationView.axaml.cs
rename to Wallet.Avalonia/WalletNavigationView.axaml.cs
index 104e80d..20a0c63 100644
--- a/Bitvault.Avalonia/WalletNavigationView.axaml.cs
+++ b/Wallet.Avalonia/WalletNavigationView.axaml.cs
@@ -1,6 +1,6 @@
 using Toolkit.UI.Controls.Avalonia;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class WalletNavigationView : NavigationViewItem
 {
diff --git a/Bitvault.Avalonia/WalletView.axaml b/Wallet.Avalonia/WalletView.axaml
similarity index 97%
rename from Bitvault.Avalonia/WalletView.axaml
rename to Wallet.Avalonia/WalletView.axaml
index cf979db..f6ab203 100644
--- a/Bitvault.Avalonia/WalletView.axaml
+++ b/Wallet.Avalonia/WalletView.axaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.WalletView"
+    x:Class="Wallet.Avalonia.WalletView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vm="using:Bitvault"
+    xmlns:vm="using:Wallet"
     x:DataType="vm:WalletViewModel">
     <Grid
         x:Name="Container"
diff --git a/Bitvault.Avalonia/WalletView.axaml.cs b/Wallet.Avalonia/WalletView.axaml.cs
similarity index 94%
rename from Bitvault.Avalonia/WalletView.axaml.cs
rename to Wallet.Avalonia/WalletView.axaml.cs
index 96112ec..6744369 100644
--- a/Bitvault.Avalonia/WalletView.axaml.cs
+++ b/Wallet.Avalonia/WalletView.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using FluentAvalonia.UI.Windowing;
 
-namespace Bitvault.Avalonia;
+namespace Wallet.Avalonia;
 
 public partial class WalletView : UserControl
 {
diff --git a/Bitvault.Data/BlobEntry.cs b/Wallet.Data/BlobEntry.cs
similarity index 92%
rename from Bitvault.Data/BlobEntry.cs
rename to Wallet.Data/BlobEntry.cs
index 9b8651e..7a66d61 100644
--- a/Bitvault.Data/BlobEntry.cs
+++ b/Wallet.Data/BlobEntry.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Bitvault.Data;
+namespace Wallet.Data;
 
 [Table("Blobs")]
 public record BlobEntry
diff --git a/Bitvault.Data/ItemEntry.cs b/Wallet.Data/ItemEntry.cs
similarity index 95%
rename from Bitvault.Data/ItemEntry.cs
rename to Wallet.Data/ItemEntry.cs
index 88c3d8b..83bfc28 100644
--- a/Bitvault.Data/ItemEntry.cs
+++ b/Wallet.Data/ItemEntry.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Bitvault.Data;
+namespace Wallet.Data;
 
 [Table("Items")]
 public record ItemEntry
diff --git a/Bitvault.Data/LockerContext.cs b/Wallet.Data/LockerContext.cs
similarity index 95%
rename from Bitvault.Data/LockerContext.cs
rename to Wallet.Data/LockerContext.cs
index 5196a37..94aea17 100644
--- a/Bitvault.Data/LockerContext.cs
+++ b/Wallet.Data/LockerContext.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace Bitvault.Data;
+namespace Wallet.Data;
 
 public class WalletContext(DbContextOptions<WalletContext> options) :
     DbContext(options)
diff --git a/Bitvault.Data/TagEntry.cs b/Wallet.Data/TagEntry.cs
similarity index 89%
rename from Bitvault.Data/TagEntry.cs
rename to Wallet.Data/TagEntry.cs
index d069c03..9185361 100644
--- a/Bitvault.Data/TagEntry.cs
+++ b/Wallet.Data/TagEntry.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Bitvault.Data;
+namespace Wallet.Data;
 
 [Table("Tags")]
 public class TagEntry
diff --git a/Bitvault.Data/Bitvault.Data.csproj b/Wallet.Data/Wallet.Data.csproj
similarity index 100%
rename from Bitvault.Data/Bitvault.Data.csproj
rename to Wallet.Data/Wallet.Data.csproj
diff --git a/Bitvault.sln b/Wallet.sln
similarity index 64%
rename from Bitvault.sln
rename to Wallet.sln
index ea07612..fbec48b 100644
--- a/Bitvault.sln
+++ b/Wallet.sln
@@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bitvault.Avalonia", "Bitvault.Avalonia\Bitvault.Avalonia.csproj", "{90E35182-A807-4AA2-87D9-32358C653FAE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bitvault.Avalonia.Desktop", "Bitvault.Avalonia.Desktop\Bitvault.Avalonia.Desktop.csproj", "{D0067AEC-503B-4C6F-B3C9-728CA2E42B6F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bitvault", "Bitvault\Bitvault.csproj", "{CE10F8C0-B0DB-40F1-9B6C-517C008B4E8F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Toolkit.Avalonia", "Toolkit\Toolkit.Avalonia\Toolkit.Avalonia.csproj", "{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Toolkit.Foundation", "Toolkit\Toolkit.Foundation\Toolkit.Foundation.csproj", "{E2E3E066-869A-40A4-8F22-657E4AD3718C}"
@@ -17,7 +11,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Toolkit.UI.Avalonia", "Tool
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Toolkit.UI.Controls.Avalonia", "Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj", "{716E252B-B758-4134-9D34-50FC42B414C6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bitvault.Data", "Bitvault.Data\Bitvault.Data.csproj", "{DB60A3F3-1250-4414-A861-567C79CC8CE3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wallet", "Wallet\Wallet.csproj", "{DB82E675-832E-49C2-BB9E-55FBF1492ED7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wallet.Data", "Wallet.Data\Wallet.Data.csproj", "{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wallet.Avalonia.Desktop", "Wallet.Avalonia.Desktop\Wallet.Avalonia.Desktop.csproj", "{6389F851-F78F-411D-AB0A-9370A686B539}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wallet.Avalonia", "Wallet.Avalonia\Wallet.Avalonia.csproj", "{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,18 +25,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{90E35182-A807-4AA2-87D9-32358C653FAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90E35182-A807-4AA2-87D9-32358C653FAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90E35182-A807-4AA2-87D9-32358C653FAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90E35182-A807-4AA2-87D9-32358C653FAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0067AEC-503B-4C6F-B3C9-728CA2E42B6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0067AEC-503B-4C6F-B3C9-728CA2E42B6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0067AEC-503B-4C6F-B3C9-728CA2E42B6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0067AEC-503B-4C6F-B3C9-728CA2E42B6F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE10F8C0-B0DB-40F1-9B6C-517C008B4E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE10F8C0-B0DB-40F1-9B6C-517C008B4E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE10F8C0-B0DB-40F1-9B6C-517C008B4E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE10F8C0-B0DB-40F1-9B6C-517C008B4E8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6AAB1E0-7E3E-4E0B-A70D-D23DC9CE50C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,10 +41,22 @@ Global
 		{716E252B-B758-4134-9D34-50FC42B414C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{716E252B-B758-4134-9D34-50FC42B414C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB60A3F3-1250-4414-A861-567C79CC8CE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB60A3F3-1250-4414-A861-567C79CC8CE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB60A3F3-1250-4414-A861-567C79CC8CE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB60A3F3-1250-4414-A861-567C79CC8CE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB82E675-832E-49C2-BB9E-55FBF1492ED7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9EF73B4-E2F7-4D8E-A964-840BE8FC87A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6389F851-F78F-411D-AB0A-9370A686B539}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6281FAAD-ACE3-448C-9E57-0B0A86964F0D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Bitvault/AddItemNavigationViewModel.cs b/Wallet/AddItemNavigationViewModel.cs
similarity index 94%
rename from Bitvault/AddItemNavigationViewModel.cs
rename to Wallet/AddItemNavigationViewModel.cs
index e4b6df2..0d7de9c 100644
--- a/Bitvault/AddItemNavigationViewModel.cs
+++ b/Wallet/AddItemNavigationViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class AddItemNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/AllNavigationViewModel.cs b/Wallet/AllNavigationViewModel.cs
similarity index 94%
rename from Bitvault/AllNavigationViewModel.cs
rename to Wallet/AllNavigationViewModel.cs
index 85b4db7..3877ed2 100644
--- a/Bitvault/AllNavigationViewModel.cs
+++ b/Wallet/AllNavigationViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class AllNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/Archive.cs b/Wallet/Archive.cs
similarity index 90%
rename from Bitvault/Archive.cs
rename to Wallet/Archive.cs
index 48075a9..d3bd3d2 100644
--- a/Bitvault/Archive.cs
+++ b/Wallet/Archive.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Archive
 {
diff --git a/Bitvault/ArchiveEventArgs.cs b/Wallet/ArchiveEventArgs.cs
similarity index 70%
rename from Bitvault/ArchiveEventArgs.cs
rename to Wallet/ArchiveEventArgs.cs
index 6eedc60..a996d3c 100644
--- a/Bitvault/ArchiveEventArgs.cs
+++ b/Wallet/ArchiveEventArgs.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ArchiveEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Bitvault/ArchiveItemActionViewModel.cs b/Wallet/ArchiveItemActionViewModel.cs
similarity index 95%
rename from Bitvault/ArchiveItemActionViewModel.cs
rename to Wallet/ArchiveItemActionViewModel.cs
index b8a1c2a..49f7c66 100644
--- a/Bitvault/ArchiveItemActionViewModel.cs
+++ b/Wallet/ArchiveItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ArchiveItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/ArchiveItemHandler.cs b/Wallet/ArchiveItemHandler.cs
similarity index 97%
rename from Bitvault/ArchiveItemHandler.cs
rename to Wallet/ArchiveItemHandler.cs
index 3fdf807..23fea10 100644
--- a/Bitvault/ArchiveItemHandler.cs
+++ b/Wallet/ArchiveItemHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class ArchiveItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
     ICache<Item<(Guid, string)>> cache,
diff --git a/Bitvault/ArchiveNavigationViewModel.cs b/Wallet/ArchiveNavigationViewModel.cs
similarity index 94%
rename from Bitvault/ArchiveNavigationViewModel.cs
rename to Wallet/ArchiveNavigationViewModel.cs
index c2fa98c..c984b9e 100644
--- a/Bitvault/ArchiveNavigationViewModel.cs
+++ b/Wallet/ArchiveNavigationViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ArchiveNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/AttachmentEntryConfiguration.cs b/Wallet/AttachmentEntryConfiguration.cs
similarity index 77%
rename from Bitvault/AttachmentEntryConfiguration.cs
rename to Wallet/AttachmentEntryConfiguration.cs
index d54701a..1f7d343 100644
--- a/Bitvault/AttachmentEntryConfiguration.cs
+++ b/Wallet/AttachmentEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record AttachmentEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/BackActionViewModel.cs b/Wallet/BackActionViewModel.cs
similarity index 95%
rename from Bitvault/BackActionViewModel.cs
rename to Wallet/BackActionViewModel.cs
index 1c0e2f9..a99aa20 100644
--- a/Bitvault/BackActionViewModel.cs
+++ b/Wallet/BackActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class BackActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/CategoriesNavigationViewModel.cs b/Wallet/CategoriesNavigationViewModel.cs
similarity index 94%
rename from Bitvault/CategoriesNavigationViewModel.cs
rename to Wallet/CategoriesNavigationViewModel.cs
index c720169..9490e48 100644
--- a/Bitvault/CategoriesNavigationViewModel.cs
+++ b/Wallet/CategoriesNavigationViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class CategoriesNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/Closed.cs b/Wallet/Closed.cs
similarity index 92%
rename from Bitvault/Closed.cs
rename to Wallet/Closed.cs
index c78db8f..20820fb 100644
--- a/Bitvault/Closed.cs
+++ b/Wallet/Closed.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public record Closed
 {
diff --git a/Bitvault/ClosedEventArgs.cs b/Wallet/ClosedEventArgs.cs
similarity index 73%
rename from Bitvault/ClosedEventArgs.cs
rename to Wallet/ClosedEventArgs.cs
index a1c587d..8be27c7 100644
--- a/Bitvault/ClosedEventArgs.cs
+++ b/Wallet/ClosedEventArgs.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ClosedEventArgs<TValue>(TValue? Value = default);
\ No newline at end of file
diff --git a/Bitvault/ConfirmCreateItemHandler.cs b/Wallet/ConfirmCreateItemHandler.cs
similarity index 97%
rename from Bitvault/ConfirmCreateItemHandler.cs
rename to Wallet/ConfirmCreateItemHandler.cs
index 04098b2..ec45d3f 100644
--- a/Bitvault/ConfirmCreateItemHandler.cs
+++ b/Wallet/ConfirmCreateItemHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class ConfirmCreateItemHandler(IMediator mediator,
     IDecoratorService<ItemConfiguration> itemConfigurationDecorator,
diff --git a/Bitvault/ConfirmItemActionViewModel.cs b/Wallet/ConfirmItemActionViewModel.cs
similarity index 95%
rename from Bitvault/ConfirmItemActionViewModel.cs
rename to Wallet/ConfirmItemActionViewModel.cs
index ffe6447..3f75946 100644
--- a/Bitvault/ConfirmItemActionViewModel.cs
+++ b/Wallet/ConfirmItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ConfirmItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/ConfirmUpdateItemHandler.cs b/Wallet/ConfirmUpdateItemHandler.cs
similarity index 98%
rename from Bitvault/ConfirmUpdateItemHandler.cs
rename to Wallet/ConfirmUpdateItemHandler.cs
index 8faccb9..973afc9 100644
--- a/Bitvault/ConfirmUpdateItemHandler.cs
+++ b/Wallet/ConfirmUpdateItemHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class ConfirmUpdateItemHandler(IDecoratorService<Item<(Guid, string)>> itemDecorator,
     IDecoratorService<ItemConfiguration> itemConfigurationDecorator,
diff --git a/Bitvault/CreateItemActionViewModel.cs b/Wallet/CreateItemActionViewModel.cs
similarity index 96%
rename from Bitvault/CreateItemActionViewModel.cs
rename to Wallet/CreateItemActionViewModel.cs
index 01f9409..0b5b91d 100644
--- a/Bitvault/CreateItemActionViewModel.cs
+++ b/Wallet/CreateItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class CreateItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/CreateItemHandler.cs b/Wallet/CreateItemHandler.cs
similarity index 97%
rename from Bitvault/CreateItemHandler.cs
rename to Wallet/CreateItemHandler.cs
index 0df110d..966ae37 100644
--- a/Bitvault/CreateItemHandler.cs
+++ b/Wallet/CreateItemHandler.cs
@@ -1,11 +1,11 @@
-using Bitvault.Data;
+using Wallet.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using System.Text;
 using System.Text.Json;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class CreateItemHandler(IDbContextFactory<WalletContext> dbContextFactory) :
     IHandler<CreateEventArgs<(Guid, string, string, ItemConfiguration)>, bool>
diff --git a/Bitvault/CreateWalletHandler.cs b/Wallet/CreateWalletHandler.cs
similarity index 88%
rename from Bitvault/CreateWalletHandler.cs
rename to Wallet/CreateWalletHandler.cs
index d97cfc4..abd5e3e 100644
--- a/Bitvault/CreateWalletHandler.cs
+++ b/Wallet/CreateWalletHandler.cs
@@ -3,7 +3,7 @@ using Microsoft.Extensions.Hosting;
 using System.Text;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class CreateWalletHandler(IWalletFactory componentFactory,
     IPublisher publisher) :
@@ -20,11 +20,11 @@ public class CreateWalletHandler(IWalletFactory componentFactory,
             {
                 if (componentFactory.Create(name) is IComponentHost host)
                 {
-                    ISecurityKeyFactory keyVaultFactory = host.Services.GetRequiredService<ISecurityKeyFactory>();
+                    ISecurityKeyFactory keyFactory = host.Services.GetRequiredService<ISecurityKeyFactory>();
                     IDecoratorService<SecurityKey> secureKeyStore = host.Services.GetRequiredService<IDecoratorService<SecurityKey>>();
                     IWalletStorageFactory WalletStorageFactory = host.Services.GetRequiredService<IWalletStorageFactory>();
 
-                    if (keyVaultFactory.Create(Encoding.UTF8.GetBytes(password)) is SecurityKey key)
+                    if (keyFactory.Create(Encoding.UTF8.GetBytes(password)) is SecurityKey key)
                     {
                         secureKeyStore.Set(key);
 
diff --git a/Bitvault/CreateWalletNavigationViewModel.cs b/Wallet/CreateWalletNavigationViewModel.cs
similarity index 94%
rename from Bitvault/CreateWalletNavigationViewModel.cs
rename to Wallet/CreateWalletNavigationViewModel.cs
index 685de9b..ceeaada 100644
--- a/Bitvault/CreateWalletNavigationViewModel.cs
+++ b/Wallet/CreateWalletNavigationViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class CreateWalletNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/CreateWalletViewModel.cs b/Wallet/CreateWalletViewModel.cs
similarity index 97%
rename from Bitvault/CreateWalletViewModel.cs
rename to Wallet/CreateWalletViewModel.cs
index 5c660b3..90c73ea 100644
--- a/Bitvault/CreateWalletViewModel.cs
+++ b/Wallet/CreateWalletViewModel.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class CreateWalletViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/CurrencyEntryConfiguration.cs b/Wallet/CurrencyEntryConfiguration.cs
similarity index 76%
rename from Bitvault/CurrencyEntryConfiguration.cs
rename to Wallet/CurrencyEntryConfiguration.cs
index 2d74d3e..f360fc6 100644
--- a/Bitvault/CurrencyEntryConfiguration.cs
+++ b/Wallet/CurrencyEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record CurrencyEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/DateEntryConfiguration.cs b/Wallet/DateEntryConfiguration.cs
similarity index 75%
rename from Bitvault/DateEntryConfiguration.cs
rename to Wallet/DateEntryConfiguration.cs
index ec3ac23..bb134cd 100644
--- a/Bitvault/DateEntryConfiguration.cs
+++ b/Wallet/DateEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record DateEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/DateEntryViewModel.cs b/Wallet/DateEntryViewModel.cs
similarity index 95%
rename from Bitvault/DateEntryViewModel.cs
rename to Wallet/DateEntryViewModel.cs
index 1b70909..de03901 100644
--- a/Bitvault/DateEntryViewModel.cs
+++ b/Wallet/DateEntryViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class DateEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/DateEntryViewModelHandler.cs b/Wallet/DateEntryViewModelHandler.cs
similarity index 98%
rename from Bitvault/DateEntryViewModelHandler.cs
rename to Wallet/DateEntryViewModelHandler.cs
index 1838556..1dc034e 100644
--- a/Bitvault/DateEntryViewModelHandler.cs
+++ b/Wallet/DateEntryViewModelHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class DateEntryViewModelHandler(IServiceFactory serviceFactory) :
     IHandler<CreateEventArgs<DateEntryConfiguration>, IItemEntryViewModel?>
diff --git a/Bitvault/DeleteItemActionViewModel.cs b/Wallet/DeleteItemActionViewModel.cs
similarity index 95%
rename from Bitvault/DeleteItemActionViewModel.cs
rename to Wallet/DeleteItemActionViewModel.cs
index eb300c3..759b32d 100644
--- a/Bitvault/DeleteItemActionViewModel.cs
+++ b/Wallet/DeleteItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class DeleteItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/DigitRule.cs b/Wallet/DigitRule.cs
similarity index 92%
rename from Bitvault/DigitRule.cs
rename to Wallet/DigitRule.cs
index ea32b19..b120ac0 100644
--- a/Bitvault/DigitRule.cs
+++ b/Wallet/DigitRule.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class DigitRule : 
     IPasswordRule
diff --git a/Bitvault/DismissItemActionViewModel.cs b/Wallet/DismissItemActionViewModel.cs
similarity index 95%
rename from Bitvault/DismissItemActionViewModel.cs
rename to Wallet/DismissItemActionViewModel.cs
index 364e04a..438e976 100644
--- a/Bitvault/DismissItemActionViewModel.cs
+++ b/Wallet/DismissItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class DismissItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/DiversityBonusRule.cs b/Wallet/DiversityBonusRule.cs
similarity index 97%
rename from Bitvault/DiversityBonusRule.cs
rename to Wallet/DiversityBonusRule.cs
index 88b088c..f188081 100644
--- a/Bitvault/DiversityBonusRule.cs
+++ b/Wallet/DiversityBonusRule.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class DiversityBonusRule : 
     IPasswordRule
diff --git a/Bitvault/DropdownEntryConfiguration.cs b/Wallet/DropdownEntryConfiguration.cs
similarity index 92%
rename from Bitvault/DropdownEntryConfiguration.cs
rename to Wallet/DropdownEntryConfiguration.cs
index 85c8015..c17b589 100644
--- a/Bitvault/DropdownEntryConfiguration.cs
+++ b/Wallet/DropdownEntryConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Bitvault;
+namespace Wallet;
 
 public record DropdownEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/DropdownEntryViewModel.cs b/Wallet/DropdownEntryViewModel.cs
similarity index 98%
rename from Bitvault/DropdownEntryViewModel.cs
rename to Wallet/DropdownEntryViewModel.cs
index d5d4dcf..77d17e7 100644
--- a/Bitvault/DropdownEntryViewModel.cs
+++ b/Wallet/DropdownEntryViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class DropdownEntryViewModel : 
     ItemEntryCollectionViewModel<DropdownValueViewModel>
diff --git a/Bitvault/DropdownEntryViewModelHandler.cs b/Wallet/DropdownEntryViewModelHandler.cs
similarity index 98%
rename from Bitvault/DropdownEntryViewModelHandler.cs
rename to Wallet/DropdownEntryViewModelHandler.cs
index e2b28c9..1064177 100644
--- a/Bitvault/DropdownEntryViewModelHandler.cs
+++ b/Wallet/DropdownEntryViewModelHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class DropdownEntryViewModelHandler(IServiceFactory serviceFactory) :
     IHandler<CreateEventArgs<DropdownEntryConfiguration>, IItemEntryViewModel?>
diff --git a/Bitvault/DropdownValueViewModel.cs b/Wallet/DropdownValueViewModel.cs
similarity index 94%
rename from Bitvault/DropdownValueViewModel.cs
rename to Wallet/DropdownValueViewModel.cs
index 877261f..442ad94 100644
--- a/Bitvault/DropdownValueViewModel.cs
+++ b/Wallet/DropdownValueViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class DropdownValueViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/EditItemActionViewModel.cs b/Wallet/EditItemActionViewModel.cs
similarity index 95%
rename from Bitvault/EditItemActionViewModel.cs
rename to Wallet/EditItemActionViewModel.cs
index 0145451..85ef79e 100644
--- a/Bitvault/EditItemActionViewModel.cs
+++ b/Wallet/EditItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class EditItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/EmptyItemCollectionViewModel.cs b/Wallet/EmptyItemCollectionViewModel.cs
similarity index 95%
rename from Bitvault/EmptyItemCollectionViewModel.cs
rename to Wallet/EmptyItemCollectionViewModel.cs
index 005c023..6ead0c6 100644
--- a/Bitvault/EmptyItemCollectionViewModel.cs
+++ b/Wallet/EmptyItemCollectionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class EmptyItemCollectionViewModel(IServiceProvider provider,
     IServiceFactory factory, 
diff --git a/Bitvault/Favourite.cs b/Wallet/Favourite.cs
similarity index 90%
rename from Bitvault/Favourite.cs
rename to Wallet/Favourite.cs
index 758093c..716e077 100644
--- a/Bitvault/Favourite.cs
+++ b/Wallet/Favourite.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Favourite
 {
diff --git a/Bitvault/FavouriteEventArgs.cs b/Wallet/FavouriteEventArgs.cs
similarity index 70%
rename from Bitvault/FavouriteEventArgs.cs
rename to Wallet/FavouriteEventArgs.cs
index c6de83a..c929ddb 100644
--- a/Bitvault/FavouriteEventArgs.cs
+++ b/Wallet/FavouriteEventArgs.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record FavouriteEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Bitvault/FavouriteItemActionViewModel.cs b/Wallet/FavouriteItemActionViewModel.cs
similarity index 97%
rename from Bitvault/FavouriteItemActionViewModel.cs
rename to Wallet/FavouriteItemActionViewModel.cs
index 7ffe03d..33b5c9c 100644
--- a/Bitvault/FavouriteItemActionViewModel.cs
+++ b/Wallet/FavouriteItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class FavouriteItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/FavouriteItemHandler.cs b/Wallet/FavouriteItemHandler.cs
similarity index 96%
rename from Bitvault/FavouriteItemHandler.cs
rename to Wallet/FavouriteItemHandler.cs
index a402b6c..63f62ac 100644
--- a/Bitvault/FavouriteItemHandler.cs
+++ b/Wallet/FavouriteItemHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class FavouriteItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
     IMediator mediator) :
diff --git a/Bitvault/Filter.cs b/Wallet/Filter.cs
similarity index 61%
rename from Bitvault/Filter.cs
rename to Wallet/Filter.cs
index 8055ac5..2352485 100644
--- a/Bitvault/Filter.cs
+++ b/Wallet/Filter.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Filter(string? Value);
\ No newline at end of file
diff --git a/Bitvault/FilterWalletNavigationViewModel.cs b/Wallet/FilterWalletNavigationViewModel.cs
similarity index 98%
rename from Bitvault/FilterWalletNavigationViewModel.cs
rename to Wallet/FilterWalletNavigationViewModel.cs
index 022745c..31e9512 100644
--- a/Bitvault/FilterWalletNavigationViewModel.cs
+++ b/Wallet/FilterWalletNavigationViewModel.cs
@@ -2,7 +2,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class FilterWalletNavigationViewModel : Observable,
     IWalletNavigationViewModel,
diff --git a/Bitvault/FooterViewModel.cs b/Wallet/FooterViewModel.cs
similarity index 95%
rename from Bitvault/FooterViewModel.cs
rename to Wallet/FooterViewModel.cs
index c503c8c..e465b88 100644
--- a/Bitvault/FooterViewModel.cs
+++ b/Wallet/FooterViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class FooterViewModel :
     ObservableCollection<IMainNavigationViewModel>
diff --git a/Bitvault/HyperlinkEntryConfiguration.cs b/Wallet/HyperlinkEntryConfiguration.cs
similarity index 76%
rename from Bitvault/HyperlinkEntryConfiguration.cs
rename to Wallet/HyperlinkEntryConfiguration.cs
index 6103f4e..a64d6b3 100644
--- a/Bitvault/HyperlinkEntryConfiguration.cs
+++ b/Wallet/HyperlinkEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record HyperlinkEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/IItemConfigurationCollection.cs b/Wallet/IItemConfigurationCollection.cs
similarity index 82%
rename from Bitvault/IItemConfigurationCollection.cs
rename to Wallet/IItemConfigurationCollection.cs
index ab6572f..cb02ad2 100644
--- a/Bitvault/IItemConfigurationCollection.cs
+++ b/Wallet/IItemConfigurationCollection.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public interface IItemConfigurationCollection :
     IReadOnlyDictionary<string, Func<ItemConfiguration>>;
diff --git a/Bitvault/IItemEntryConfiguration.cs b/Wallet/IItemEntryConfiguration.cs
similarity index 82%
rename from Bitvault/IItemEntryConfiguration.cs
rename to Wallet/IItemEntryConfiguration.cs
index 6cef570..4270f3e 100644
--- a/Bitvault/IItemEntryConfiguration.cs
+++ b/Wallet/IItemEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public interface IItemEntryConfiguration
 {
diff --git a/Bitvault/IItemEntryViewModel.cs b/Wallet/IItemEntryViewModel.cs
similarity index 70%
rename from Bitvault/IItemEntryViewModel.cs
rename to Wallet/IItemEntryViewModel.cs
index 6c36e1f..3849b88 100644
--- a/Bitvault/IItemEntryViewModel.cs
+++ b/Wallet/IItemEntryViewModel.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public interface IItemEntryViewModel :
     IDisposable;
\ No newline at end of file
diff --git a/Bitvault/IMainNavigationViewModel.cs b/Wallet/IMainNavigationViewModel.cs
similarity index 71%
rename from Bitvault/IMainNavigationViewModel.cs
rename to Wallet/IMainNavigationViewModel.cs
index 0fbbc4a..2b507e2 100644
--- a/Bitvault/IMainNavigationViewModel.cs
+++ b/Wallet/IMainNavigationViewModel.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public interface IMainNavigationViewModel : IDisposable;
\ No newline at end of file
diff --git a/Bitvault/IPasswordRule.cs b/Wallet/IPasswordRule.cs
similarity index 77%
rename from Bitvault/IPasswordRule.cs
rename to Wallet/IPasswordRule.cs
index dc7f87e..4b1c707 100644
--- a/Bitvault/IPasswordRule.cs
+++ b/Wallet/IPasswordRule.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public interface IPasswordRule
 {
diff --git a/Bitvault/ISecurityKeyFactory.cs b/Wallet/ISecurityKeyFactory.cs
similarity index 86%
rename from Bitvault/ISecurityKeyFactory.cs
rename to Wallet/ISecurityKeyFactory.cs
index dec7765..ca4d1a2 100644
--- a/Bitvault/ISecurityKeyFactory.cs
+++ b/Wallet/ISecurityKeyFactory.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public interface ISecurityKeyFactory
 {
diff --git a/Bitvault/IWalletComponent.cs b/Wallet/IWalletComponent.cs
similarity index 79%
rename from Bitvault/IWalletComponent.cs
rename to Wallet/IWalletComponent.cs
index 1823893..720bad0 100644
--- a/Bitvault/IWalletComponent.cs
+++ b/Wallet/IWalletComponent.cs
@@ -1,5 +1,5 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public interface IWalletComponent : IComponent;
\ No newline at end of file
diff --git a/Bitvault/IWalletFactory.cs b/Wallet/IWalletFactory.cs
similarity index 86%
rename from Bitvault/IWalletFactory.cs
rename to Wallet/IWalletFactory.cs
index 52d0096..34fd703 100644
--- a/Bitvault/IWalletFactory.cs
+++ b/Wallet/IWalletFactory.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault
+namespace Wallet
 {
     public interface IWalletFactory
     {
diff --git a/Bitvault/IWalletHost.cs b/Wallet/IWalletHost.cs
similarity index 79%
rename from Bitvault/IWalletHost.cs
rename to Wallet/IWalletHost.cs
index 06d8722..4e104ae 100644
--- a/Bitvault/IWalletHost.cs
+++ b/Wallet/IWalletHost.cs
@@ -1,5 +1,5 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public interface IWalletHost : IComponentHost;
\ No newline at end of file
diff --git a/Bitvault/IWalletHostCollection.cs b/Wallet/IWalletHostCollection.cs
similarity index 87%
rename from Bitvault/IWalletHostCollection.cs
rename to Wallet/IWalletHostCollection.cs
index 33bf568..7c4e35f 100644
--- a/Bitvault/IWalletHostCollection.cs
+++ b/Wallet/IWalletHostCollection.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public interface IWalletHostCollection :
     IEnumerable<IComponentHost>
diff --git a/Bitvault/IWalletNavigationViewModel.cs b/Wallet/IWalletNavigationViewModel.cs
similarity index 84%
rename from Bitvault/IWalletNavigationViewModel.cs
rename to Wallet/IWalletNavigationViewModel.cs
index 5a9cfaa..e751608 100644
--- a/Bitvault/IWalletNavigationViewModel.cs
+++ b/Wallet/IWalletNavigationViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public interface IWalletNavigationViewModel :
     ISelectable,
diff --git a/Bitvault/IWalletStorageFactory.cs b/Wallet/IWalletStorageFactory.cs
similarity index 80%
rename from Bitvault/IWalletStorageFactory.cs
rename to Wallet/IWalletStorageFactory.cs
index e2fed8e..7309d38 100644
--- a/Bitvault/IWalletStorageFactory.cs
+++ b/Wallet/IWalletStorageFactory.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public interface IWalletStorageFactory
 {
diff --git a/Bitvault/IconViewModel.cs b/Wallet/IconViewModel.cs
similarity index 94%
rename from Bitvault/IconViewModel.cs
rename to Wallet/IconViewModel.cs
index 6b6a8d1..2c72ff8 100644
--- a/Bitvault/IconViewModel.cs
+++ b/Wallet/IconViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class IconViewModel : Observable
 {
diff --git a/Bitvault/ImageEntryConfiguration.cs b/Wallet/ImageEntryConfiguration.cs
similarity index 76%
rename from Bitvault/ImageEntryConfiguration.cs
rename to Wallet/ImageEntryConfiguration.cs
index 8524b4d..23f7c29 100644
--- a/Bitvault/ImageEntryConfiguration.cs
+++ b/Wallet/ImageEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ImageEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/Item.cs b/Wallet/Item.cs
similarity index 73%
rename from Bitvault/Item.cs
rename to Wallet/Item.cs
index aa919d6..01f4ce3 100644
--- a/Bitvault/Item.cs
+++ b/Wallet/Item.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Item<TValue>(TValue Value);
 
diff --git a/Bitvault/ItemCategory.cs b/Wallet/ItemCategory.cs
similarity index 77%
rename from Bitvault/ItemCategory.cs
rename to Wallet/ItemCategory.cs
index de56c6b..5daea97 100644
--- a/Bitvault/ItemCategory.cs
+++ b/Wallet/ItemCategory.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ItemCategory<TValue>(TValue Value);
 
diff --git a/Bitvault/ItemCategoryCollectionViewModel.cs b/Wallet/ItemCategoryCollectionViewModel.cs
similarity index 97%
rename from Bitvault/ItemCategoryCollectionViewModel.cs
rename to Wallet/ItemCategoryCollectionViewModel.cs
index 91ca836..7e37e3a 100644
--- a/Bitvault/ItemCategoryCollectionViewModel.cs
+++ b/Wallet/ItemCategoryCollectionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 [Notification(typeof(CreateEventArgs<ItemCategoryNavigationViewModel>), nameof(ItemCategoryCollectionViewModel))]
 public partial class ItemCategoryCollectionViewModel(IServiceProvider provider,
diff --git a/Bitvault/ItemCategoryNavigationViewModel.cs b/Wallet/ItemCategoryNavigationViewModel.cs
similarity index 97%
rename from Bitvault/ItemCategoryNavigationViewModel.cs
rename to Wallet/ItemCategoryNavigationViewModel.cs
index 1c19e8f..4d093ae 100644
--- a/Bitvault/ItemCategoryNavigationViewModel.cs
+++ b/Wallet/ItemCategoryNavigationViewModel.cs
@@ -2,7 +2,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ItemCategoryNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/ItemCollectionViewModel.cs b/Wallet/ItemCollectionViewModel.cs
similarity index 99%
rename from Bitvault/ItemCollectionViewModel.cs
rename to Wallet/ItemCollectionViewModel.cs
index 72ec314..9ec73d0 100644
--- a/Bitvault/ItemCollectionViewModel.cs
+++ b/Wallet/ItemCollectionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 [Notification(typeof(CreateEventArgs<ItemNavigationViewModel>), nameof(ItemCollectionViewModel))]
 [Notification(typeof(InsertEventArgs<ItemNavigationViewModel>), nameof(ItemCollectionViewModel))]
diff --git a/Bitvault/ItemCommandHeaderCollection.cs b/Wallet/ItemCommandHeaderCollection.cs
similarity index 88%
rename from Bitvault/ItemCommandHeaderCollection.cs
rename to Wallet/ItemCommandHeaderCollection.cs
index df8115b..70459ca 100644
--- a/Bitvault/ItemCommandHeaderCollection.cs
+++ b/Wallet/ItemCommandHeaderCollection.cs
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class ItemCommandHeaderCollection(IList<IDisposable> list) :
     ReadOnlyCollection<IDisposable>(list);
diff --git a/Bitvault/ItemCommandHeaderViewModel.cs b/Wallet/ItemCommandHeaderViewModel.cs
similarity index 97%
rename from Bitvault/ItemCommandHeaderViewModel.cs
rename to Wallet/ItemCommandHeaderViewModel.cs
index 1391038..96dbe77 100644
--- a/Bitvault/ItemCommandHeaderViewModel.cs
+++ b/Wallet/ItemCommandHeaderViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ItemCommandHeaderViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/ItemConfiguration.cs b/Wallet/ItemConfiguration.cs
similarity index 99%
rename from Bitvault/ItemConfiguration.cs
rename to Wallet/ItemConfiguration.cs
index 215d4ce..f140faf 100644
--- a/Bitvault/ItemConfiguration.cs
+++ b/Wallet/ItemConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ItemConfiguration
 {
diff --git a/Bitvault/ItemConfigurationCollection.cs b/Wallet/ItemConfigurationCollection.cs
similarity index 92%
rename from Bitvault/ItemConfigurationCollection.cs
rename to Wallet/ItemConfigurationCollection.cs
index 323761d..f3cf712 100644
--- a/Bitvault/ItemConfigurationCollection.cs
+++ b/Wallet/ItemConfigurationCollection.cs
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class ItemConfigurationCollection(IDictionary<string, Func<ItemConfiguration>> dictionary) : 
     ReadOnlyDictionary<string, Func<ItemConfiguration>>(dictionary),
diff --git a/Bitvault/ItemContent.cs b/Wallet/ItemContent.cs
similarity index 54%
rename from Bitvault/ItemContent.cs
rename to Wallet/ItemContent.cs
index fc80092..dceb547 100644
--- a/Bitvault/ItemContent.cs
+++ b/Wallet/ItemContent.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ItemContent;
\ No newline at end of file
diff --git a/Bitvault/ItemContentViewModel.cs b/Wallet/ItemContentViewModel.cs
similarity index 98%
rename from Bitvault/ItemContentViewModel.cs
rename to Wallet/ItemContentViewModel.cs
index 61fe059..eb91ff8 100644
--- a/Bitvault/ItemContentViewModel.cs
+++ b/Wallet/ItemContentViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 [Notification(typeof(CreateEventArgs<ItemSectionViewModel>), nameof(ItemContentViewModel))]
 public partial class ItemContentViewModel(IServiceProvider provider,
diff --git a/Bitvault/ItemCreatedHandler.cs b/Wallet/ItemCreatedHandler.cs
similarity index 98%
rename from Bitvault/ItemCreatedHandler.cs
rename to Wallet/ItemCreatedHandler.cs
index 16cefa0..621cc9c 100644
--- a/Bitvault/ItemCreatedHandler.cs
+++ b/Wallet/ItemCreatedHandler.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class ItemCreatedHandler(IServiceProvider serviceProvider,
     ICache<Item<(Guid, string)>> cache,
diff --git a/Bitvault/ItemEntryCollectionViewModel.cs b/Wallet/ItemEntryCollectionViewModel.cs
similarity index 99%
rename from Bitvault/ItemEntryCollectionViewModel.cs
rename to Wallet/ItemEntryCollectionViewModel.cs
index c34cb08..23b1fac 100644
--- a/Bitvault/ItemEntryCollectionViewModel.cs
+++ b/Wallet/ItemEntryCollectionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ItemEntryCollectionViewModel<TItem> : 
     ObservableCollection<TItem, string, object>,
diff --git a/Bitvault/ItemEntryConfiguration.cs b/Wallet/ItemEntryConfiguration.cs
similarity index 98%
rename from Bitvault/ItemEntryConfiguration.cs
rename to Wallet/ItemEntryConfiguration.cs
index 672f82d..37a9fba 100644
--- a/Bitvault/ItemEntryConfiguration.cs
+++ b/Wallet/ItemEntryConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Bitvault;
+namespace Wallet;
 
 [JsonDerivedType(typeof(DropdownEntryConfiguration), typeDiscriminator: "Dropdown")]
 [JsonDerivedType(typeof(MaskedTextEntryConfiguration), typeDiscriminator: "MaskedText")]
diff --git a/Bitvault/ItemEntryViewModel.cs b/Wallet/ItemEntryViewModel.cs
similarity index 98%
rename from Bitvault/ItemEntryViewModel.cs
rename to Wallet/ItemEntryViewModel.cs
index 416e6ea..0b2faca 100644
--- a/Bitvault/ItemEntryViewModel.cs
+++ b/Wallet/ItemEntryViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ItemEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/ItemHeader.cs b/Wallet/ItemHeader.cs
similarity index 76%
rename from Bitvault/ItemHeader.cs
rename to Wallet/ItemHeader.cs
index 63a8cea..7276eda 100644
--- a/Bitvault/ItemHeader.cs
+++ b/Wallet/ItemHeader.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ItemHeader<TValue>(TValue Value);
 
diff --git a/Bitvault/ItemHeaderViewModel.cs b/Wallet/ItemHeaderViewModel.cs
similarity index 99%
rename from Bitvault/ItemHeaderViewModel.cs
rename to Wallet/ItemHeaderViewModel.cs
index 845d26a..d424c84 100644
--- a/Bitvault/ItemHeaderViewModel.cs
+++ b/Wallet/ItemHeaderViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ItemHeaderViewModel : 
     Observable<string, string>,
diff --git a/Bitvault/ItemModifiedHandler.cs b/Wallet/ItemModifiedHandler.cs
similarity index 98%
rename from Bitvault/ItemModifiedHandler.cs
rename to Wallet/ItemModifiedHandler.cs
index 200c3a7..ec184f4 100644
--- a/Bitvault/ItemModifiedHandler.cs
+++ b/Wallet/ItemModifiedHandler.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class ItemModifiedHandler(IServiceProvider serviceProvider,
     IPublisher publisher) :
diff --git a/Bitvault/ItemNavigationViewModel.cs b/Wallet/ItemNavigationViewModel.cs
similarity index 99%
rename from Bitvault/ItemNavigationViewModel.cs
rename to Wallet/ItemNavigationViewModel.cs
index fe73bec..4bdd250 100644
--- a/Bitvault/ItemNavigationViewModel.cs
+++ b/Wallet/ItemNavigationViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ItemNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/ItemSection.cs b/Wallet/ItemSection.cs
similarity index 54%
rename from Bitvault/ItemSection.cs
rename to Wallet/ItemSection.cs
index bbb8d06..8d18c74 100644
--- a/Bitvault/ItemSection.cs
+++ b/Wallet/ItemSection.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ItemSection;
\ No newline at end of file
diff --git a/Bitvault/ItemSectionConfiguration.cs b/Wallet/ItemSectionConfiguration.cs
similarity index 86%
rename from Bitvault/ItemSectionConfiguration.cs
rename to Wallet/ItemSectionConfiguration.cs
index 51a426b..6d636be 100644
--- a/Bitvault/ItemSectionConfiguration.cs
+++ b/Wallet/ItemSectionConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record ItemSectionConfiguration
 {
diff --git a/Bitvault/ItemSectionViewModel.cs b/Wallet/ItemSectionViewModel.cs
similarity index 96%
rename from Bitvault/ItemSectionViewModel.cs
rename to Wallet/ItemSectionViewModel.cs
index 48ec838..95d1333 100644
--- a/Bitvault/ItemSectionViewModel.cs
+++ b/Wallet/ItemSectionViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 [Notification(typeof(CreateEventArgs<IItemEntryViewModel>), nameof(Id))]
 public partial class ItemSectionViewModel(IServiceProvider provider,
diff --git a/Bitvault/ItemState.cs b/Wallet/ItemState.cs
similarity index 70%
rename from Bitvault/ItemState.cs
rename to Wallet/ItemState.cs
index 9783e9a..929c935 100644
--- a/Bitvault/ItemState.cs
+++ b/Wallet/ItemState.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public enum ItemState
 {
diff --git a/Bitvault/ItemViewModel.cs b/Wallet/ItemViewModel.cs
similarity index 99%
rename from Bitvault/ItemViewModel.cs
rename to Wallet/ItemViewModel.cs
index d1d824d..b993af4 100644
--- a/Bitvault/ItemViewModel.cs
+++ b/Wallet/ItemViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ItemViewModel :
     ObservableCollection,
diff --git a/Bitvault/LengthRule.cs b/Wallet/LengthRule.cs
similarity index 85%
rename from Bitvault/LengthRule.cs
rename to Wallet/LengthRule.cs
index f2680f5..0d708aa 100644
--- a/Bitvault/LengthRule.cs
+++ b/Wallet/LengthRule.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public class LengthRule :
     IPasswordRule
diff --git a/Bitvault/LowercaseRule.cs b/Wallet/LowercaseRule.cs
similarity index 93%
rename from Bitvault/LowercaseRule.cs
rename to Wallet/LowercaseRule.cs
index fc696a4..618e1a2 100644
--- a/Bitvault/LowercaseRule.cs
+++ b/Wallet/LowercaseRule.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class LowercaseRule : 
     IPasswordRule
diff --git a/Bitvault/MainViewModel.cs b/Wallet/MainViewModel.cs
similarity index 97%
rename from Bitvault/MainViewModel.cs
rename to Wallet/MainViewModel.cs
index 9b5fab2..d1fe9c8 100644
--- a/Bitvault/MainViewModel.cs
+++ b/Wallet/MainViewModel.cs
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 [Notification(typeof(CreateEventArgs<IMainNavigationViewModel>), nameof(MainViewModel))]
 public partial class MainViewModel :
diff --git a/Bitvault/MainWindowViewModel.cs b/Wallet/MainWindowViewModel.cs
similarity index 93%
rename from Bitvault/MainWindowViewModel.cs
rename to Wallet/MainWindowViewModel.cs
index 505bb41..536ede4 100644
--- a/Bitvault/MainWindowViewModel.cs
+++ b/Wallet/MainWindowViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class MainWindowViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/ManageNavigationViewModel.cs b/Wallet/ManageNavigationViewModel.cs
similarity index 94%
rename from Bitvault/ManageNavigationViewModel.cs
rename to Wallet/ManageNavigationViewModel.cs
index 3d5cec6..f700014 100644
--- a/Bitvault/ManageNavigationViewModel.cs
+++ b/Wallet/ManageNavigationViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ManageNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/ManageViewModel.cs b/Wallet/ManageViewModel.cs
similarity index 96%
rename from Bitvault/ManageViewModel.cs
rename to Wallet/ManageViewModel.cs
index 183541e..899f970 100644
--- a/Bitvault/ManageViewModel.cs
+++ b/Wallet/ManageViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class ManageViewModel :
     ObservableCollection,
diff --git a/Bitvault/MaskedTextEntryConfiguration.cs b/Wallet/MaskedTextEntryConfiguration.cs
similarity index 91%
rename from Bitvault/MaskedTextEntryConfiguration.cs
rename to Wallet/MaskedTextEntryConfiguration.cs
index f82a6f6..eadfe4f 100644
--- a/Bitvault/MaskedTextEntryConfiguration.cs
+++ b/Wallet/MaskedTextEntryConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Bitvault;
+namespace Wallet;
 
 public record MaskedTextEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/MaskedTextEntryViewModel.cs b/Wallet/MaskedTextEntryViewModel.cs
similarity index 96%
rename from Bitvault/MaskedTextEntryViewModel.cs
rename to Wallet/MaskedTextEntryViewModel.cs
index 5a51bb3..fd4cddf 100644
--- a/Bitvault/MaskedTextEntryViewModel.cs
+++ b/Wallet/MaskedTextEntryViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class MaskedTextEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/MaskedTextEntryViewModelHandler.cs b/Wallet/MaskedTextEntryViewModelHandler.cs
similarity index 97%
rename from Bitvault/MaskedTextEntryViewModelHandler.cs
rename to Wallet/MaskedTextEntryViewModelHandler.cs
index c592671..d654359 100644
--- a/Bitvault/MaskedTextEntryViewModelHandler.cs
+++ b/Wallet/MaskedTextEntryViewModelHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class MaskedTextEntryViewModelHandler(IServiceFactory serviceFactory) :
     IHandler<CreateEventArgs<MaskedTextEntryConfiguration>, IItemEntryViewModel?>
diff --git a/Bitvault/MultilineTextEntryConfiguration.cs b/Wallet/MultilineTextEntryConfiguration.cs
similarity index 77%
rename from Bitvault/MultilineTextEntryConfiguration.cs
rename to Wallet/MultilineTextEntryConfiguration.cs
index e0b2d99..d09ef58 100644
--- a/Bitvault/MultilineTextEntryConfiguration.cs
+++ b/Wallet/MultilineTextEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record MultilineTextEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/MultilineTextEntryViewModel.cs b/Wallet/MultilineTextEntryViewModel.cs
similarity index 96%
rename from Bitvault/MultilineTextEntryViewModel.cs
rename to Wallet/MultilineTextEntryViewModel.cs
index 720afc9..6390389 100644
--- a/Bitvault/MultilineTextEntryViewModel.cs
+++ b/Wallet/MultilineTextEntryViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class MultilineTextEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/MultilineTextEntryViewModelHandler.cs b/Wallet/MultilineTextEntryViewModelHandler.cs
similarity index 97%
rename from Bitvault/MultilineTextEntryViewModelHandler.cs
rename to Wallet/MultilineTextEntryViewModelHandler.cs
index 3538b66..696b2f1 100644
--- a/Bitvault/MultilineTextEntryViewModelHandler.cs
+++ b/Wallet/MultilineTextEntryViewModelHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class MultilineTextEntryViewModelHandler(IServiceFactory serviceFactory) :
     IHandler<CreateEventArgs<MultilineTextEntryConfiguration>, IItemEntryViewModel?>
diff --git a/Bitvault/NumberEntryConfiguration.cs b/Wallet/NumberEntryConfiguration.cs
similarity index 86%
rename from Bitvault/NumberEntryConfiguration.cs
rename to Wallet/NumberEntryConfiguration.cs
index 9ad43c8..97486d8 100644
--- a/Bitvault/NumberEntryConfiguration.cs
+++ b/Wallet/NumberEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record NumberEntryConfiguration : 
     ItemEntryConfiguration
diff --git a/Bitvault/OpenWalletHandler.cs b/Wallet/OpenWalletHandler.cs
similarity index 98%
rename from Bitvault/OpenWalletHandler.cs
rename to Wallet/OpenWalletHandler.cs
index 53c5fc7..3f31f31 100644
--- a/Bitvault/OpenWalletHandler.cs
+++ b/Wallet/OpenWalletHandler.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class OpenWalletHandler(IConfigurationDescriptor<WalletConfiguration> descriptor,
     ISecurityKeyFactory securityKeyFactory,
diff --git a/Bitvault/OpenWalletViewModel.cs b/Wallet/OpenWalletViewModel.cs
similarity index 97%
rename from Bitvault/OpenWalletViewModel.cs
rename to Wallet/OpenWalletViewModel.cs
index 3833778..ea3ca0c 100644
--- a/Bitvault/OpenWalletViewModel.cs
+++ b/Wallet/OpenWalletViewModel.cs
@@ -2,7 +2,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class OpenWalletViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/Opened.cs b/Wallet/Opened.cs
similarity index 89%
rename from Bitvault/Opened.cs
rename to Wallet/Opened.cs
index 094cb79..27bc24b 100644
--- a/Bitvault/Opened.cs
+++ b/Wallet/Opened.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Opened
 {
diff --git a/Bitvault/OpenedEventArgs.cs b/Wallet/OpenedEventArgs.cs
similarity index 73%
rename from Bitvault/OpenedEventArgs.cs
rename to Wallet/OpenedEventArgs.cs
index eda6a5b..1aca48a 100644
--- a/Bitvault/OpenedEventArgs.cs
+++ b/Wallet/OpenedEventArgs.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record OpenedEventArgs<TValue>(TValue? Value = default);
\ No newline at end of file
diff --git a/Bitvault/PasswordEntryConfiguration.cs b/Wallet/PasswordEntryConfiguration.cs
similarity index 76%
rename from Bitvault/PasswordEntryConfiguration.cs
rename to Wallet/PasswordEntryConfiguration.cs
index 1b92b68..4275dc0 100644
--- a/Bitvault/PasswordEntryConfiguration.cs
+++ b/Wallet/PasswordEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record PasswordEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/PasswordEntryViewModel.cs b/Wallet/PasswordEntryViewModel.cs
similarity index 95%
rename from Bitvault/PasswordEntryViewModel.cs
rename to Wallet/PasswordEntryViewModel.cs
index f6034ca..6af842a 100644
--- a/Bitvault/PasswordEntryViewModel.cs
+++ b/Wallet/PasswordEntryViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class PasswordEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/PasswordEntryViewModelHandler.cs b/Wallet/PasswordEntryViewModelHandler.cs
similarity index 97%
rename from Bitvault/PasswordEntryViewModelHandler.cs
rename to Wallet/PasswordEntryViewModelHandler.cs
index f9efa7a..6a29fc2 100644
--- a/Bitvault/PasswordEntryViewModelHandler.cs
+++ b/Wallet/PasswordEntryViewModelHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class PasswordEntryViewModelHandler(IServiceFactory serviceFactory) :
     IHandler<CreateEventArgs<PasswordEntryConfiguration>, IItemEntryViewModel?>
diff --git a/Bitvault/PasswordViewModel.cs b/Wallet/PasswordViewModel.cs
similarity index 94%
rename from Bitvault/PasswordViewModel.cs
rename to Wallet/PasswordViewModel.cs
index f54c75e..ac2e90b 100644
--- a/Bitvault/PasswordViewModel.cs
+++ b/Wallet/PasswordViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class PasswordViewModel : Observable
 {
diff --git a/Bitvault/PinEntryConfiguration.cs b/Wallet/PinEntryConfiguration.cs
similarity index 86%
rename from Bitvault/PinEntryConfiguration.cs
rename to Wallet/PinEntryConfiguration.cs
index 50c33fe..6876ce7 100644
--- a/Bitvault/PinEntryConfiguration.cs
+++ b/Wallet/PinEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record PinEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/QueryWalletHandler.cs b/Wallet/QueryWalletHandler.cs
similarity index 98%
rename from Bitvault/QueryWalletHandler.cs
rename to Wallet/QueryWalletHandler.cs
index 1c2896e..230f9f2 100644
--- a/Bitvault/QueryWalletHandler.cs
+++ b/Wallet/QueryWalletHandler.cs
@@ -1,9 +1,9 @@
-using Bitvault.Data;
+using Wallet.Data;
 using LinqKit;
 using Microsoft.EntityFrameworkCore;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class QueryWalletHandler(IDbContextFactory<WalletContext> dbContextFactory) :
     IHandler<QueryEventArgs<Wallet<(string, string)>>, IReadOnlyCollection<(Guid Id, string? Name, string Category, bool Favourite, bool Archived)>>
diff --git a/Bitvault/RequestItemHandler.cs b/Wallet/RequestItemHandler.cs
similarity index 97%
rename from Bitvault/RequestItemHandler.cs
rename to Wallet/RequestItemHandler.cs
index 8d139ce..388e76f 100644
--- a/Bitvault/RequestItemHandler.cs
+++ b/Wallet/RequestItemHandler.cs
@@ -1,9 +1,9 @@
-using Bitvault.Data;
+using Wallet.Data;
 using Microsoft.EntityFrameworkCore;
 using System.Text.Json;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class RequestItemHandler(IDbContextFactory<WalletContext> dbContextFactory) : 
     IHandler<RequestEventArgs<Item<Guid>>, (Guid, string, string?, string, ItemConfiguration?)>
diff --git a/Bitvault/Search.cs b/Wallet/Search.cs
similarity index 66%
rename from Bitvault/Search.cs
rename to Wallet/Search.cs
index bd18c6e..a863384 100644
--- a/Bitvault/Search.cs
+++ b/Wallet/Search.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Search<TValue>(TValue? Value);
\ No newline at end of file
diff --git a/Bitvault/SearchWalletActionViewModel.cs b/Wallet/SearchWalletActionViewModel.cs
similarity index 96%
rename from Bitvault/SearchWalletActionViewModel.cs
rename to Wallet/SearchWalletActionViewModel.cs
index 149829e..72d17d7 100644
--- a/Bitvault/SearchWalletActionViewModel.cs
+++ b/Wallet/SearchWalletActionViewModel.cs
@@ -2,7 +2,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class SearchWalletActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/SecurityKey.cs b/Wallet/SecurityKey.cs
similarity index 93%
rename from Bitvault/SecurityKey.cs
rename to Wallet/SecurityKey.cs
index 3ade48a..1a5caeb 100644
--- a/Bitvault/SecurityKey.cs
+++ b/Wallet/SecurityKey.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record SecurityKey(byte[] Salt, byte[] EncryptedKey, byte[] DecryptedKey) :
     IDisposable
diff --git a/Bitvault/SecurityKeyFactory.cs b/Wallet/SecurityKeyFactory.cs
similarity index 97%
rename from Bitvault/SecurityKeyFactory.cs
rename to Wallet/SecurityKeyFactory.cs
index d8aa31a..76a2723 100644
--- a/Bitvault/SecurityKeyFactory.cs
+++ b/Wallet/SecurityKeyFactory.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class SecurityKeyFactory(IKeyGenerator generator,
     IKeyDeriver deriver,
diff --git a/Bitvault/SpecialCharRule.cs b/Wallet/SpecialCharRule.cs
similarity index 93%
rename from Bitvault/SpecialCharRule.cs
rename to Wallet/SpecialCharRule.cs
index ba2a10b..63cf993 100644
--- a/Bitvault/SpecialCharRule.cs
+++ b/Wallet/SpecialCharRule.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class SpecialCharRule : IPasswordRule
 {
diff --git a/Bitvault/StarredNavigationViewModel.cs b/Wallet/StarredNavigationViewModel.cs
similarity index 94%
rename from Bitvault/StarredNavigationViewModel.cs
rename to Wallet/StarredNavigationViewModel.cs
index b0dd18a..b333b64 100644
--- a/Bitvault/StarredNavigationViewModel.cs
+++ b/Wallet/StarredNavigationViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class StarredNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/SynchronizeItemCategoryViewModelHandler.cs b/Wallet/SynchronizeItemCategoryViewModelHandler.cs
similarity index 97%
rename from Bitvault/SynchronizeItemCategoryViewModelHandler.cs
rename to Wallet/SynchronizeItemCategoryViewModelHandler.cs
index b07f2e3..4c8f109 100644
--- a/Bitvault/SynchronizeItemCategoryViewModelHandler.cs
+++ b/Wallet/SynchronizeItemCategoryViewModelHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class SynchronizeItemCategoryViewModelHandler(IItemConfigurationCollection configurations,
     IServiceFactory serviceFactory,
diff --git a/Bitvault/SynchronizeItemContentFromCategoryViewModelHandler.cs b/Wallet/SynchronizeItemContentFromCategoryViewModelHandler.cs
similarity index 99%
rename from Bitvault/SynchronizeItemContentFromCategoryViewModelHandler.cs
rename to Wallet/SynchronizeItemContentFromCategoryViewModelHandler.cs
index 04b9d4b..85941e4 100644
--- a/Bitvault/SynchronizeItemContentFromCategoryViewModelHandler.cs
+++ b/Wallet/SynchronizeItemContentFromCategoryViewModelHandler.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class SynchronizeItemContentFromCategoryViewModelHandler(IItemConfigurationCollection configurations,
     IDecoratorService<ItemConfiguration> decoratorItemConfiguration,
diff --git a/Bitvault/SynchronizeItemContentViewModelHandler.cs b/Wallet/SynchronizeItemContentViewModelHandler.cs
similarity index 99%
rename from Bitvault/SynchronizeItemContentViewModelHandler.cs
rename to Wallet/SynchronizeItemContentViewModelHandler.cs
index 42b7bfc..192382e 100644
--- a/Bitvault/SynchronizeItemContentViewModelHandler.cs
+++ b/Wallet/SynchronizeItemContentViewModelHandler.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class SynchronizeItemContentViewModelHandler(IDecoratorService<Item<(Guid, string)>> itemDecorator,
     IDecoratorService<ItemConfiguration> itemConfigurationDecorator,
diff --git a/Bitvault/SynchronizeItemViewModelHandler.cs b/Wallet/SynchronizeItemViewModelHandler.cs
similarity index 99%
rename from Bitvault/SynchronizeItemViewModelHandler.cs
rename to Wallet/SynchronizeItemViewModelHandler.cs
index 585f7a6..da57595 100644
--- a/Bitvault/SynchronizeItemViewModelHandler.cs
+++ b/Wallet/SynchronizeItemViewModelHandler.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class SynchronizeItemViewModelHandler(IMediator mediator,
     IServiceProvider serviceProvider,
diff --git a/Bitvault/SynchronizeMainViewModelHandler.cs b/Wallet/SynchronizeMainViewModelHandler.cs
similarity index 98%
rename from Bitvault/SynchronizeMainViewModelHandler.cs
rename to Wallet/SynchronizeMainViewModelHandler.cs
index f638559..641dd15 100644
--- a/Bitvault/SynchronizeMainViewModelHandler.cs
+++ b/Wallet/SynchronizeMainViewModelHandler.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class SynchronizeMainViewModelHandler(IPublisher publisher,
     IWalletHostCollection Wallets) :
diff --git a/Bitvault/TextEntryConfiguration.cs b/Wallet/TextEntryConfiguration.cs
similarity index 75%
rename from Bitvault/TextEntryConfiguration.cs
rename to Wallet/TextEntryConfiguration.cs
index eb176bf..80d7fb6 100644
--- a/Bitvault/TextEntryConfiguration.cs
+++ b/Wallet/TextEntryConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record TextEntryConfiguration :
     ItemEntryConfiguration
diff --git a/Bitvault/TextEntryViewModel.cs b/Wallet/TextEntryViewModel.cs
similarity index 95%
rename from Bitvault/TextEntryViewModel.cs
rename to Wallet/TextEntryViewModel.cs
index a7c8ec4..53349a2 100644
--- a/Bitvault/TextEntryViewModel.cs
+++ b/Wallet/TextEntryViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class TextEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/TextEntryViewModelHandler.cs b/Wallet/TextEntryViewModelHandler.cs
similarity index 97%
rename from Bitvault/TextEntryViewModelHandler.cs
rename to Wallet/TextEntryViewModelHandler.cs
index 92519f5..d0d1aab 100644
--- a/Bitvault/TextEntryViewModelHandler.cs
+++ b/Wallet/TextEntryViewModelHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class TextEntryViewModelHandler(IServiceFactory serviceFactory) : 
     IHandler<CreateEventArgs<TextEntryConfiguration>, IItemEntryViewModel?>
diff --git a/Bitvault/Unarchive.cs b/Wallet/Unarchive.cs
similarity index 90%
rename from Bitvault/Unarchive.cs
rename to Wallet/Unarchive.cs
index c826994..1f05201 100644
--- a/Bitvault/Unarchive.cs
+++ b/Wallet/Unarchive.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Unarchive
 {
diff --git a/Bitvault/UnarchiveEventArgs.cs b/Wallet/UnarchiveEventArgs.cs
similarity index 70%
rename from Bitvault/UnarchiveEventArgs.cs
rename to Wallet/UnarchiveEventArgs.cs
index f28cf1b..428c457 100644
--- a/Bitvault/UnarchiveEventArgs.cs
+++ b/Wallet/UnarchiveEventArgs.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record UnarchiveEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Bitvault/UnarchiveItemActionViewModel.cs b/Wallet/UnarchiveItemActionViewModel.cs
similarity index 95%
rename from Bitvault/UnarchiveItemActionViewModel.cs
rename to Wallet/UnarchiveItemActionViewModel.cs
index d091a17..d5e17c8 100644
--- a/Bitvault/UnarchiveItemActionViewModel.cs
+++ b/Wallet/UnarchiveItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class UnarchiveItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/UnarchiveItemHandler.cs b/Wallet/UnarchiveItemHandler.cs
similarity index 95%
rename from Bitvault/UnarchiveItemHandler.cs
rename to Wallet/UnarchiveItemHandler.cs
index 128b126..239f585 100644
--- a/Bitvault/UnarchiveItemHandler.cs
+++ b/Wallet/UnarchiveItemHandler.cs
@@ -1,9 +1,9 @@
-using Bitvault.Data;
+using Wallet.Data;
 using Microsoft.EntityFrameworkCore;
 using System.Threading;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class UnarchiveItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
     IDbContextFactory<WalletContext> dbContextFactory) :
diff --git a/Bitvault/Unfavourite.cs b/Wallet/Unfavourite.cs
similarity index 91%
rename from Bitvault/Unfavourite.cs
rename to Wallet/Unfavourite.cs
index 48e1712..8c56c63 100644
--- a/Bitvault/Unfavourite.cs
+++ b/Wallet/Unfavourite.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Unfavourite
 {
diff --git a/Bitvault/UnfavouriteEventArgs.cs b/Wallet/UnfavouriteEventArgs.cs
similarity index 71%
rename from Bitvault/UnfavouriteEventArgs.cs
rename to Wallet/UnfavouriteEventArgs.cs
index 44259a9..2726426 100644
--- a/Bitvault/UnfavouriteEventArgs.cs
+++ b/Wallet/UnfavouriteEventArgs.cs
@@ -1,3 +1,3 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record UnfavouriteEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Bitvault/UnfavouriteItemActionViewModel.cs b/Wallet/UnfavouriteItemActionViewModel.cs
similarity index 95%
rename from Bitvault/UnfavouriteItemActionViewModel.cs
rename to Wallet/UnfavouriteItemActionViewModel.cs
index 872b316..4440ea2 100644
--- a/Bitvault/UnfavouriteItemActionViewModel.cs
+++ b/Wallet/UnfavouriteItemActionViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class UnfavouriteItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/UnfavouriteItemHandler.cs b/Wallet/UnfavouriteItemHandler.cs
similarity index 96%
rename from Bitvault/UnfavouriteItemHandler.cs
rename to Wallet/UnfavouriteItemHandler.cs
index 3fa44d5..70e309e 100644
--- a/Bitvault/UnfavouriteItemHandler.cs
+++ b/Wallet/UnfavouriteItemHandler.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 public class UnfavouriteItemHandler(IDecoratorService<Item<(Guid, string)>> decoratorService,
     IMediator mediator) :
     INotificationHandler<UnfavouriteEventArgs<Item>>
diff --git a/Bitvault/UpdateItemHander.cs b/Wallet/UpdateItemHander.cs
similarity index 97%
rename from Bitvault/UpdateItemHander.cs
rename to Wallet/UpdateItemHander.cs
index ffaa522..0f0ac7b 100644
--- a/Bitvault/UpdateItemHander.cs
+++ b/Wallet/UpdateItemHander.cs
@@ -1,10 +1,10 @@
-using Bitvault.Data;
+using Wallet.Data;
 using Microsoft.EntityFrameworkCore;
 using System.Text.Json;
 using System.Text;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class UpdateItemHander(IDbContextFactory<WalletContext> dbContextFactory) :
     IHandler<UpdateEventArgs<Item<(Guid, string, ItemConfiguration)>>, bool>
diff --git a/Bitvault/UpdateItemStateHandler.cs b/Wallet/UpdateItemStateHandler.cs
similarity index 95%
rename from Bitvault/UpdateItemStateHandler.cs
rename to Wallet/UpdateItemStateHandler.cs
index 3d5fec3..5cf35ab 100644
--- a/Bitvault/UpdateItemStateHandler.cs
+++ b/Wallet/UpdateItemStateHandler.cs
@@ -1,8 +1,8 @@
-using Bitvault.Data;
+using Wallet.Data;
 using Microsoft.EntityFrameworkCore;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class UpdateItemStateHandler(IDbContextFactory<WalletContext> dbContextFactory) : 
     IHandler<UpdateEventArgs<(Guid, int)>, bool>
diff --git a/Bitvault/UppercaseRule.cs b/Wallet/UppercaseRule.cs
similarity index 93%
rename from Bitvault/UppercaseRule.cs
rename to Wallet/UppercaseRule.cs
index 80ace89..c81ff5a 100644
--- a/Bitvault/UppercaseRule.cs
+++ b/Wallet/UppercaseRule.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class UppercaseRule :
     IPasswordRule
diff --git a/Bitvault/Wallet.cs b/Wallet/Wallet.cs
similarity index 74%
rename from Bitvault/Wallet.cs
rename to Wallet/Wallet.cs
index 9af5d67..ad27b79 100644
--- a/Bitvault/Wallet.cs
+++ b/Wallet/Wallet.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record Wallet<TValue>(TValue Value);
 
diff --git a/Bitvault/Bitvault.csproj b/Wallet/Wallet.csproj
similarity index 89%
rename from Bitvault/Bitvault.csproj
rename to Wallet/Wallet.csproj
index 50bcc57..70d394b 100644
--- a/Bitvault/Bitvault.csproj
+++ b/Wallet/Wallet.csproj
@@ -10,7 +10,7 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0-preview.4.24267.1" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\Bitvault.Data\Bitvault.Data.csproj" />
 	  <ProjectReference Include="..\Toolkit\Toolkit.Avalonia\Toolkit.Avalonia.csproj" />
+	  <ProjectReference Include="..\Wallet.Data\Wallet.Data.csproj" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Bitvault/WalletActivatedHandler.cs b/Wallet/WalletActivatedHandler.cs
similarity index 98%
rename from Bitvault/WalletActivatedHandler.cs
rename to Wallet/WalletActivatedHandler.cs
index 40fc3d0..a530333 100644
--- a/Bitvault/WalletActivatedHandler.cs
+++ b/Wallet/WalletActivatedHandler.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class WalletActivatedHandler(IWalletHostCollection Wallets,
     IPublisher publisher) :
diff --git a/Bitvault/WalletCommandHeaderCollection.cs b/Wallet/WalletCommandHeaderCollection.cs
similarity index 88%
rename from Bitvault/WalletCommandHeaderCollection.cs
rename to Wallet/WalletCommandHeaderCollection.cs
index 4091a05..ec52f28 100644
--- a/Bitvault/WalletCommandHeaderCollection.cs
+++ b/Wallet/WalletCommandHeaderCollection.cs
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class WalletCommandHeaderCollection(IList<IDisposable> list) :
     ReadOnlyCollection<IDisposable>(list);
\ No newline at end of file
diff --git a/Bitvault/WalletComponent.cs b/Wallet/WalletComponent.cs
similarity index 86%
rename from Bitvault/WalletComponent.cs
rename to Wallet/WalletComponent.cs
index 09e08d3..41a97fa 100644
--- a/Bitvault/WalletComponent.cs
+++ b/Wallet/WalletComponent.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class WalletComponent(IComponentBuilder builder) : Component(builder),
     IWalletComponent;
\ No newline at end of file
diff --git a/Bitvault/WalletConfiguration.cs b/Wallet/WalletConfiguration.cs
similarity index 87%
rename from Bitvault/WalletConfiguration.cs
rename to Wallet/WalletConfiguration.cs
index c75e12c..054ac4d 100644
--- a/Bitvault/WalletConfiguration.cs
+++ b/Wallet/WalletConfiguration.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public record WalletConfiguration :
     ComponentConfiguration
diff --git a/Bitvault/WalletConnection.cs b/Wallet/WalletConnection.cs
similarity index 87%
rename from Bitvault/WalletConnection.cs
rename to Wallet/WalletConnection.cs
index c861538..4a3ec14 100644
--- a/Bitvault/WalletConnection.cs
+++ b/Wallet/WalletConnection.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public class WalletConnection(string connection)
 {
diff --git a/Bitvault/WalletFactory.cs b/Wallet/WalletFactory.cs
similarity index 95%
rename from Bitvault/WalletFactory.cs
rename to Wallet/WalletFactory.cs
index ec67ec8..b3a0af3 100644
--- a/Bitvault/WalletFactory.cs
+++ b/Wallet/WalletFactory.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class WalletFactory(IComponentFactory componentFactory) :
     IWalletFactory
diff --git a/Bitvault/WalletHeaderViewModel.cs b/Wallet/WalletHeaderViewModel.cs
similarity index 97%
rename from Bitvault/WalletHeaderViewModel.cs
rename to Wallet/WalletHeaderViewModel.cs
index 6156750..69e3d4c 100644
--- a/Bitvault/WalletHeaderViewModel.cs
+++ b/Wallet/WalletHeaderViewModel.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class WalletHeaderViewModel(IServiceProvider provider,
     IServiceFactory factory,
diff --git a/Bitvault/WalletHostCollection.cs b/Wallet/WalletHostCollection.cs
similarity index 95%
rename from Bitvault/WalletHostCollection.cs
rename to Wallet/WalletHostCollection.cs
index 3aa3c0d..3dbe64b 100644
--- a/Bitvault/WalletHostCollection.cs
+++ b/Wallet/WalletHostCollection.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class WalletHostCollection :
    IWalletHostCollection
diff --git a/Bitvault/WalletInitializer.cs b/Wallet/WalletInitializer.cs
similarity index 97%
rename from Bitvault/WalletInitializer.cs
rename to Wallet/WalletInitializer.cs
index 6c51946..9ff0c9b 100644
--- a/Bitvault/WalletInitializer.cs
+++ b/Wallet/WalletInitializer.cs
@@ -1,6 +1,6 @@
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class WalletInitializer(IEnumerable<IConfigurationDescriptor<WalletConfiguration>> configurations,
     IComponentFactory componentFactory,
diff --git a/Bitvault/WalletNavigationViewModel.cs b/Wallet/WalletNavigationViewModel.cs
similarity index 98%
rename from Bitvault/WalletNavigationViewModel.cs
rename to Wallet/WalletNavigationViewModel.cs
index 5755265..8b5d2f0 100644
--- a/Bitvault/WalletNavigationViewModel.cs
+++ b/Wallet/WalletNavigationViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class WalletNavigationViewModel :
     ObservableCollection<IWalletNavigationViewModel>,
diff --git a/Bitvault/WalletStorageFactory.cs b/Wallet/WalletStorageFactory.cs
similarity index 88%
rename from Bitvault/WalletStorageFactory.cs
rename to Wallet/WalletStorageFactory.cs
index f9a0b0d..0859e51 100644
--- a/Bitvault/WalletStorageFactory.cs
+++ b/Wallet/WalletStorageFactory.cs
@@ -1,10 +1,10 @@
-using Bitvault.Data;
+using Wallet.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public class WalletStorageFactory(IDecoratorService<WalletConnection> connection,
     IHostEnvironment environment,
@@ -15,7 +15,7 @@ public class WalletStorageFactory(IDecoratorService<WalletConnection> connection
         SecurityKey key)
     {
         connection.Set(new WalletConnection($"Data Source={Path.Combine(environment.ContentRootPath, name)}" +
-            $".vault;Mode=ReadWriteCreate;Pooling=true;Password={Convert.ToBase64String(key.DecryptedKey)}"));
+            $".wallet;Mode=ReadWriteCreate;Pooling=true;Password={Convert.ToBase64String(key.DecryptedKey)}"));
 
         IDbContextFactory<WalletContext> dbContextFactory = provider.GetRequiredService<IDbContextFactory<WalletContext>>();
         using WalletContext context = await dbContextFactory.CreateDbContextAsync();
diff --git a/Bitvault/WalletViewModel.cs b/Wallet/WalletViewModel.cs
similarity index 97%
rename from Bitvault/WalletViewModel.cs
rename to Wallet/WalletViewModel.cs
index 106a33a..8d48267 100644
--- a/Bitvault/WalletViewModel.cs
+++ b/Wallet/WalletViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Toolkit.Foundation;
 
-namespace Bitvault;
+namespace Wallet;
 
 public partial class WalletViewModel :
     Observable
diff --git a/Bitvault/WalletViewModelConfiguration.cs b/Wallet/WalletViewModelConfiguration.cs
similarity index 85%
rename from Bitvault/WalletViewModelConfiguration.cs
rename to Wallet/WalletViewModelConfiguration.cs
index 5658b52..6bb0599 100644
--- a/Bitvault/WalletViewModelConfiguration.cs
+++ b/Wallet/WalletViewModelConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Bitvault;
+namespace Wallet;
 
 public record WalletViewModelConfiguration
 {