diff --git a/CHANGELIST.md b/CHANGELIST.md
index a25353ad..ebd7425b 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -49,6 +49,7 @@
 - Make protection field user-editable
 - Add warning to tooltip
 - Create core UI library
+- Rename MPF.GUI to MPF.UI
 
 ### 2.3 (2022-02-05)
 - Start overhauling Redump information pulling, again
diff --git a/MPF/App.xaml.cs b/MPF/App.xaml.cs
index a74fc460..879b6121 100644
--- a/MPF/App.xaml.cs
+++ b/MPF/App.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 using MPF.Core.Data;
-using MPF.GUI.ViewModels;
+using MPF.UI.ViewModels;
 using MPF.Windows;
 
 namespace MPF
diff --git a/MPF/UserControls/LogOutput.xaml.cs b/MPF/UserControls/LogOutput.xaml.cs
index 9da4c66e..472f0a39 100644
--- a/MPF/UserControls/LogOutput.xaml.cs
+++ b/MPF/UserControls/LogOutput.xaml.cs
@@ -1,5 +1,5 @@
 using System.Windows.Controls;
-using MPF.GUI.ViewModels;
+using MPF.UI.ViewModels;
 
 namespace MPF.UserControls
 {
diff --git a/MPF/ViewModels/LogViewModel.cs b/MPF/ViewModels/LogViewModel.cs
index f95fd1fe..b408de18 100644
--- a/MPF/ViewModels/LogViewModel.cs
+++ b/MPF/ViewModels/LogViewModel.cs
@@ -10,7 +10,7 @@ using System.Windows.Media;
 using MPF.Core.Data;
 using MPF.UserControls;
 
-namespace MPF.GUI.ViewModels
+namespace MPF.UI.ViewModels
 {
     public class LogViewModel
     {
diff --git a/MPF/ViewModels/MainViewModel.cs b/MPF/ViewModels/MainViewModel.cs
index 9e17079d..3713db7f 100644
--- a/MPF/ViewModels/MainViewModel.cs
+++ b/MPF/ViewModels/MainViewModel.cs
@@ -16,7 +16,7 @@ using RedumpLib.Data;
 using WPFCustomMessageBox;
 using WinForms = System.Windows.Forms;
 
-namespace MPF.GUI.ViewModels
+namespace MPF.UI.ViewModels
 {
     public class MainViewModel
     {
diff --git a/MPF/ViewModels/OptionsViewModel.cs b/MPF/ViewModels/OptionsViewModel.cs
index 41dc0f61..8fa280d5 100644
--- a/MPF/ViewModels/OptionsViewModel.cs
+++ b/MPF/ViewModels/OptionsViewModel.cs
@@ -10,7 +10,7 @@ using MPF.Windows;
 using RedumpLib.Web;
 using WPFCustomMessageBox;
 
-namespace MPF.GUI.ViewModels
+namespace MPF.UI.ViewModels
 {
     public class OptionsViewModel
     {
diff --git a/MPF/Windows/MainWindow.xaml b/MPF/Windows/MainWindow.xaml
index fab835e5..1863aa35 100644
--- a/MPF/Windows/MainWindow.xaml
+++ b/MPF/Windows/MainWindow.xaml
@@ -4,8 +4,8 @@
                         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                         xmlns:controls="clr-namespace:MPF.UserControls"
-                        xmlns:viewModels="clr-namespace:MPF.GUI.ViewModels"
                         xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows;assembly=MPF.UI.Core"
+                        xmlns:viewModels="clr-namespace:MPF.UI.ViewModels"
                         mc:Ignorable="d"
                         Title="Media Preservation Frontend" Width="600" WindowStyle="None"
                         WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize" SizeToContent="Height"
diff --git a/MPF/Windows/MainWindow.xaml.cs b/MPF/Windows/MainWindow.xaml.cs
index e55708ba..dbba3f09 100644
--- a/MPF/Windows/MainWindow.xaml.cs
+++ b/MPF/Windows/MainWindow.xaml.cs
@@ -1,6 +1,6 @@
 using System;
-using MPF.GUI.ViewModels;
 using MPF.UI.Core.Windows;
+using MPF.UI.ViewModels;
 
 namespace MPF.Windows
 {
diff --git a/MPF/Windows/OptionsWindow.xaml.cs b/MPF/Windows/OptionsWindow.xaml.cs
index 090d4928..8db801cd 100644
--- a/MPF/Windows/OptionsWindow.xaml.cs
+++ b/MPF/Windows/OptionsWindow.xaml.cs
@@ -1,5 +1,5 @@
-using MPF.GUI.ViewModels;
-using MPF.UI.Core.Windows;
+using MPF.UI.Core.Windows;
+using MPF.UI.ViewModels;
 
 namespace MPF.Windows
 {