diff --git a/src/Ryujinx/UI/Helpers/NotificationHelper.cs b/src/Ryujinx/UI/Helpers/NotificationHelper.cs
index 224f09fb4..637ea36a6 100644
--- a/src/Ryujinx/UI/Helpers/NotificationHelper.cs
+++ b/src/Ryujinx/UI/Helpers/NotificationHelper.cs
@@ -4,7 +4,7 @@ using Avalonia.Controls.Notifications;
 using Avalonia.Threading;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Common;
-using Ryujinx.UI.SetupWizard;
+using Ryujinx.Ava.UI.SetupWizard;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
diff --git a/src/Ryujinx/UI/RyujinxApp.axaml.cs b/src/Ryujinx/UI/RyujinxApp.axaml.cs
index eb20c95f2..abb7708be 100644
--- a/src/Ryujinx/UI/RyujinxApp.axaml.cs
+++ b/src/Ryujinx/UI/RyujinxApp.axaml.cs
@@ -15,7 +15,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
-using Ryujinx.UI.SetupWizard;
+using Ryujinx.Ava.UI.SetupWizard;
 using System;
 using System.Diagnostics;
 
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPage.axaml b/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPage.axaml
index dc243694d..702eb29d0 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPage.axaml
+++ b/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPage.axaml
@@ -2,10 +2,10 @@
              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"
-             xmlns:pages="clr-namespace:Ryujinx.UI.SetupWizard.Pages"
+             xmlns:pages="clr-namespace:Ryujinx.Ava.UI.SetupWizard.Pages"
              xmlns:markup="clr-namespace:Ryujinx.Ava.Common.Markup"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.UI.SetupWizard.Pages.SetupKeysPage"
+             x:Class="Ryujinx.Ava.UI.SetupWizard.Pages.SetupKeysPage"
              x:DataType="pages:SetupKeysPageViewModel">
     <StackPanel>
         <TextBlock Text="{markup:Locale SetupWizardKeysPageDescription}" Margin="0,0,0,10"/>
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPage.axaml.cs b/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPage.axaml.cs
index 7779947c5..78febdb7d 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPage.axaml.cs
+++ b/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPage.axaml.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Ava.UI.Controls;
 
-namespace Ryujinx.UI.SetupWizard.Pages
+namespace Ryujinx.Ava.UI.SetupWizard.Pages
 {
     public partial class SetupKeysPage : RyujinxControl<SetupKeysPageViewModel>
     {
diff --git a/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPageViewModel.cs b/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPageViewModel.cs
index 5ae1a0c5c..358f9ccb5 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPageViewModel.cs
+++ b/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPageViewModel.cs
@@ -7,7 +7,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using System.Threading.Tasks;
 
-namespace Ryujinx.UI.SetupWizard.Pages
+namespace Ryujinx.Ava.UI.SetupWizard.Pages
 {
     public partial class SetupKeysPageViewModel : BaseModel
     {
diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
index 63482de35..05c638d38 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
@@ -4,8 +4,8 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.Systems.SetupWizard;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.UI.SetupWizard;
-using Ryujinx.UI.SetupWizard.Pages;
+using Ryujinx.Ava.UI.SetupWizard;
+using Ryujinx.Ava.UI.SetupWizard.Pages;
 using System;
 using System.IO;
 using System.Threading.Tasks;
diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
index 8f2d59d51..def67a1c6 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
@@ -8,7 +8,7 @@
         xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
         CanResize="False"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Ryujinx.UI.SetupWizard.RyujinxSetupWizardWindow"
+        x:Class="Ryujinx.Ava.UI.SetupWizard.RyujinxSetupWizardWindow"
         x:DataType="setupWizard:RyujinxSetupWizard"
         Title="{markup:Locale SetupWizardFirstPageTitle}">
     <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" RowDefinitions="Auto,*">
diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs
index 344a47c6a..206a802a1 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs
@@ -10,7 +10,7 @@ using Ryujinx.Common.Logging;
 using System;
 using System.IO;
 
-namespace Ryujinx.UI.SetupWizard
+namespace Ryujinx.Ava.UI.SetupWizard
 {
     public partial class RyujinxSetupWizardWindow : StyleableAppWindow
     {
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 97bc619d7..5d8776f69 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -45,7 +45,7 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input.HLE;
-using Ryujinx.UI.SetupWizard;
+using Ryujinx.Ava.UI.SetupWizard;
 using SkiaSharp;
 using System;
 using System.Collections.Generic;
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index abc9dc5fe..c461a2ea1 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -31,7 +31,7 @@ using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL3;
-using Ryujinx.UI.SetupWizard;
+using Ryujinx.Ava.UI.SetupWizard;
 using System;
 using System.Collections.Generic;
 using System.Linq;