diff --git a/TagHierarchyManager.sln b/TagHierarchyManager.sln
index 0fb2c02..46f0b85 100644
--- a/TagHierarchyManager.sln
+++ b/TagHierarchyManager.sln
@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{397693A2
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagHierarchyManager.Tests", "Tests\TagHierarchyManager.Tests.csproj", "{F26B4A2D-0389-4FE8-8B0D-E491B354AC83}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "UI\UI.csproj", "{045690BF-2FC5-4B0E-9516-8F331BD18219}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagHierarchyManager.UI", "UI\TagHierarchyManager.UI.csproj", "{045690BF-2FC5-4B0E-9516-8F331BD18219}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/UI/AboutWindow.axaml b/UI/AboutWindow.axaml
index e0acc63..a4a6e52 100644
--- a/UI/AboutWindow.axaml
+++ b/UI/AboutWindow.axaml
@@ -4,7 +4,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="180"
         Width="400" Height="180"
-        x:Class="UI.AboutWindow"
+        x:Class="TagHierarchyManager.UI.AboutWindow"
         Title="AboutWindow">
     <StackPanel HorizontalAlignment="Center" Margin="10">
         <TextBlock FontSize="30" TextAlignment="Center">
diff --git a/UI/AboutWindow.axaml.cs b/UI/AboutWindow.axaml.cs
index 3201fe5..7461811 100644
--- a/UI/AboutWindow.axaml.cs
+++ b/UI/AboutWindow.axaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace UI;
+namespace TagHierarchyManager.UI;
 
 public partial class AboutWindow : Window
 {
diff --git a/UI/App.axaml b/UI/App.axaml
index ac1e0b5..cb76ad2 100644
--- a/UI/App.axaml
+++ b/UI/App.axaml
@@ -1,6 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="UI.App"
+             x:Class="TagHierarchyManager.UI.App"
              RequestedThemeVariant="Default">
              <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
diff --git a/UI/App.axaml.cs b/UI/App.axaml.cs
index 34093fe..6fb0eca 100644
--- a/UI/App.axaml.cs
+++ b/UI/App.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
-namespace UI;
+namespace TagHierarchyManager.UI;
 
 public partial class App : Application
 {
diff --git a/UI/DatabaseSettingsWindow.axaml b/UI/DatabaseSettingsWindow.axaml
index c1b58a1..029da9c 100644
--- a/UI/DatabaseSettingsWindow.axaml
+++ b/UI/DatabaseSettingsWindow.axaml
@@ -4,7 +4,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="160"
         Width="500" Height="160"
-        x:Class="UI.DatabaseSettingsWindow"
+        x:Class="TagHierarchyManager.UI.DatabaseSettingsWindow"
         Title="Settings - ">
     <StackPanel Margin="5">
         <TextBlock Margin="0 0 0 25">Version: 0</TextBlock>
diff --git a/UI/DatabaseSettingsWindow.axaml.cs b/UI/DatabaseSettingsWindow.axaml.cs
index cb45139..8c5e0d9 100644
--- a/UI/DatabaseSettingsWindow.axaml.cs
+++ b/UI/DatabaseSettingsWindow.axaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace UI;
+namespace TagHierarchyManager.UI;
 
 public partial class DatabaseSettingsWindow : Window
 {
diff --git a/UI/MainWindow.axaml b/UI/MainWindow.axaml
index 935dd4b..c2d017b 100644
--- a/UI/MainWindow.axaml
+++ b/UI/MainWindow.axaml
@@ -3,7 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="UI.MainWindow"
+        x:Class="TagHierarchyManager.UI.MainWindow"
         Title="Tag Hierarchy Manager">
     <!--
     TODO:
diff --git a/UI/MainWindow.axaml.cs b/UI/MainWindow.axaml.cs
index 90b8e59..745d220 100644
--- a/UI/MainWindow.axaml.cs
+++ b/UI/MainWindow.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace UI;
+namespace TagHierarchyManager.UI;
 
 public partial class MainWindow : Window
 {
diff --git a/UI/Program.cs b/UI/Program.cs
index 74ceefb..bab747f 100644
--- a/UI/Program.cs
+++ b/UI/Program.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using System;
 
-namespace UI;
+namespace TagHierarchyManager.UI;
 
 class Program
 {
diff --git a/UI/UI.csproj b/UI/TagHierarchyManager.UI.csproj
similarity index 94%
rename from UI/UI.csproj
rename to UI/TagHierarchyManager.UI.csproj
index 81088bf..2bede4f 100644
--- a/UI/UI.csproj
+++ b/UI/TagHierarchyManager.UI.csproj
@@ -5,6 +5,7 @@
         <Nullable>enable</Nullable>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <RootNamespace>TagHierarchyManager.UI</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>