Mass rename

Bitvault.Avalonia/AddItemActionView.axaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.AddVaultContentActionView"
+    x:Class="Bitvault.Avalonia.AddItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:AddVaultContentActionViewModel">
+    x:DataType="vm:AddItemActionViewModel">
     <Button
         Grid.Column="1"
         Width="{StaticResource ButtonWidth}"
@@ -15,7 +15,7 @@
         ToolTip.Tip="Add item">
         <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
-                <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddVaultContent" />
+                <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddItem" />
             </EventTriggerBehavior>
         </Interaction.Behaviors>
     </Button>

Bitvault.Avalonia/AddItemActionView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddItemActionView : UserControl
+{
+    public AddItemActionView() => InitializeComponent();
+}

Bitvault.Avalonia/AddItemCommandHeaderView.axaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.AddVaultContentCommandHeaderView"
+    x:Class="Bitvault.Avalonia.AddItemCommandHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:AddVaultContentCommandHeaderViewModel">
+    x:DataType="vm:AddItemCommandHeaderViewModel">
     <UserControl.Resources>
         <ResourceDictionary>
             <x:Double x:Key="ButtonWidth">40</x:Double>

Bitvault.Avalonia/AddItemCommandHeaderView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddItemCommandHeaderView : UserControl
+{
+    public AddItemCommandHeaderView() => InitializeComponent();
+}

Bitvault.Avalonia/AddItemView.axaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.AddVaultContentView"
+    x:Class="Bitvault.Avalonia.AddItemView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:AddVaultContentViewModel">
+    x:DataType="vm:AddItemViewModel">
     <Interaction.Behaviors>
         <EventTriggerBehavior EventName="Loaded">
             <NavigateAction Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}" Route="AddVaultContentCommandHeader" />

Bitvault.Avalonia/AddItemView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddItemView : UserControl
+{
+    public AddItemView() => InitializeComponent();
+}

Bitvault.Avalonia/AddVaultContentActionView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class AddVaultContentActionView : UserControl
-{
-    public AddVaultContentActionView() => InitializeComponent();
-}

Bitvault.Avalonia/AddVaultContentCommandHeaderView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class AddVaultContentCommandHeaderView : UserControl
-{
-    public AddVaultContentCommandHeaderView() => InitializeComponent();
-}

Bitvault.Avalonia/AddVaultContentView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class AddVaultContentView : UserControl
-{
-    public AddVaultContentView() => InitializeComponent();
-}

Bitvault.Avalonia/AllNavigationView.axaml

@@ -14,7 +14,7 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Vault">
+                <NavigateAction Context="Main" Route="Container">
                     <NavigateAction.ParameterBindings>
                         <ParameterBinding Key="Filter" Value="{Binding Filter}" />
                     </NavigateAction.ParameterBindings>

Bitvault.Avalonia/App.axaml.cs

@@ -23,7 +23,7 @@ public partial class App : Application
     public override async void OnFrameworkInitializationCompleted()
     {
         IHost? host = DefaultHostBuilder.Create()
-            .AddConfiguration<VaultConfiguration>(args => args.Name = "Personal",
+            .AddConfiguration<ContainerConfiguration>(args => args.Name = "Personal",
                    "Vault:*")
             .ConfigureServices((context, services) =>
             {
@@ -35,7 +35,7 @@ public partial class App : Application
                     services.AddTemplate<MainWindowViewModel, MainWindow>("MainWindow");
                 }
 
-                services.AddTransient<IVaultComponent> (provider => Component.Create<VaultComponent>(provider, args =>
+                services.AddTransient<IContainerComponent> (provider => Component.Create<ContainerComponent>(provider, args =>
                 {
                     args.AddServices(services =>
                     {
@@ -46,55 +46,55 @@ public partial class App : Application
                         services.AddTransient<IPasswordHasher, PasswordHasher>();
                         services.AddTransient<IKeyDeriver, KeyDeriver>();
 
-                        services.AddTransient<IVaultKeyFactory, VaultKeyFactory>();
-                        services.AddTransient<IVaultStorage, VaultStorage>();
-                        services.TryAddSingleton<IContainer<VaultKey>, Container<VaultKey>>();
-                        services.TryAddSingleton<IContainer<VaultStorageConnection>, Container<VaultStorageConnection>>();
+                        services.AddTransient<ISecurityKeyFactory, SecurityKeyFactory>();
+                        services.AddTransient<IContainer, ContainerFactory>();
+                        services.TryAddSingleton<IContainer<SecurityKey>, Container<SecurityKey>>();
+                        services.TryAddSingleton<IContainer<ContaienrConnection>, Container<ContaienrConnection>>();
 
                         services.AddDbContextFactory<VaultDbContext>((provider, args) =>
                         {
-                            if (provider.GetRequiredService<IContainer<VaultStorageConnection>>() 
-                                is IContainer<VaultStorageConnection> connection)
+                            if (provider.GetRequiredService<IContainer<ContaienrConnection>>() 
+                                is IContainer<ContaienrConnection> connection)
                             {
                                 args.UseSqlite($"{connection.Value}");
                             }
                         });
 
-                        services.AddHandler<OpenVaultHandler>();
+                        services.AddHandler<OpenContainerHandler>();
 
-                        services.AddTemplate<VaultNavigationViewModel, VaultNavigationView>();
+                        services.AddTemplate<ContainerNavigationViewModel, ContainerNavigationView>();
                         services.AddTemplate<AllNavigationViewModel, AllNavigationView>();
                         services.AddTemplate<StarredNavigationViewModel, StarredNavigationView>();
                         services.AddTemplate<CategoriesNavigationViewModel, CategoriesNavigationView>();
                         services.AddTemplate<ArchiveNavigationViewModel, ArchiveNavigationView>();
 
-                        services.AddTemplate<OpenVaultViewModel, OpenView>("OpenVault");
+                        services.AddTemplate<OpenContainerViewModel, OpenView>("OpenContainer");
 
-                        services.AddTemplate<VaultViewModel, VaultView>("Vault");
-                        services.AddHandler<VaultViewModelHandler>();
+                        services.AddTemplate<ContainerViewModel, ContainerView>("Container");
+                        services.AddHandler<ContainerViewModelHandler>();
 
-                        services.AddTemplate<VaultSearchHeaderViewModel, VaultSearchHeaderView>("VaultSearchHeader");
-                        services.AddTemplate<VaultHeaderViewModel, VaultHeaderView>("VaultHeader");
-                        services.AddTemplate<AddVaultContentActionViewModel, AddVaultContentActionView>();
+                        services.AddTemplate<SearchHeaderViewModel, SearchHeaderView>("SearchHeader");
+                        services.AddTemplate<ContainerHeaderViewModel, ContainerHeaderView>("ContainerHeader");
+                        services.AddTemplate<AddItemActionViewModel, AddItemActionView>();
 
-                        services.AddTemplate<VaultContentNavigationViewModel, VaultContentNavigationView>();
-                        services.AddTemplate<VaultContentViewModel, VaultContentView>("VaultContent");
+                        services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
+                        services.AddTemplate<ItemViewModel, ItemView>("AddItem");
 
-                        services.AddTemplate<AddVaultContentViewModel, AddVaultContentView>("AddVaultContent");
-                        services.AddTemplate<AddVaultContentCommandHeaderViewModel, AddVaultContentCommandHeaderView>("AddVaultContentCommandHeader");
+                        services.AddTemplate<AddItemViewModel, AddItemView>("AddAddItem");
+                        services.AddTemplate<AddItemCommandHeaderViewModel, AddItemCommandHeaderView>("AddVaultContentCommandHeader");
 
-                        services.AddTemplate<ConfirmVaultContentActionViewModel, ConfirmVaultContentActionView>();
-                        services.AddTemplate<DismissVaultContentActionViewModel, DismissVaultContentActionView>();
+                        services.AddTemplate<ConfirmItemActionViewModel, ConfirmVaultContentActionView>();
+                        services.AddTemplate<DismissItemActionViewModel, DismissItemActionView>();
 
-                        services.AddTemplate<VaultContentHeaderViewModel, VaultContentHeaderView>();
+                        services.AddTemplate<ItemHeaderViewModel, ItemHeaderView>();
                     });
                 })!);
 
-                services.AddTransient<IVaultComponentFactory,  VaultComponentFactory>();
-                services.AddHandler<CreateVaultHandler>();
+                services.AddTransient<IContainerComponentFactory,  ContainerComponentFactory>();
+                services.AddHandler<CreateContainerHandler>();
 
-                services.AddSingleton<IVaultHostCollection, VaultHostCollection>();
-                services.AddInitializer<VaultCollectionInitializer>();
+                services.AddSingleton<IContainerHostCollection, ContainerHostCollection>();
+                services.AddInitializer<ContainerCollectionInitializer>();
 
                 services.AddTemplate<MainViewModel, MainView>("Main");
                 services.AddHandler<MainViewModelHandler>();
@@ -104,8 +104,8 @@ public partial class App : Application
                 services.AddTemplate<ManageNavigationViewModel, ManageNavigationView>();
                 services.AddTemplate<ManageViewModel, ManageView>("Manage");
 
-                services.AddTemplate<CreateVaultNavigationViewModel, CreateVaultNavigationView>();
-                services.AddTemplate<CreateVaultViewModel, CreateVaultView>("CreateVault");
+                services.AddTemplate<CreateContainerNavigationViewModel, CreateContainerNavigationView>();
+                services.AddTemplate<CreateContainerViewModel, CreateContainerView>("CreateContainer");
             })
         .Build();
 

Bitvault.Avalonia/Bitvault.Avalonia.csproj

@@ -40,14 +40,26 @@
 	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Compile Update="AddVaultContentActionView.axaml.cs">
-	    <DependentUpon>AddVaultContentActionView.axaml</DependentUpon>
+	  <Compile Update="AddItemActionView.axaml.cs">
+	    <DependentUpon>AddItemActionView.axaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="AddVaultContentCommandHeaderView.axaml.cs">
-	    <DependentUpon>AddVaultContentCommandHeaderView.axaml</DependentUpon>
+	  <Compile Update="AddItemCommandHeaderView.axaml.cs">
+	    <DependentUpon>AddItemCommandHeaderView.axaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="VaultContentHeaderView.axaml.cs">
-	    <DependentUpon>VaultContentHeaderView.axaml</DependentUpon>
+	  <Compile Update="AddItemView.axaml.cs">
+	    <DependentUpon>AddItemView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="CreateContainerNavigationView.axaml.cs">
+	    <DependentUpon>CreateContainerNavigationView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="CreateContainerView.axaml.cs">
+	    <DependentUpon>CreateContainerView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="DismissItemActionView.axaml.cs">
+	    <DependentUpon>DismissItemActionView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ItemHeaderView.axaml.cs">
+	    <DependentUpon>ItemHeaderView.axaml</DependentUpon>
 	  </Compile>
 	  <Compile Update="OpenView.axaml.cs">
 	    <DependentUpon>OpenView.axaml</DependentUpon>
@@ -55,11 +67,23 @@
 	  <Compile Update="ManageNavigationView.axaml.cs">
 	    <DependentUpon>ManageNavigationView.axaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="VaultHeaderView.axaml.cs">
-	    <DependentUpon>VaultHeaderView.axaml</DependentUpon>
+	  <Compile Update="ContainerHeaderView.axaml.cs">
+	    <DependentUpon>ContainerHeaderView.axaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="VaultNavigationView.axaml.cs">
-	    <DependentUpon>VaultNavigationView.axaml</DependentUpon>
+	  <Compile Update="ItemNavigationView.axaml.cs">
+	    <DependentUpon>ItemNavigationView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ItemView.axaml.cs">
+	    <DependentUpon>ItemView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ContainerNavigationView.axaml.cs">
+	    <DependentUpon>ContainerNavigationView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="SearchHeaderView.axaml.cs">
+	    <DependentUpon>SearchHeaderView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ContainerView.axaml.cs">
+	    <DependentUpon>ContainerView.axaml</DependentUpon>
 	  </Compile>
 	</ItemGroup>
 </Project>

Bitvault.Avalonia/ContainerHeaderView.axaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultHeaderView"
+    x:Class="Bitvault.Avalonia.ContainerHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:VaultHeaderViewModel">
+    x:DataType="vm:ContainerHeaderViewModel">
     <UserControl.Resources>
         <x:Double x:Key="ButtonWidth">40</x:Double>
         <x:Double x:Key="ButtonHeight">36</x:Double>

Bitvault.Avalonia/ContainerHeaderView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ContainerHeaderView : UserControl
+{
+    public ContainerHeaderView() => InitializeComponent();
+}

Bitvault.Avalonia/ContainerNavigationView.axaml

@@ -1,10 +1,10 @@
 <NavigationViewItem
-    x:Class="Bitvault.Avalonia.VaultNavigationView"
+    x:Class="Bitvault.Avalonia.ContainerNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
     x:Name="NavigationViewItem"
-    x:DataType="vm:VaultNavigationViewModel"
+    x:DataType="vm:ContainerNavigationViewModel"
     Content="{Binding Name}"
     IsExpanded="{Binding Expanded}"
     IsSelected="{Binding Selected}"
@@ -19,7 +19,7 @@
                         <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="OpenVault" />
+                <NavigateAction Context="Main" Route="OpenContainer" />
                 <ChangePropertyAction
                     PropertyName="SelectsOnInvoked"
                     TargetObject="{Binding #NavigationViewItem}"
@@ -33,7 +33,7 @@
                         <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Vault" />
+                <NavigateAction Context="Main" Route="Container" />
                 <ChangePropertyAction
                     PropertyName="SelectsOnInvoked"
                     TargetObject="{Binding #NavigationViewItem}"
@@ -48,7 +48,7 @@
                         <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="OpenVault" />
+                <NavigateAction Context="Main" Route="OpenContainer" />
             </ConditionAction>
             <ConditionAction>
                 <ConditionAction.Condition>
@@ -57,7 +57,7 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Vault" />
+                <NavigateAction Context="Main" Route="Container" />
                 <InvokeNavigationViewItemAction />
             </ConditionAction>
         </AttachedEventTriggerBehaviour>

Bitvault.Avalonia/ContainerNavigationView.axaml.cs

@@ -0,0 +1,8 @@
+using Toolkit.UI.Controls.Avalonia;
+
+namespace Bitvault.Avalonia;
+
+public partial class ContainerNavigationView : NavigationViewItem
+{
+    public ContainerNavigationView() => InitializeComponent();
+}

Bitvault.Avalonia/ContainerView.axaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultView"
+    x:Class="Bitvault.Avalonia.ContainerView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:VaultViewModel">
+    x:DataType="vm:ContainerViewModel">
     <Grid ColumnDefinitions="320,Auto,*" RowDefinitions="Auto,*">
         <ContentControl
             Grid.Row="0"
@@ -12,7 +12,7 @@
             Margin="4,4,0,0">
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Loaded">
-                    <NavigateAction Context="{Binding $self}" Route="VaultHeader" />
+                    <NavigateAction Context="{Binding $self}" Route="ContainerHeader" />
                 </EventTriggerBehavior>
             </Interaction.Behaviors>
         </ContentControl>

Bitvault.Avalonia/ContainerView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ContainerView : UserControl
+{
+    public ContainerView() => InitializeComponent();
+}

Bitvault.Avalonia/CreateContainerNavigationView.axaml

@@ -1,5 +1,5 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.CreateVaultNavigationView"
+    x:Class="Bitvault.Avalonia.CreateContainerNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Description="Keep organized by separating your things into vaults."
@@ -8,7 +8,7 @@
         <Button MinWidth="132" Content="Create vault">
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Click">
-                    <NavigateAction Route="CreateVault" />
+                    <NavigateAction Route="CreateContainer" />
                 </EventTriggerBehavior>
             </Interaction.Behaviors>
         </Button>

Bitvault.Avalonia/CreateContainerNavigationView.axaml.cs

@@ -0,0 +1,8 @@
+using Toolkit.UI.Controls.Avalonia;
+
+namespace Bitvault.Avalonia;
+
+public partial class CreateContainerNavigationView : SettingsExpander
+{
+    public CreateContainerNavigationView() => InitializeComponent();
+}

Bitvault.Avalonia/CreateContainerView.axaml

@@ -1,10 +1,10 @@
 <ContentDialog
-    x:Class="Bitvault.Avalonia.CreateVaultView"
+    x:Class="Bitvault.Avalonia.CreateContainerView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
     Title="Create vault"
-    x:DataType="vm:CreateVaultViewModel"
+    x:DataType="vm:CreateContainerViewModel"
     CloseButtonText="Cancel"
     PrimaryButtonText="Create">
     <StackPanel Width="400">

Bitvault.Avalonia/CreateContainerView.axaml.cs

@@ -0,0 +1,8 @@
+using Toolkit.UI.Controls.Avalonia;
+
+namespace Bitvault.Avalonia;
+
+public partial class CreateContainerView : ContentDialog
+{
+    public CreateContainerView() => InitializeComponent();
+}

Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs

@@ -1,8 +0,0 @@
-using Toolkit.UI.Controls.Avalonia;
-
-namespace Bitvault.Avalonia;
-
-public partial class CreateVaultNavigationView : SettingsExpander
-{
-    public CreateVaultNavigationView() => InitializeComponent();
-}

Bitvault.Avalonia/CreateVaultView.axaml.cs

@@ -1,8 +0,0 @@
-using Toolkit.UI.Controls.Avalonia;
-
-namespace Bitvault.Avalonia;
-
-public partial class CreateVaultView : ContentDialog
-{
-    public CreateVaultView() => InitializeComponent();
-}

Bitvault.Avalonia/DismissItemActionView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.DismissVaultContentActionView"
+    x:Class="Bitvault.Avalonia.DismissItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Button

Bitvault.Avalonia/DismissItemActionView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class DismissItemActionView : UserControl
+{
+    public DismissItemActionView() => InitializeComponent();
+}

Bitvault.Avalonia/DismissVaultContentActionView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class DismissVaultContentActionView : UserControl
-{
-    public DismissVaultContentActionView() => InitializeComponent();
-}

Bitvault.Avalonia/ItemHeaderView.axaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultContentHeaderView"
+    x:Class="Bitvault.Avalonia.ItemHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:VaultContentHeaderViewModel">
+    x:DataType="vm:ItemHeaderViewModel">
     <StackPanel Grid.Column="1" Spacing="18">
         <PersonPicture
             Width="96"

Bitvault.Avalonia/ItemHeaderView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ItemHeaderView : UserControl
+{
+    public ItemHeaderView() => InitializeComponent();
+}

Bitvault.Avalonia/ItemNavigationView.axaml

@@ -1,14 +1,14 @@
 <ListBoxItem
-    x:Class="Bitvault.Avalonia.VaultContentNavigationView"
+    x:Class="Bitvault.Avalonia.ItemNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
     x:Name="Name"
     x:CompileBindings="False"
-    x:DataType="vm:VaultContentNavigationViewModel">
+    x:DataType="vm:ItemNavigationViewModel">
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
-            <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="VaultContent" />
+            <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddItem" />
         </DataTriggerBehavior>
     </Interaction.Behaviors>
     <Grid ColumnDefinitions="Auto,*">

Bitvault.Avalonia/ItemNavigationView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ItemNavigationView : ListBoxItem
+{
+    public ItemNavigationView() => InitializeComponent();
+}

Bitvault.Avalonia/ItemView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultContentView"
+    x:Class="Bitvault.Avalonia.ItemView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     Vault content placeholder

Bitvault.Avalonia/ItemView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ItemView : UserControl
+{
+    public ItemView() => InitializeComponent();
+}

Bitvault.Avalonia/MainView.axaml

@@ -16,7 +16,7 @@
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Loaded">
                     <NavigateRegionAction Name="Main">
-                        <NavigateAction Context="Main" Route="Vault" />
+                        <NavigateAction Context="Main" Route="Container" />
                     </NavigateRegionAction>
                 </EventTriggerBehavior>
             </Interaction.Behaviors>

Bitvault.Avalonia/OpenView.axaml

@@ -3,7 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:OpenVaultViewModel">
+    x:DataType="vm:OpenContainerViewModel">
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
         <TextBox
             Width="300"

Bitvault.Avalonia/SearchHeaderView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultSearchHeaderView"
+    x:Class="Bitvault.Avalonia.SearchHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <AutoCompleteBox VerticalAlignment="Center" />

Bitvault.Avalonia/SearchHeaderView.axaml.cs

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class SearchHeaderView : UserControl
+{
+    public SearchHeaderView() => InitializeComponent();
+}

Bitvault.Avalonia/VaultCommandView.axaml

@@ -1,11 +0,0 @@
-<UserControl
-    x:Class="Bitvault.Avalonia.VaultCommandView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    Welcome to Avalonia!
-</UserControl>

Bitvault.Avalonia/VaultCommandView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultCommandView : UserControl
-{
-    public VaultCommandView() => InitializeComponent();
-}

Bitvault.Avalonia/VaultContentHeaderView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultContentHeaderView : UserControl
-{
-    public VaultContentHeaderView() => InitializeComponent();
-}

Bitvault.Avalonia/VaultContentNavigationView.axaml.cs

@@ -1,18 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia
-{
-    public partial class VaultContentNavigationView : ListBoxItem
-    {
-        public VaultContentNavigationView()
-        {
-            InitializeComponent();
-            Tapped += VaultContentNavigationView_Tapped;
-        }
-
-        private void VaultContentNavigationView_Tapped(object? sender, global::Avalonia.Input.TappedEventArgs e)
-        {
-
-        }
-    }
-}

Bitvault.Avalonia/VaultContentView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultContentView : UserControl
-{
-    public VaultContentView() => InitializeComponent();
-}

Bitvault.Avalonia/VaultHeaderView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultHeaderView : UserControl
-{
-    public VaultHeaderView() => InitializeComponent();
-}

Bitvault.Avalonia/VaultNavigationView.axaml.cs

@@ -1,18 +0,0 @@
-using Toolkit.UI.Avalonia;
-using Toolkit.UI.Controls.Avalonia;
-
-namespace Bitvault.Avalonia
-{
-    public partial class VaultNavigationView : NavigationViewItem
-    {
-        public VaultNavigationView()
-        {
-            InitializeComponent();
-        }
-
-        public void Test(object? sender, ItemInvokedEventArgs args)
-        {
-
-        }
-    }
-}

Bitvault.Avalonia/VaultSearchHeaderView.axaml.cs

@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia
-{
-    public partial class VaultSearchHeaderView : UserControl
-    {
-        public VaultSearchHeaderView()
-        {
-            InitializeComponent();
-        }
-    }
-}

Bitvault.Avalonia/VaultView.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultView : UserControl
-{
-    public VaultView() => InitializeComponent();
-}