diff --git a/CMakeLists.txt b/CMakeLists.txt
index 125eb278ff..54c387ace3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ option(USE_EGL "Enables EGL OpenGL Interface" OFF)
 option(TRY_X11 "Enables X11 Support" ON)
 option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
 option(USE_UPNP "Enables UPnP port mapping support" ON)
-option(ENABLE_QT2 "Enable Qt (Default)" ON)
+option(ENABLE_QT "Enable Qt (Default)" ON)
 option(ENABLE_LTO "Enables Link Time Optimization" OFF)
 option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
 option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
@@ -373,7 +373,7 @@ if(ANDROID)
   set(USE_X11 0)
   set(USE_UPNP 0)
   set(USE_EGL 1)
-  set(ENABLE_QT2 0)
+  set(ENABLE_QT 0)
   set(USE_DISCORD_PRESENCE 0)
 
   # We are cross compiling, search only the toolchain for libraries and includes
@@ -395,7 +395,7 @@ if(ENABLE_HEADLESS)
     set(USE_EGL 1)
   endif()
   set(USE_X11 0)
-  set(ENABLE_QT2 0)
+  set(ENABLE_QT 0)
   set(USE_DISCORD_PRESENCE 0)
   add_definitions(-DUSE_HEADLESS)
 endif()
diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt
index f34f7caa20..a004180694 100644
--- a/Source/Core/CMakeLists.txt
+++ b/Source/Core/CMakeLists.txt
@@ -8,6 +8,6 @@ add_subdirectory(UICommon)
 add_subdirectory(VideoCommon)
 add_subdirectory(VideoBackends)
 
-if(ENABLE_QT2)
-  add_subdirectory(DolphinQt2)
+if(ENABLE_QT)
+  add_subdirectory(DolphinQt)
 endif()
diff --git a/Source/Core/DolphinQt2/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/AboutDialog.cpp
rename to Source/Core/DolphinQt/AboutDialog.cpp
index 78bee03002..536ef8c265 100644
--- a/Source/Core/DolphinQt2/AboutDialog.cpp
+++ b/Source/Core/DolphinQt/AboutDialog.cpp
@@ -8,8 +8,8 @@
 
 #include "Common/Version.h"
 
-#include "DolphinQt2/AboutDialog.h"
-#include "DolphinQt2/Resources.h"
+#include "DolphinQt/AboutDialog.h"
+#include "DolphinQt/Resources.h"
 
 AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
 {
diff --git a/Source/Core/DolphinQt2/AboutDialog.h b/Source/Core/DolphinQt/AboutDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/AboutDialog.h
rename to Source/Core/DolphinQt/AboutDialog.h
diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
similarity index 99%
rename from Source/Core/DolphinQt2/CMakeLists.txt
rename to Source/Core/DolphinQt/CMakeLists.txt
index b45c4c8bec..8ff38fe645 100644
--- a/Source/Core/DolphinQt2/CMakeLists.txt
+++ b/Source/Core/DolphinQt/CMakeLists.txt
@@ -140,7 +140,7 @@ PRIVATE
 )
 
 if(WIN32)
-  target_sources(dolphin-emu PRIVATE DolphinQt2.manifest)
+  target_sources(dolphin-emu PRIVATE DolphinQt.manifest)
 endif()
 
 # Handle localization
diff --git a/Source/Core/DolphinQt2/CheatsManager.cpp b/Source/Core/DolphinQt/CheatsManager.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/CheatsManager.cpp
rename to Source/Core/DolphinQt/CheatsManager.cpp
index bf5b45825b..c76737e7f3 100644
--- a/Source/Core/DolphinQt2/CheatsManager.cpp
+++ b/Source/Core/DolphinQt/CheatsManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/CheatsManager.h"
+#include "DolphinQt/CheatsManager.h"
 
 #include <algorithm>
 #include <cstring>
@@ -30,11 +30,11 @@
 
 #include "UICommon/GameFile.h"
 
-#include "DolphinQt2/Config/ARCodeWidget.h"
-#include "DolphinQt2/Config/GeckoCodeWidget.h"
-#include "DolphinQt2/GameList/GameListModel.h"
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/ARCodeWidget.h"
+#include "DolphinQt/Config/GeckoCodeWidget.h"
+#include "DolphinQt/GameList/GameListModel.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Settings.h"
 
 constexpr u32 MAX_RESULTS = 50;
 
diff --git a/Source/Core/DolphinQt2/CheatsManager.h b/Source/Core/DolphinQt/CheatsManager.h
similarity index 100%
rename from Source/Core/DolphinQt2/CheatsManager.h
rename to Source/Core/DolphinQt/CheatsManager.h
diff --git a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/ARCodeWidget.cpp
rename to Source/Core/DolphinQt/Config/ARCodeWidget.cpp
index 086612abb0..c2e192e798 100644
--- a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp
+++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/ARCodeWidget.h"
+#include "DolphinQt/Config/ARCodeWidget.h"
 
 #include <QButtonGroup>
 #include <QHBoxLayout>
@@ -16,8 +16,8 @@
 #include "Core/ActionReplay.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/CheatCodeEditor.h"
-#include "DolphinQt2/Config/CheatWarningWidget.h"
+#include "DolphinQt/Config/CheatCodeEditor.h"
+#include "DolphinQt/Config/CheatWarningWidget.h"
 
 #include "UICommon/GameFile.h"
 
diff --git a/Source/Core/DolphinQt2/Config/ARCodeWidget.h b/Source/Core/DolphinQt/Config/ARCodeWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/ARCodeWidget.h
rename to Source/Core/DolphinQt/Config/ARCodeWidget.h
diff --git a/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp b/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp
rename to Source/Core/DolphinQt/Config/CheatCodeEditor.cpp
index 28a94e4dc1..a72e4781be 100644
--- a/Source/Core/DolphinQt2/Config/CheatCodeEditor.cpp
+++ b/Source/Core/DolphinQt/Config/CheatCodeEditor.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/CheatCodeEditor.h"
+#include "DolphinQt/Config/CheatCodeEditor.h"
 
 #include <QDialogButtonBox>
 #include <QFontDatabase>
diff --git a/Source/Core/DolphinQt2/Config/CheatCodeEditor.h b/Source/Core/DolphinQt/Config/CheatCodeEditor.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/CheatCodeEditor.h
rename to Source/Core/DolphinQt/Config/CheatCodeEditor.h
diff --git a/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp b/Source/Core/DolphinQt/Config/CheatWarningWidget.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp
rename to Source/Core/DolphinQt/Config/CheatWarningWidget.cpp
index a44b812750..f058858c17 100755
--- a/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp
+++ b/Source/Core/DolphinQt/Config/CheatWarningWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/CheatWarningWidget.h"
+#include "DolphinQt/Config/CheatWarningWidget.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -13,7 +13,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 CheatWarningWidget::CheatWarningWidget(const std::string& game_id, bool restart_required,
                                        QWidget* parent)
diff --git a/Source/Core/DolphinQt2/Config/CheatWarningWidget.h b/Source/Core/DolphinQt/Config/CheatWarningWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/CheatWarningWidget.h
rename to Source/Core/DolphinQt/Config/CheatWarningWidget.h
diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp b/Source/Core/DolphinQt/Config/ControllersWindow.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Config/ControllersWindow.cpp
rename to Source/Core/DolphinQt/Config/ControllersWindow.cpp
index eea36c2e43..981d8bf3b8 100644
--- a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp
+++ b/Source/Core/DolphinQt/Config/ControllersWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/ControllersWindow.h"
+#include "DolphinQt/Config/ControllersWindow.h"
 
 #include <QApplication>
 #include <QBoxLayout>
@@ -32,10 +32,10 @@
 #include "Core/IOS/USB/Bluetooth/BTReal.h"
 #include "Core/NetPlayProto.h"
 
-#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/Settings.h"
 
 #include "InputCommon/GCAdapter.h"
 
diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.h b/Source/Core/DolphinQt/Config/ControllersWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/ControllersWindow.h
rename to Source/Core/DolphinQt/Config/ControllersWindow.h
diff --git a/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp b/Source/Core/DolphinQt/Config/FilesystemWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Config/FilesystemWidget.cpp
rename to Source/Core/DolphinQt/Config/FilesystemWidget.cpp
index 3b0ccea37f..51716bac7f 100644
--- a/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp
+++ b/Source/Core/DolphinQt/Config/FilesystemWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/FilesystemWidget.h"
+#include "DolphinQt/Config/FilesystemWidget.h"
 
 #include <QApplication>
 #include <QCoreApplication>
@@ -23,8 +23,8 @@
 #include "DiscIO/Filesystem.h"
 #include "DiscIO/Volume.h"
 
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Resources.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Resources.h"
 
 #include "UICommon/UICommon.h"
 
diff --git a/Source/Core/DolphinQt2/Config/FilesystemWidget.h b/Source/Core/DolphinQt/Config/FilesystemWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/FilesystemWidget.h
rename to Source/Core/DolphinQt/Config/FilesystemWidget.h
diff --git a/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp b/Source/Core/DolphinQt/Config/GameConfigWidget.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Config/GameConfigWidget.cpp
rename to Source/Core/DolphinQt/Config/GameConfigWidget.cpp
index 0f8f83eed0..c626515ce0 100644
--- a/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp
+++ b/Source/Core/DolphinQt/Config/GameConfigWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/GameConfigWidget.h"
+#include "DolphinQt/Config/GameConfigWidget.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -24,7 +24,7 @@
 #include "Core/ConfigLoaders/GameConfigLoader.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
+#include "DolphinQt/Config/Graphics/GraphicsSlider.h"
 
 #include "UICommon/GameFile.h"
 
diff --git a/Source/Core/DolphinQt2/Config/GameConfigWidget.h b/Source/Core/DolphinQt/Config/GameConfigWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/GameConfigWidget.h
rename to Source/Core/DolphinQt/Config/GameConfigWidget.h
diff --git a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp
rename to Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp
index 34c901eafc..2fb5e29ddb 100755
--- a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp
+++ b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/GeckoCodeWidget.h"
+#include "DolphinQt/Config/GeckoCodeWidget.h"
 
 #include <QFontDatabase>
 #include <QFormLayout>
@@ -20,8 +20,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/GeckoCodeConfig.h"
 
-#include "DolphinQt2/Config/CheatCodeEditor.h"
-#include "DolphinQt2/Config/CheatWarningWidget.h"
+#include "DolphinQt/Config/CheatCodeEditor.h"
+#include "DolphinQt/Config/CheatWarningWidget.h"
 
 #include "UICommon/GameFile.h"
 
diff --git a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.h b/Source/Core/DolphinQt/Config/GeckoCodeWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/GeckoCodeWidget.h
rename to Source/Core/DolphinQt/Config/GeckoCodeWidget.h
diff --git a/Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp
rename to Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp
index 5808a58174..9622bd4d1d 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/AdvancedWidget.h"
+#include "DolphinQt/Config/Graphics/AdvancedWidget.h"
 
 #include <QCheckBox>
 #include <QGridLayout>
@@ -14,10 +14,10 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsChoice.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "VideoCommon/VideoConfig.h"
 
diff --git a/Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.h b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h
similarity index 95%
rename from Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.h
rename to Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h
index d5e92f3e0c..05cacf0991 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.h
+++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;
diff --git a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp
rename to Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
index d5f2927208..3e040cb1be 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
+#include "DolphinQt/Config/Graphics/EnhancementsWidget.h"
 
 #include <cmath>
 
@@ -15,12 +15,12 @@
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
-#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsChoice.h"
+#include "DolphinQt/Config/Graphics/GraphicsSlider.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "UICommon/VideoUtils.h"
 
diff --git a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.h b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h
similarity index 95%
rename from Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.h
rename to Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h
index 6126576378..b32296ab4e 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.h
+++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp
rename to Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
index 5c0487a201..43c4edfb3b 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GeneralWidget.h"
+#include "DolphinQt/Config/Graphics/GeneralWidget.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -18,11 +18,11 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
-#include "DolphinQt2/Config/Graphics/GraphicsRadio.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsChoice.h"
+#include "DolphinQt/Config/Graphics/GraphicsRadio.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "UICommon/VideoUtils.h"
 
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.h b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h
similarity index 95%
rename from Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.h
rename to Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h
index 3cd969c13f..cd11a5607d 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.h
+++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <array>
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp
index 7014a01ccc..192a2120c3 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
 
 #include "Common/Config/Config.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 #include <QFont>
 
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsBool.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.h
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsBool.h
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.cpp
similarity index 90%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.cpp
index 5b10d43804..175378e898 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
+#include "DolphinQt/Config/Graphics/GraphicsChoice.h"
 
 #include "Common/Config/Config.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 GraphicsChoice::GraphicsChoice(const QStringList& options, const Config::ConfigInfo<int>& setting)
     : m_setting(setting)
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.h
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsChoice.h
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsRadio.cpp
similarity index 91%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsRadio.cpp
index 4ae17824bc..5658fbbcab 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsRadio.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsRadio.h"
+#include "DolphinQt/Config/Graphics/GraphicsRadio.h"
 
 #include "Common/Config/Config.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 GraphicsRadioInt::GraphicsRadioInt(const QString& label, const Config::ConfigInfo<int>& setting,
                                    int value)
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsRadio.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.h
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsRadio.h
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.cpp
similarity index 91%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.cpp
index 352132e191..6f4aaddec0 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
+#include "DolphinQt/Config/Graphics/GraphicsSlider.h"
 
 #include "Common/Config/Config.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 GraphicsSlider::GraphicsSlider(int minimum, int maximum, const Config::ConfigInfo<int>& setting,
                                int tick)
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.h
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsSlider.h
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.cpp
similarity index 77%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.cpp
index f69c370815..8c8bae4bc4 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.cpp
@@ -2,12 +2,12 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 #include <QEvent>
 #include <QLabel>
 
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
 
 GraphicsWidget::GraphicsWidget(GraphicsWindow* parent)
 {
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsWidget.h
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsWidget.h
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp
similarity index 92%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.cpp
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp
index 0aaa900588..2edac668d1 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
 
 #include <QDialogButtonBox>
 #include <QEvent>
@@ -13,13 +13,13 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/AdvancedWidget.h"
-#include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
-#include "DolphinQt2/Config/Graphics/GeneralWidget.h"
-#include "DolphinQt2/Config/Graphics/HacksWidget.h"
-#include "DolphinQt2/Config/Graphics/SoftwareRendererWidget.h"
-#include "DolphinQt2/MainWindow.h"
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/Config/Graphics/AdvancedWidget.h"
+#include "DolphinQt/Config/Graphics/EnhancementsWidget.h"
+#include "DolphinQt/Config/Graphics/GeneralWidget.h"
+#include "DolphinQt/Config/Graphics/HacksWidget.h"
+#include "DolphinQt/Config/Graphics/SoftwareRendererWidget.h"
+#include "DolphinQt/MainWindow.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
 
 #include "VideoCommon/VideoBackendBase.h"
 #include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.h b/Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.h
rename to Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h
diff --git a/Source/Core/DolphinQt2/Config/Graphics/HacksWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/Graphics/HacksWidget.cpp
rename to Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp
index 1a0217319c..34eb416b05 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/HacksWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/HacksWidget.h"
+#include "DolphinQt/Config/Graphics/HacksWidget.h"
 
 #include <QGridLayout>
 #include <QGroupBox>
@@ -12,10 +12,10 @@
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsSlider.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "VideoCommon/VideoConfig.h"
 
diff --git a/Source/Core/DolphinQt2/Config/Graphics/HacksWidget.h b/Source/Core/DolphinQt/Config/Graphics/HacksWidget.h
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Graphics/HacksWidget.h
rename to Source/Core/DolphinQt/Config/Graphics/HacksWidget.h
index cf3df7a446..937c92d064 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/HacksWidget.h
+++ b/Source/Core/DolphinQt/Config/Graphics/HacksWidget.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;
diff --git a/Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp
rename to Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp
index 1e3a686ed8..bcc2c83425 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h"
+#include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
 
 #include <cmath>
 #include <vector>
@@ -19,7 +19,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
+#include "DolphinQt/Config/Graphics/EnhancementsWidget.h"
 
 #include "VideoCommon/PostProcessing.h"
 #include "VideoCommon/RenderBase.h"
diff --git a/Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h
rename to Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.h
diff --git a/Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp
rename to Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
index 018fd1a014..4941d1b556 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Graphics/SoftwareRendererWidget.h"
+#include "DolphinQt/Config/Graphics/SoftwareRendererWidget.h"
 
 #include <QComboBox>
 #include <QGridLayout>
@@ -14,9 +14,9 @@
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Graphics/GraphicsBool.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "UICommon/VideoUtils.h"
 
diff --git a/Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.h b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h
similarity index 93%
rename from Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.h
rename to Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h
index f601604d74..df328ec5ec 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.h
+++ b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Graphics/GraphicsWidget.h"
+#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
 
 class GraphicsWindow;
 class QCheckBox;
diff --git a/Source/Core/DolphinQt2/Config/InfoWidget.cpp b/Source/Core/DolphinQt/Config/InfoWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Config/InfoWidget.cpp
rename to Source/Core/DolphinQt/Config/InfoWidget.cpp
index af1c204ef9..faabe71747 100644
--- a/Source/Core/DolphinQt2/Config/InfoWidget.cpp
+++ b/Source/Core/DolphinQt/Config/InfoWidget.cpp
@@ -19,8 +19,8 @@
 #include "DiscIO/Blob.h"
 #include "DiscIO/Enums.h"
 
-#include "DolphinQt2/Config/InfoWidget.h"
-#include "DolphinQt2/QtUtils/ImageConverter.h"
+#include "DolphinQt/Config/InfoWidget.h"
+#include "DolphinQt/QtUtils/ImageConverter.h"
 
 #include "UICommon/UICommon.h"
 
diff --git a/Source/Core/DolphinQt2/Config/InfoWidget.h b/Source/Core/DolphinQt/Config/InfoWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/InfoWidget.h
rename to Source/Core/DolphinQt/Config/InfoWidget.h
diff --git a/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp b/Source/Core/DolphinQt/Config/LogConfigWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Config/LogConfigWidget.cpp
rename to Source/Core/DolphinQt/Config/LogConfigWidget.cpp
index c9d4f87e25..be45e2b40c 100644
--- a/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp
+++ b/Source/Core/DolphinQt/Config/LogConfigWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/LogConfigWidget.h"
+#include "DolphinQt/Config/LogConfigWidget.h"
 
 #include <QCheckBox>
 #include <QGroupBox>
@@ -16,7 +16,7 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 LogConfigWidget::LogConfigWidget(QWidget* parent) : QDockWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Config/LogConfigWidget.h b/Source/Core/DolphinQt/Config/LogConfigWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/LogConfigWidget.h
rename to Source/Core/DolphinQt/Config/LogConfigWidget.h
diff --git a/Source/Core/DolphinQt2/Config/LogWidget.cpp b/Source/Core/DolphinQt/Config/LogWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Config/LogWidget.cpp
rename to Source/Core/DolphinQt/Config/LogWidget.cpp
index cbe36b4f58..ae7cb70984 100644
--- a/Source/Core/DolphinQt2/Config/LogWidget.cpp
+++ b/Source/Core/DolphinQt/Config/LogWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/LogWidget.h"
+#include "DolphinQt/Config/LogWidget.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -19,7 +19,7 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 // Delay in ms between calls of UpdateLog()
 constexpr int UPDATE_LOG_DELAY = 100;
diff --git a/Source/Core/DolphinQt2/Config/LogWidget.h b/Source/Core/DolphinQt/Config/LogWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/LogWidget.h
rename to Source/Core/DolphinQt/Config/LogWidget.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp b/Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp
rename to Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp
index e198936dd5..3e881729a2 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.cpp
@@ -7,7 +7,7 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
+#include "DolphinQt/Config/Mapping/GCKeyboardEmu.h"
 
 #include "InputCommon/InputConfig.h"
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h b/Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.h
similarity index 90%
rename from Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h
rename to Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.h
index 1c21da41df..173054271a 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.h
+++ b/Source/Core/DolphinQt/Config/Mapping/GCKeyboardEmu.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QCheckBox;
 class QFormLayout;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.cpp b/Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.cpp
rename to Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp
index bd5037073d..a26fabdc6a 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/GCMicrophone.cpp
@@ -7,7 +7,7 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/Config/Mapping/GCMicrophone.h"
+#include "DolphinQt/Config/Mapping/GCMicrophone.h"
 
 #include "InputCommon/InputConfig.h"
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.h b/Source/Core/DolphinQt/Config/Mapping/GCMicrophone.h
similarity index 90%
rename from Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.h
rename to Source/Core/DolphinQt/Config/Mapping/GCMicrophone.h
index cb7000630a..a16d114f7f 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.h
+++ b/Source/Core/DolphinQt/Config/Mapping/GCMicrophone.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QCheckBox;
 class QFormLayout;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp
rename to Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp
index d0c70f8585..6ffc8d0c92 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/GCPadEmu.h"
+#include "DolphinQt/Config/Mapping/GCPadEmu.h"
 
 #include <QFormLayout>
 #include <QGroupBox>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h
similarity index 90%
rename from Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h
rename to Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h
index 8b3fefe6d2..6eea1011a1 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.h
+++ b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QCheckBox;
 class QFormLayout;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp
rename to Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp
index f39f74c9a4..82e3e41a21 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h"
+#include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h
rename to Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/Hotkey3D.cpp b/Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Mapping/Hotkey3D.cpp
rename to Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp
index c144d53f76..9364fb8acd 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/Hotkey3D.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/Hotkey3D.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/Hotkey3D.h"
+#include "DolphinQt/Config/Mapping/Hotkey3D.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/Hotkey3D.h b/Source/Core/DolphinQt/Config/Mapping/Hotkey3D.h
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/Hotkey3D.h
rename to Source/Core/DolphinQt/Config/Mapping/Hotkey3D.h
index bab3bee618..9008e95cc5 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/Hotkey3D.h
+++ b/Source/Core/DolphinQt/Config/Mapping/Hotkey3D.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyDebugging.cpp b/Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.cpp
similarity index 95%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyDebugging.cpp
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.cpp
index a65aed6bf7..b2225f2ca3 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyDebugging.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyDebugging.h"
+#include "DolphinQt/Config/Mapping/HotkeyDebugging.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyDebugging.h b/Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.h
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyDebugging.h
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.h
index dc9887bb69..972e465e5a 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyDebugging.h
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyDebugging.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyGeneral.cpp b/Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.cpp
similarity index 95%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyGeneral.cpp
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.cpp
index 329ae0c748..706b6bd7ca 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyGeneral.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyGeneral.h"
+#include "DolphinQt/Config/Mapping/HotkeyGeneral.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyGeneral.h b/Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.h
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyGeneral.h
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.h
index 77f269a82a..de5f450f5c 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyGeneral.h
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyGeneral.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyGraphics.cpp b/Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.cpp
similarity index 95%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyGraphics.cpp
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.cpp
index e8269c2b2e..88364e6860 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyGraphics.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyGraphics.h"
+#include "DolphinQt/Config/Mapping/HotkeyGraphics.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyGraphics.h b/Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.h
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyGraphics.h
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.h
index 126abd1967..fd52aa9fa8 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyGraphics.h
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyGraphics.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyStates.cpp b/Source/Core/DolphinQt/Config/Mapping/HotkeyStates.cpp
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyStates.cpp
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyStates.cpp
index 20d85cd544..4c50ae60cd 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyStates.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyStates.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyStates.h"
+#include "DolphinQt/Config/Mapping/HotkeyStates.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyStates.h b/Source/Core/DolphinQt/Config/Mapping/HotkeyStates.h
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyStates.h
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyStates.h
index c73206c8ec..48245a053e 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyStates.h
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyStates.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyStatesOther.cpp b/Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.cpp
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyStatesOther.cpp
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.cpp
index bbb1159893..5671502b72 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyStatesOther.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyStatesOther.h"
+#include "DolphinQt/Config/Mapping/HotkeyStatesOther.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyStatesOther.h b/Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.h
similarity index 88%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyStatesOther.h
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.h
index 4b71122abe..abbea34f2a 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyStatesOther.h
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyStatesOther.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyTAS.cpp b/Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.cpp
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyTAS.cpp
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.cpp
index 2586ff2d2a..9dfb87eaf4 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyTAS.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyTAS.h"
+#include "DolphinQt/Config/Mapping/HotkeyTAS.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyTAS.h b/Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.h
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyTAS.h
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.h
index bb10d433d7..942b20604b 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyTAS.h
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyTAS.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyWii.cpp b/Source/Core/DolphinQt/Config/Mapping/HotkeyWii.cpp
similarity index 93%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyWii.cpp
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyWii.cpp
index 7cfebf5705..c1089246ea 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyWii.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyWii.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/HotkeyWii.h"
+#include "DolphinQt/Config/Mapping/HotkeyWii.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/HotkeyWii.h b/Source/Core/DolphinQt/Config/Mapping/HotkeyWii.h
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/HotkeyWii.h
rename to Source/Core/DolphinQt/Config/Mapping/HotkeyWii.h
index 71343dc465..1c7c51daaa 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/HotkeyWii.h
+++ b/Source/Core/DolphinQt/Config/Mapping/HotkeyWii.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
rename to Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
index f09d4a6123..6647df8d7c 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/IOWindow.h"
+#include "DolphinQt/Config/Mapping/IOWindow.h"
 
 #include <thread>
 
@@ -20,9 +20,9 @@
 
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Mapping/MappingCommon.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
-#include "DolphinQt2/QtUtils/BlockUserInputFilter.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/QtUtils/BlockUserInputFilter.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.h b/Source/Core/DolphinQt/Config/Mapping/IOWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/IOWindow.h
rename to Source/Core/DolphinQt/Config/Mapping/IOWindow.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingBool.cpp
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp
rename to Source/Core/DolphinQt/Config/Mapping/MappingBool.cpp
index d1fc4f951d..b944b976c9 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingBool.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingBool.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingBool.h"
+#include "DolphinQt/Config/Mapping/MappingBool.h"
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingBool.h b/Source/Core/DolphinQt/Config/Mapping/MappingBool.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingBool.h
rename to Source/Core/DolphinQt/Config/Mapping/MappingBool.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
rename to Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
index b1fd42a607..0e575a774b 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
@@ -13,17 +13,17 @@
 #include <QString>
 #include <QTimer>
 
-#include "DolphinQt2/Config/Mapping/MappingButton.h"
+#include "DolphinQt/Config/Mapping/MappingButton.h"
 
 #include "Common/Thread.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Mapping/IOWindow.h"
-#include "DolphinQt2/Config/Mapping/MappingCommon.h"
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
-#include "DolphinQt2/QtUtils/BlockUserInputFilter.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Mapping/IOWindow.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/QtUtils/BlockUserInputFilter.h"
+#include "DolphinQt/Settings.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.h b/Source/Core/DolphinQt/Config/Mapping/MappingButton.h
similarity index 93%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingButton.h
rename to Source/Core/DolphinQt/Config/Mapping/MappingButton.h
index a1eb6b9535..040b7fd75a 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "Common/Flag.h"
-#include "DolphinQt2/QtUtils/ElidedButton.h"
+#include "DolphinQt/QtUtils/ElidedButton.h"
 
 class ControlReference;
 class MappingWidget;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp
rename to Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
index e1f8bda9f3..49c29d29a7 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingCommon.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingCommon.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
 
 #include <QRegExp>
 #include <QString>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingCommon.h b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingCommon.h
rename to Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingIndicator.cpp
rename to Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
index a7c27fc636..5416b4fd2f 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingIndicator.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingIndicator.h"
+#include "DolphinQt/Config/Mapping/MappingIndicator.h"
 
 #include <array>
 #include <cmath>
@@ -16,7 +16,7 @@
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 MappingIndicator::MappingIndicator(ControllerEmu::ControlGroup* group) : m_group(group)
 {
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingIndicator.h b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingIndicator.h
rename to Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
similarity index 90%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp
rename to Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
index 7073e8fffb..fc1f2d5130 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingNumeric.h"
+#include "DolphinQt/Config/Mapping/MappingNumeric.h"
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.h b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingNumeric.h
rename to Source/Core/DolphinQt/Config/Mapping/MappingNumeric.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingRadio.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingRadio.cpp
similarity index 89%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingRadio.cpp
rename to Source/Core/DolphinQt/Config/Mapping/MappingRadio.cpp
index 4e42224147..126d18444e 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingRadio.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingRadio.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingRadio.h"
+#include "DolphinQt/Config/Mapping/MappingRadio.h"
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingRadio.h b/Source/Core/DolphinQt/Config/Mapping/MappingRadio.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingRadio.h
rename to Source/Core/DolphinQt/Config/Mapping/MappingRadio.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
similarity index 91%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
rename to Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
index bfb29eca21..5e7e0b0024 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
@@ -2,19 +2,19 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QPushButton>
 
-#include "DolphinQt2/Config/Mapping/IOWindow.h"
-#include "DolphinQt2/Config/Mapping/MappingBool.h"
-#include "DolphinQt2/Config/Mapping/MappingButton.h"
-#include "DolphinQt2/Config/Mapping/MappingIndicator.h"
-#include "DolphinQt2/Config/Mapping/MappingNumeric.h"
-#include "DolphinQt2/Config/Mapping/MappingRadio.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/Config/Mapping/IOWindow.h"
+#include "DolphinQt/Config/Mapping/MappingBool.h"
+#include "DolphinQt/Config/Mapping/MappingButton.h"
+#include "DolphinQt/Config/Mapping/MappingIndicator.h"
+#include "DolphinQt/Config/Mapping/MappingNumeric.h"
+#include "DolphinQt/Config/Mapping/MappingRadio.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingWidget.h
rename to Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
similarity index 92%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
rename to Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
index c3658a5ea9..48e5a5f0f2 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -21,22 +21,22 @@
 
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
-#include "DolphinQt2/Config/Mapping/GCMicrophone.h"
-#include "DolphinQt2/Config/Mapping/GCPadEmu.h"
-#include "DolphinQt2/Config/Mapping/Hotkey3D.h"
-#include "DolphinQt2/Config/Mapping/HotkeyDebugging.h"
-#include "DolphinQt2/Config/Mapping/HotkeyGeneral.h"
-#include "DolphinQt2/Config/Mapping/HotkeyGraphics.h"
-#include "DolphinQt2/Config/Mapping/HotkeyStates.h"
-#include "DolphinQt2/Config/Mapping/HotkeyStatesOther.h"
-#include "DolphinQt2/Config/Mapping/HotkeyTAS.h"
-#include "DolphinQt2/Config/Mapping/HotkeyWii.h"
-#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h"
-#include "DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h"
-#include "DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h"
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/Mapping/GCKeyboardEmu.h"
+#include "DolphinQt/Config/Mapping/GCMicrophone.h"
+#include "DolphinQt/Config/Mapping/GCPadEmu.h"
+#include "DolphinQt/Config/Mapping/Hotkey3D.h"
+#include "DolphinQt/Config/Mapping/HotkeyDebugging.h"
+#include "DolphinQt/Config/Mapping/HotkeyGeneral.h"
+#include "DolphinQt/Config/Mapping/HotkeyGraphics.h"
+#include "DolphinQt/Config/Mapping/HotkeyStates.h"
+#include "DolphinQt/Config/Mapping/HotkeyStatesOther.h"
+#include "DolphinQt/Config/Mapping/HotkeyTAS.h"
+#include "DolphinQt/Config/Mapping/HotkeyWii.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuGeneral.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/Settings.h"
 
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
rename to Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp
rename to Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.cpp
index db98b32429..7d0a402f29 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.h b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.h
similarity index 94%
rename from Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.h
rename to Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.h
index fd7a5c1d39..9aaf44b2a0 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.h
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QGroupBox;
 class QHBoxLayout;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp
rename to Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.cpp
index 2795582180..1b632a96d0 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuGeneral.h"
 
 #include <QComboBox>
 #include <QFormLayout>
@@ -13,7 +13,7 @@
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
-#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
 
 #include "InputCommon/ControllerEmu/ControlGroup/Extension.h"
 #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.h
similarity index 92%
rename from Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h
rename to Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.h
index 83ff1e0307..19a7ab7d32 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QComboBox;
 class QHBoxLayout;
diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.cpp
similarity index 95%
rename from Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp
rename to Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.cpp
index 41ac974743..4ab2cf77ac 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h"
+#include "DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h"
 
 #include <QFormLayout>
 #include <QGroupBox>
diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h
similarity index 91%
rename from Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h
rename to Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h
index 9c8fac4f72..a3d8ece745 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWidget.h"
 
 class QCheckBox;
 class QFormLayout;
diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp b/Source/Core/DolphinQt/Config/NewPatchDialog.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Config/NewPatchDialog.cpp
rename to Source/Core/DolphinQt/Config/NewPatchDialog.cpp
index ae229a15dd..f49643b043 100644
--- a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp
+++ b/Source/Core/DolphinQt/Config/NewPatchDialog.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/NewPatchDialog.h"
+#include "DolphinQt/Config/NewPatchDialog.h"
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.h b/Source/Core/DolphinQt/Config/NewPatchDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/NewPatchDialog.h
rename to Source/Core/DolphinQt/Config/NewPatchDialog.h
diff --git a/Source/Core/DolphinQt2/Config/PatchesWidget.cpp b/Source/Core/DolphinQt/Config/PatchesWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Config/PatchesWidget.cpp
rename to Source/Core/DolphinQt/Config/PatchesWidget.cpp
index e222189581..2f5f85c686 100644
--- a/Source/Core/DolphinQt2/Config/PatchesWidget.cpp
+++ b/Source/Core/DolphinQt/Config/PatchesWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Config/PatchesWidget.h"
+#include "DolphinQt/Config/PatchesWidget.h"
 
 #include <QGridLayout>
 #include <QListWidget>
@@ -15,7 +15,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/PatchEngine.h"
 
-#include "DolphinQt2/Config/NewPatchDialog.h"
+#include "DolphinQt/Config/NewPatchDialog.h"
 
 #include "UICommon/GameFile.h"
 
diff --git a/Source/Core/DolphinQt2/Config/PatchesWidget.h b/Source/Core/DolphinQt/Config/PatchesWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/PatchesWidget.h
rename to Source/Core/DolphinQt/Config/PatchesWidget.h
diff --git a/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp b/Source/Core/DolphinQt/Config/PropertiesDialog.cpp
similarity index 85%
rename from Source/Core/DolphinQt2/Config/PropertiesDialog.cpp
rename to Source/Core/DolphinQt/Config/PropertiesDialog.cpp
index 2a1e93b26a..52cb9a89e2 100644
--- a/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp
+++ b/Source/Core/DolphinQt/Config/PropertiesDialog.cpp
@@ -9,14 +9,14 @@
 
 #include "DiscIO/Enums.h"
 
-#include "DolphinQt2/Config/ARCodeWidget.h"
-#include "DolphinQt2/Config/FilesystemWidget.h"
-#include "DolphinQt2/Config/GameConfigWidget.h"
-#include "DolphinQt2/Config/GeckoCodeWidget.h"
-#include "DolphinQt2/Config/InfoWidget.h"
-#include "DolphinQt2/Config/PatchesWidget.h"
-#include "DolphinQt2/Config/PropertiesDialog.h"
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/Config/ARCodeWidget.h"
+#include "DolphinQt/Config/FilesystemWidget.h"
+#include "DolphinQt/Config/GameConfigWidget.h"
+#include "DolphinQt/Config/GeckoCodeWidget.h"
+#include "DolphinQt/Config/InfoWidget.h"
+#include "DolphinQt/Config/PatchesWidget.h"
+#include "DolphinQt/Config/PropertiesDialog.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
 
 #include "UICommon/GameFile.h"
 
diff --git a/Source/Core/DolphinQt2/Config/PropertiesDialog.h b/Source/Core/DolphinQt/Config/PropertiesDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/PropertiesDialog.h
rename to Source/Core/DolphinQt/Config/PropertiesDialog.h
diff --git a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp b/Source/Core/DolphinQt/Config/SettingsWindow.cpp
similarity index 78%
rename from Source/Core/DolphinQt2/Config/SettingsWindow.cpp
rename to Source/Core/DolphinQt/Config/SettingsWindow.cpp
index ace849cb74..804eb764a8 100644
--- a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
+++ b/Source/Core/DolphinQt/Config/SettingsWindow.cpp
@@ -7,18 +7,18 @@
 #include <QTabWidget>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/Config/SettingsWindow.h"
-#include "DolphinQt2/MainWindow.h"
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
-#include "DolphinQt2/Settings/AdvancedPane.h"
-#include "DolphinQt2/Settings/AudioPane.h"
-#include "DolphinQt2/Settings/GameCubePane.h"
-#include "DolphinQt2/Settings/GeneralPane.h"
-#include "DolphinQt2/Settings/InterfacePane.h"
-#include "DolphinQt2/Settings/PathPane.h"
-#include "DolphinQt2/Settings/WiiPane.h"
+#include "DolphinQt/Config/SettingsWindow.h"
+#include "DolphinQt/MainWindow.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
+#include "DolphinQt/Settings/AdvancedPane.h"
+#include "DolphinQt/Settings/AudioPane.h"
+#include "DolphinQt/Settings/GameCubePane.h"
+#include "DolphinQt/Settings/GeneralPane.h"
+#include "DolphinQt/Settings/InterfacePane.h"
+#include "DolphinQt/Settings/PathPane.h"
+#include "DolphinQt/Settings/WiiPane.h"
 
 #include "Core/Core.h"
 
diff --git a/Source/Core/DolphinQt2/Config/SettingsWindow.h b/Source/Core/DolphinQt/Config/SettingsWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/Config/SettingsWindow.h
rename to Source/Core/DolphinQt/Config/SettingsWindow.h
diff --git a/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp b/Source/Core/DolphinQt/Debugger/BreakpointWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp
rename to Source/Core/DolphinQt/Debugger/BreakpointWidget.cpp
index 684134f363..c8e22b8fbd 100644
--- a/Source/Core/DolphinQt2/Debugger/BreakpointWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/BreakpointWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/BreakpointWidget.h"
+#include "DolphinQt/Debugger/BreakpointWidget.h"
 
 #include <QHeaderView>
 #include <QTableWidget>
@@ -17,10 +17,10 @@
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
 
-#include "DolphinQt2/Debugger/NewBreakpointDialog.h"
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Debugger/NewBreakpointDialog.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
 
 BreakpointWidget::BreakpointWidget(QWidget* parent) : QDockWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Debugger/BreakpointWidget.h b/Source/Core/DolphinQt/Debugger/BreakpointWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Debugger/BreakpointWidget.h
rename to Source/Core/DolphinQt/Debugger/BreakpointWidget.h
diff --git a/Source/Core/DolphinQt2/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Debugger/CodeViewWidget.cpp
rename to Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
index eb09dfae11..629a3efdb4 100644
--- a/Source/Core/DolphinQt2/Debugger/CodeViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/CodeViewWidget.h"
+#include "DolphinQt/Debugger/CodeViewWidget.h"
 
 #include <algorithm>
 #include <cmath>
@@ -26,9 +26,9 @@
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
 
 constexpr size_t VALID_BRANCH_LENGTH = 10;
 
diff --git a/Source/Core/DolphinQt2/Debugger/CodeViewWidget.h b/Source/Core/DolphinQt/Debugger/CodeViewWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Debugger/CodeViewWidget.h
rename to Source/Core/DolphinQt/Debugger/CodeViewWidget.h
diff --git a/Source/Core/DolphinQt2/Debugger/CodeWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Debugger/CodeWidget.cpp
rename to Source/Core/DolphinQt/Debugger/CodeWidget.cpp
index 27ed139a93..4f782e0152 100644
--- a/Source/Core/DolphinQt2/Debugger/CodeWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/CodeWidget.h"
+#include "DolphinQt/Debugger/CodeWidget.h"
 
 #include <chrono>
 
@@ -22,8 +22,8 @@
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
-#include "DolphinQt2/Host.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Host.h"
+#include "DolphinQt/Settings.h"
 
 CodeWidget::CodeWidget(QWidget* parent) : QDockWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Debugger/CodeWidget.h b/Source/Core/DolphinQt/Debugger/CodeWidget.h
similarity index 96%
rename from Source/Core/DolphinQt2/Debugger/CodeWidget.h
rename to Source/Core/DolphinQt/Debugger/CodeWidget.h
index ec7c4faef9..ef755ab10c 100644
--- a/Source/Core/DolphinQt2/Debugger/CodeWidget.h
+++ b/Source/Core/DolphinQt/Debugger/CodeWidget.h
@@ -8,7 +8,7 @@
 #include <QString>
 
 #include "Common/CommonTypes.h"
-#include "DolphinQt2/Debugger/CodeViewWidget.h"
+#include "DolphinQt/Debugger/CodeViewWidget.h"
 
 class QCloseEvent;
 class QLineEdit;
diff --git a/Source/Core/DolphinQt2/Debugger/JITWidget.cpp b/Source/Core/DolphinQt/Debugger/JITWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Debugger/JITWidget.cpp
rename to Source/Core/DolphinQt/Debugger/JITWidget.cpp
index 2cf73ddbca..806842dda4 100644
--- a/Source/Core/DolphinQt2/Debugger/JITWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/JITWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/JITWidget.h"
+#include "DolphinQt/Debugger/JITWidget.h"
 
 #include <QPushButton>
 #include <QSplitter>
@@ -15,7 +15,7 @@
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "UICommon/Disassembler.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 JITWidget::JITWidget(QWidget* parent) : QDockWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Debugger/JITWidget.h b/Source/Core/DolphinQt/Debugger/JITWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Debugger/JITWidget.h
rename to Source/Core/DolphinQt/Debugger/JITWidget.h
diff --git a/Source/Core/DolphinQt2/Debugger/MemoryViewWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Debugger/MemoryViewWidget.cpp
rename to Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
index fca86c62eb..d97c8cc26f 100644
--- a/Source/Core/DolphinQt2/Debugger/MemoryViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/MemoryViewWidget.h"
+#include "DolphinQt/Debugger/MemoryViewWidget.h"
 
 #include <QApplication>
 #include <QClipboard>
@@ -19,9 +19,9 @@
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PowerPC.h"
 
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
 
 MemoryViewWidget::MemoryViewWidget(QWidget* parent) : QTableWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Debugger/MemoryViewWidget.h b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Debugger/MemoryViewWidget.h
rename to Source/Core/DolphinQt/Debugger/MemoryViewWidget.h
diff --git a/Source/Core/DolphinQt2/Debugger/MemoryWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Debugger/MemoryWidget.cpp
rename to Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
index 4778edacf0..142037ccd9 100644
--- a/Source/Core/DolphinQt2/Debugger/MemoryWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/MemoryWidget.h"
+#include "DolphinQt/Debugger/MemoryWidget.h"
 
 #include <string>
 
@@ -26,8 +26,8 @@
 #include "Core/HW/DSP.h"
 #include "Core/HW/Memmap.h"
 #include "Core/PowerPC/PowerPC.h"
-#include "DolphinQt2/Debugger/MemoryViewWidget.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Debugger/MemoryViewWidget.h"
+#include "DolphinQt/Settings.h"
 
 MemoryWidget::MemoryWidget(QWidget* parent) : QDockWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Debugger/MemoryWidget.h b/Source/Core/DolphinQt/Debugger/MemoryWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Debugger/MemoryWidget.h
rename to Source/Core/DolphinQt/Debugger/MemoryWidget.h
diff --git a/Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.cpp b/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.cpp
rename to Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp
index dfc107d60b..6cf68babab 100644
--- a/Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.cpp
+++ b/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/NewBreakpointDialog.h"
+#include "DolphinQt/Debugger/NewBreakpointDialog.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -15,7 +15,7 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/Debugger/BreakpointWidget.h"
+#include "DolphinQt/Debugger/BreakpointWidget.h"
 
 NewBreakpointDialog::NewBreakpointDialog(BreakpointWidget* parent)
     : QDialog(parent), m_parent(parent)
diff --git a/Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.h b/Source/Core/DolphinQt/Debugger/NewBreakpointDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/Debugger/NewBreakpointDialog.h
rename to Source/Core/DolphinQt/Debugger/NewBreakpointDialog.h
diff --git a/Source/Core/DolphinQt2/Debugger/RegisterColumn.cpp b/Source/Core/DolphinQt/Debugger/RegisterColumn.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Debugger/RegisterColumn.cpp
rename to Source/Core/DolphinQt/Debugger/RegisterColumn.cpp
index 2acacd2602..09c1b2562b 100644
--- a/Source/Core/DolphinQt2/Debugger/RegisterColumn.cpp
+++ b/Source/Core/DolphinQt/Debugger/RegisterColumn.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/RegisterColumn.h"
+#include "DolphinQt/Debugger/RegisterColumn.h"
 
 #include <cstring>
 #include <utility>
diff --git a/Source/Core/DolphinQt2/Debugger/RegisterColumn.h b/Source/Core/DolphinQt/Debugger/RegisterColumn.h
similarity index 100%
rename from Source/Core/DolphinQt2/Debugger/RegisterColumn.h
rename to Source/Core/DolphinQt/Debugger/RegisterColumn.h
diff --git a/Source/Core/DolphinQt2/Debugger/RegisterWidget.cpp b/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Debugger/RegisterWidget.cpp
rename to Source/Core/DolphinQt/Debugger/RegisterWidget.cpp
index 9942516002..995b6db84e 100644
--- a/Source/Core/DolphinQt2/Debugger/RegisterWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/RegisterWidget.h"
+#include "DolphinQt/Debugger/RegisterWidget.h"
 
 #include <utility>
 
@@ -14,9 +14,9 @@
 #include "Core/Core.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/PowerPC/PowerPC.h"
-#include "DolphinQt2/Host.h"
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Host.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Settings.h"
 
 RegisterWidget::RegisterWidget(QWidget* parent) : QDockWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Debugger/RegisterWidget.h b/Source/Core/DolphinQt/Debugger/RegisterWidget.h
similarity index 95%
rename from Source/Core/DolphinQt2/Debugger/RegisterWidget.h
rename to Source/Core/DolphinQt/Debugger/RegisterWidget.h
index 795550505e..7064c26e14 100644
--- a/Source/Core/DolphinQt2/Debugger/RegisterWidget.h
+++ b/Source/Core/DolphinQt/Debugger/RegisterWidget.h
@@ -9,7 +9,7 @@
 #include <QDockWidget>
 
 #include "Common/CommonTypes.h"
-#include "DolphinQt2/Debugger/RegisterColumn.h"
+#include "DolphinQt/Debugger/RegisterColumn.h"
 
 class QTableWidget;
 class QCloseEvent;
diff --git a/Source/Core/DolphinQt2/Debugger/WatchWidget.cpp b/Source/Core/DolphinQt/Debugger/WatchWidget.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Debugger/WatchWidget.cpp
rename to Source/Core/DolphinQt/Debugger/WatchWidget.cpp
index 0daa58a5ae..aa64035e2c 100644
--- a/Source/Core/DolphinQt2/Debugger/WatchWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/WatchWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Debugger/WatchWidget.h"
+#include "DolphinQt/Debugger/WatchWidget.h"
 
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
@@ -11,9 +11,9 @@
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PowerPC.h"
 
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
 
 #include <QHeaderView>
 #include <QMenu>
diff --git a/Source/Core/DolphinQt2/Debugger/WatchWidget.h b/Source/Core/DolphinQt/Debugger/WatchWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/Debugger/WatchWidget.h
rename to Source/Core/DolphinQt/Debugger/WatchWidget.h
diff --git a/Source/Core/DolphinQt2/DolphinQt2.manifest b/Source/Core/DolphinQt/DolphinQt.manifest
similarity index 100%
rename from Source/Core/DolphinQt2/DolphinQt2.manifest
rename to Source/Core/DolphinQt/DolphinQt.manifest
diff --git a/Source/Core/DolphinQt2/DolphinQt2.rc b/Source/Core/DolphinQt/DolphinQt.rc
similarity index 100%
rename from Source/Core/DolphinQt2/DolphinQt2.rc
rename to Source/Core/DolphinQt/DolphinQt.rc
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
similarity index 99%
rename from Source/Core/DolphinQt2/DolphinQt2.vcxproj
rename to Source/Core/DolphinQt/DolphinQt.vcxproj
index 75d90eac84..b87180eb2d 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -47,7 +47,7 @@
       <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Manifest>
-      <AdditionalManifestFiles>DolphinQt2.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+      <AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
   </ItemDefinitionGroup>
   <!--
@@ -385,7 +385,7 @@
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="DolphinQt2.rc" />
+    <ResourceCompile Include="DolphinQt.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
@@ -464,4 +464,4 @@
     <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
     <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user b/Source/Core/DolphinQt/DolphinQt.vcxproj.user
similarity index 100%
rename from Source/Core/DolphinQt2/DolphinQt2.vcxproj.user
rename to Source/Core/DolphinQt/DolphinQt.vcxproj.user
diff --git a/Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.cpp b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.cpp
rename to Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
index 7e8323505d..2f53b8445a 100644
--- a/Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.cpp
+++ b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/FIFO/FIFOAnalyzer.h"
+#include "DolphinQt/FIFO/FIFOAnalyzer.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
@@ -21,7 +21,7 @@
 #include "Common/Swap.h"
 #include "Core/FifoPlayer/FifoPlayer.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/OpcodeDecoding.h"
diff --git a/Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.h b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.h
similarity index 100%
rename from Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.h
rename to Source/Core/DolphinQt/FIFO/FIFOAnalyzer.h
diff --git a/Source/Core/DolphinQt2/FIFO/FIFOPlayerWindow.cpp b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/FIFO/FIFOPlayerWindow.cpp
rename to Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
index 48173c8185..dec1c34be4 100644
--- a/Source/Core/DolphinQt2/FIFO/FIFOPlayerWindow.cpp
+++ b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/FIFO/FIFOPlayerWindow.h"
+#include "DolphinQt/FIFO/FIFOPlayerWindow.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -24,9 +24,9 @@
 #include "Core/FifoPlayer/FifoPlayer.h"
 #include "Core/FifoPlayer/FifoRecorder.h"
 
-#include "DolphinQt2/FIFO/FIFOAnalyzer.h"
-#include "DolphinQt2/QtUtils/QueueOnObject.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/FIFO/FIFOAnalyzer.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
+#include "DolphinQt/Settings.h"
 
 FIFOPlayerWindow::FIFOPlayerWindow(QWidget* parent) : QDialog(parent)
 {
diff --git a/Source/Core/DolphinQt2/FIFO/FIFOPlayerWindow.h b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/FIFO/FIFOPlayerWindow.h
rename to Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.h
diff --git a/Source/Core/DolphinQt2/GCMemcardManager.cpp b/Source/Core/DolphinQt/GCMemcardManager.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/GCMemcardManager.cpp
rename to Source/Core/DolphinQt/GCMemcardManager.cpp
index ce014d5b13..872676532a 100644
--- a/Source/Core/DolphinQt2/GCMemcardManager.cpp
+++ b/Source/Core/DolphinQt/GCMemcardManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/GCMemcardManager.h"
+#include "DolphinQt/GCMemcardManager.h"
 
 #include <algorithm>
 
diff --git a/Source/Core/DolphinQt2/GCMemcardManager.h b/Source/Core/DolphinQt/GCMemcardManager.h
similarity index 100%
rename from Source/Core/DolphinQt2/GCMemcardManager.h
rename to Source/Core/DolphinQt/GCMemcardManager.h
diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/GameList/GameList.cpp
rename to Source/Core/DolphinQt/GameList/GameList.cpp
index 54266e1621..0e13cdb0e6 100644
--- a/Source/Core/DolphinQt2/GameList/GameList.cpp
+++ b/Source/Core/DolphinQt/GameList/GameList.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/GameList/GameList.h"
+#include "DolphinQt/GameList/GameList.h"
 
 #include <algorithm>
 #include <cmath>
@@ -33,14 +33,14 @@
 #include "DiscIO/Blob.h"
 #include "DiscIO/Enums.h"
 
-#include "DolphinQt2/Config/PropertiesDialog.h"
-#include "DolphinQt2/GameList/GridProxyModel.h"
-#include "DolphinQt2/GameList/ListProxyModel.h"
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/QtUtils/DoubleClickEventFilter.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
-#include "DolphinQt2/WiiUpdate.h"
+#include "DolphinQt/Config/PropertiesDialog.h"
+#include "DolphinQt/GameList/GridProxyModel.h"
+#include "DolphinQt/GameList/ListProxyModel.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/QtUtils/DoubleClickEventFilter.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
+#include "DolphinQt/WiiUpdate.h"
 
 static bool CompressCB(const std::string&, float, void*);
 
diff --git a/Source/Core/DolphinQt2/GameList/GameList.h b/Source/Core/DolphinQt/GameList/GameList.h
similarity index 97%
rename from Source/Core/DolphinQt2/GameList/GameList.h
rename to Source/Core/DolphinQt/GameList/GameList.h
index 9758a05c30..5a51371beb 100644
--- a/Source/Core/DolphinQt2/GameList/GameList.h
+++ b/Source/Core/DolphinQt/GameList/GameList.h
@@ -12,7 +12,7 @@
 #include <QStackedWidget>
 #include <QTableView>
 
-#include "DolphinQt2/GameList/GameListModel.h"
+#include "DolphinQt/GameList/GameListModel.h"
 
 #include "UICommon/GameFile.h"
 
diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.cpp b/Source/Core/DolphinQt/GameList/GameListModel.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/GameList/GameListModel.cpp
rename to Source/Core/DolphinQt/GameList/GameListModel.cpp
index dc5d1b191f..e18fdde725 100644
--- a/Source/Core/DolphinQt2/GameList/GameListModel.cpp
+++ b/Source/Core/DolphinQt/GameList/GameListModel.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/GameList/GameListModel.h"
+#include "DolphinQt/GameList/GameListModel.h"
 
 #include <QPixmap>
 
@@ -10,9 +10,9 @@
 
 #include "DiscIO/Enums.h"
 
-#include "DolphinQt2/QtUtils/ImageConverter.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/QtUtils/ImageConverter.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
 
 #include "UICommon/UICommon.h"
 
diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.h b/Source/Core/DolphinQt/GameList/GameListModel.h
similarity index 97%
rename from Source/Core/DolphinQt2/GameList/GameListModel.h
rename to Source/Core/DolphinQt/GameList/GameListModel.h
index daf5058978..997fa0eb34 100644
--- a/Source/Core/DolphinQt2/GameList/GameListModel.h
+++ b/Source/Core/DolphinQt/GameList/GameListModel.h
@@ -12,7 +12,7 @@
 
 #include "Core/TitleDatabase.h"
 
-#include "DolphinQt2/GameList/GameTracker.h"
+#include "DolphinQt/GameList/GameTracker.h"
 
 #include "UICommon/GameFile.h"
 
diff --git a/Source/Core/DolphinQt2/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/GameList/GameTracker.cpp
rename to Source/Core/DolphinQt/GameList/GameTracker.cpp
index 4fba14c4d0..b40585995f 100644
--- a/Source/Core/DolphinQt2/GameList/GameTracker.cpp
+++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/GameList/GameTracker.h"
+#include "DolphinQt/GameList/GameTracker.h"
 
 #include <QDir>
 #include <QDirIterator>
@@ -12,10 +12,10 @@
 
 #include "DiscIO/DirectoryBlob.h"
 
-#include "DolphinQt2/QtUtils/QueueOnObject.h"
-#include "DolphinQt2/QtUtils/RunOnObject.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
+#include "DolphinQt/QtUtils/RunOnObject.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 // NOTE: Qt likes to be case-sensitive here even though it shouldn't be thus this ugly regex hack
 static const QStringList game_filters{
diff --git a/Source/Core/DolphinQt2/GameList/GameTracker.h b/Source/Core/DolphinQt/GameList/GameTracker.h
similarity index 100%
rename from Source/Core/DolphinQt2/GameList/GameTracker.h
rename to Source/Core/DolphinQt/GameList/GameTracker.h
diff --git a/Source/Core/DolphinQt2/GameList/GridProxyModel.cpp b/Source/Core/DolphinQt/GameList/GridProxyModel.cpp
similarity index 93%
rename from Source/Core/DolphinQt2/GameList/GridProxyModel.cpp
rename to Source/Core/DolphinQt/GameList/GridProxyModel.cpp
index b842a98b46..516357ac76 100644
--- a/Source/Core/DolphinQt2/GameList/GridProxyModel.cpp
+++ b/Source/Core/DolphinQt/GameList/GridProxyModel.cpp
@@ -2,12 +2,12 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/GameList/GridProxyModel.h"
+#include "DolphinQt/GameList/GridProxyModel.h"
 
 #include <QPixmap>
 #include <QSize>
 
-#include "DolphinQt2/GameList/GameListModel.h"
+#include "DolphinQt/GameList/GameListModel.h"
 
 const QSize LARGE_BANNER_SIZE(144, 48);
 
diff --git a/Source/Core/DolphinQt2/GameList/GridProxyModel.h b/Source/Core/DolphinQt/GameList/GridProxyModel.h
similarity index 100%
rename from Source/Core/DolphinQt2/GameList/GridProxyModel.h
rename to Source/Core/DolphinQt/GameList/GridProxyModel.h
diff --git a/Source/Core/DolphinQt2/GameList/ListProxyModel.cpp b/Source/Core/DolphinQt/GameList/ListProxyModel.cpp
similarity index 91%
rename from Source/Core/DolphinQt2/GameList/ListProxyModel.cpp
rename to Source/Core/DolphinQt/GameList/ListProxyModel.cpp
index 7ce4d504c3..396e2c1542 100644
--- a/Source/Core/DolphinQt2/GameList/ListProxyModel.cpp
+++ b/Source/Core/DolphinQt/GameList/ListProxyModel.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/GameList/ListProxyModel.h"
-#include "DolphinQt2/GameList/GameListModel.h"
+#include "DolphinQt/GameList/ListProxyModel.h"
+#include "DolphinQt/GameList/GameListModel.h"
 
 ListProxyModel::ListProxyModel(QObject* parent) : QSortFilterProxyModel(parent)
 {
diff --git a/Source/Core/DolphinQt2/GameList/ListProxyModel.h b/Source/Core/DolphinQt/GameList/ListProxyModel.h
similarity index 100%
rename from Source/Core/DolphinQt2/GameList/ListProxyModel.h
rename to Source/Core/DolphinQt/GameList/ListProxyModel.h
diff --git a/Source/Core/DolphinQt2/Host.cpp b/Source/Core/DolphinQt/Host.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/Host.cpp
rename to Source/Core/DolphinQt/Host.cpp
index 137528a791..8b448cc288 100644
--- a/Source/Core/DolphinQt2/Host.cpp
+++ b/Source/Core/DolphinQt/Host.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Host.h"
+#include "DolphinQt/Host.h"
 
 #include <QAbstractEventDispatcher>
 #include <QApplication>
@@ -16,8 +16,8 @@
 #include "Core/Host.h"
 #include "Core/PowerPC/PowerPC.h"
 
-#include "DolphinQt2/QtUtils/QueueOnObject.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
+#include "DolphinQt/Settings.h"
 
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/DolphinQt2/Host.h b/Source/Core/DolphinQt/Host.h
similarity index 100%
rename from Source/Core/DolphinQt2/Host.h
rename to Source/Core/DolphinQt/Host.h
diff --git a/Source/Core/DolphinQt2/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/HotkeyScheduler.cpp
rename to Source/Core/DolphinQt/HotkeyScheduler.cpp
index 8ce14c6cd2..4853fd4517 100644
--- a/Source/Core/DolphinQt2/HotkeyScheduler.cpp
+++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/HotkeyScheduler.h"
+#include "DolphinQt/HotkeyScheduler.h"
 
 #include <algorithm>
 #include <thread>
@@ -21,8 +21,8 @@
 #include "Core/IOS/USB/Bluetooth/BTBase.h"
 #include "Core/State.h"
 
-#include "DolphinQt2/MainWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/MainWindow.h"
+#include "DolphinQt/Settings.h"
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
diff --git a/Source/Core/DolphinQt2/HotkeyScheduler.h b/Source/Core/DolphinQt/HotkeyScheduler.h
similarity index 100%
rename from Source/Core/DolphinQt2/HotkeyScheduler.h
rename to Source/Core/DolphinQt/HotkeyScheduler.h
diff --git a/Source/Core/DolphinQt2/Info.plist.in b/Source/Core/DolphinQt/Info.plist.in
similarity index 100%
rename from Source/Core/DolphinQt2/Info.plist.in
rename to Source/Core/DolphinQt/Info.plist.in
diff --git a/Source/Core/DolphinQt2/Main.cpp b/Source/Core/DolphinQt/Main.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/Main.cpp
rename to Source/Core/DolphinQt/Main.cpp
index c98b5c99c9..7f743cc91e 100644
--- a/Source/Core/DolphinQt2/Main.cpp
+++ b/Source/Core/DolphinQt/Main.cpp
@@ -22,13 +22,13 @@
 #include "Core/Boot/Boot.h"
 #include "Core/BootManager.h"
 #include "Core/Core.h"
-#include "DolphinQt2/Host.h"
-#include "DolphinQt2/MainWindow.h"
-#include "DolphinQt2/QtUtils/RunOnObject.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
-#include "DolphinQt2/Translation.h"
-#include "DolphinQt2/Updater.h"
+#include "DolphinQt/Host.h"
+#include "DolphinQt/MainWindow.h"
+#include "DolphinQt/QtUtils/RunOnObject.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
+#include "DolphinQt/Translation.h"
+#include "DolphinQt/Updater.h"
 #include "UICommon/CommandLineParse.h"
 #include "UICommon/UICommon.h"
 
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/MainWindow.cpp
rename to Source/Core/DolphinQt/MainWindow.cpp
index 3eb14af5d0..b4883368af 100644
--- a/Source/Core/DolphinQt2/MainWindow.cpp
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@@ -50,37 +50,37 @@
 
 #include "DiscIO/NANDImporter.h"
 
-#include "DolphinQt2/AboutDialog.h"
-#include "DolphinQt2/CheatsManager.h"
-#include "DolphinQt2/Config/ControllersWindow.h"
-#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
-#include "DolphinQt2/Config/LogConfigWidget.h"
-#include "DolphinQt2/Config/LogWidget.h"
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
-#include "DolphinQt2/Config/SettingsWindow.h"
-#include "DolphinQt2/Debugger/BreakpointWidget.h"
-#include "DolphinQt2/Debugger/CodeViewWidget.h"
-#include "DolphinQt2/Debugger/CodeWidget.h"
-#include "DolphinQt2/Debugger/JITWidget.h"
-#include "DolphinQt2/Debugger/MemoryWidget.h"
-#include "DolphinQt2/Debugger/RegisterWidget.h"
-#include "DolphinQt2/Debugger/WatchWidget.h"
-#include "DolphinQt2/FIFO/FIFOPlayerWindow.h"
-#include "DolphinQt2/GCMemcardManager.h"
-#include "DolphinQt2/Host.h"
-#include "DolphinQt2/HotkeyScheduler.h"
-#include "DolphinQt2/MainWindow.h"
-#include "DolphinQt2/NetPlay/NetPlayDialog.h"
-#include "DolphinQt2/NetPlay/NetPlaySetupDialog.h"
-#include "DolphinQt2/QtUtils/QueueOnObject.h"
-#include "DolphinQt2/QtUtils/RunOnObject.h"
-#include "DolphinQt2/QtUtils/WindowActivationEventFilter.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/SearchBar.h"
-#include "DolphinQt2/Settings.h"
-#include "DolphinQt2/TAS/GCTASInputWindow.h"
-#include "DolphinQt2/TAS/WiiTASInputWindow.h"
-#include "DolphinQt2/WiiUpdate.h"
+#include "DolphinQt/AboutDialog.h"
+#include "DolphinQt/CheatsManager.h"
+#include "DolphinQt/Config/ControllersWindow.h"
+#include "DolphinQt/Config/Graphics/GraphicsWindow.h"
+#include "DolphinQt/Config/LogConfigWidget.h"
+#include "DolphinQt/Config/LogWidget.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/Config/SettingsWindow.h"
+#include "DolphinQt/Debugger/BreakpointWidget.h"
+#include "DolphinQt/Debugger/CodeViewWidget.h"
+#include "DolphinQt/Debugger/CodeWidget.h"
+#include "DolphinQt/Debugger/JITWidget.h"
+#include "DolphinQt/Debugger/MemoryWidget.h"
+#include "DolphinQt/Debugger/RegisterWidget.h"
+#include "DolphinQt/Debugger/WatchWidget.h"
+#include "DolphinQt/FIFO/FIFOPlayerWindow.h"
+#include "DolphinQt/GCMemcardManager.h"
+#include "DolphinQt/Host.h"
+#include "DolphinQt/HotkeyScheduler.h"
+#include "DolphinQt/MainWindow.h"
+#include "DolphinQt/NetPlay/NetPlayDialog.h"
+#include "DolphinQt/NetPlay/NetPlaySetupDialog.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
+#include "DolphinQt/QtUtils/RunOnObject.h"
+#include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/SearchBar.h"
+#include "DolphinQt/Settings.h"
+#include "DolphinQt/TAS/GCTASInputWindow.h"
+#include "DolphinQt/TAS/WiiTASInputWindow.h"
+#include "DolphinQt/WiiUpdate.h"
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
diff --git a/Source/Core/DolphinQt2/MainWindow.h b/Source/Core/DolphinQt/MainWindow.h
similarity index 97%
rename from Source/Core/DolphinQt2/MainWindow.h
rename to Source/Core/DolphinQt/MainWindow.h
index 5d80b923e0..0ecc1414ee 100644
--- a/Source/Core/DolphinQt2/MainWindow.h
+++ b/Source/Core/DolphinQt/MainWindow.h
@@ -13,10 +13,10 @@
 #include <optional>
 #include <string>
 
-#include "DolphinQt2/GameList/GameList.h"
-#include "DolphinQt2/MenuBar.h"
-#include "DolphinQt2/RenderWidget.h"
-#include "DolphinQt2/ToolBar.h"
+#include "DolphinQt/GameList/GameList.h"
+#include "DolphinQt/MenuBar.h"
+#include "DolphinQt/RenderWidget.h"
+#include "DolphinQt/ToolBar.h"
 
 class QProgressDialog;
 
diff --git a/Source/Core/DolphinQt2/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/MenuBar.cpp
rename to Source/Core/DolphinQt/MenuBar.cpp
index 3487bc85b3..0f8139034f 100644
--- a/Source/Core/DolphinQt2/MenuBar.cpp
+++ b/Source/Core/DolphinQt/MenuBar.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/MenuBar.h"
+#include "DolphinQt/MenuBar.h"
 
 #include <cinttypes>
 
@@ -45,11 +45,11 @@
 #include "DiscIO/NANDImporter.h"
 #include "DiscIO/WiiSaveBanner.h"
 
-#include "DolphinQt2/AboutDialog.h"
-#include "DolphinQt2/Host.h"
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Settings.h"
-#include "DolphinQt2/Updater.h"
+#include "DolphinQt/AboutDialog.h"
+#include "DolphinQt/Host.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Settings.h"
+#include "DolphinQt/Updater.h"
 
 #include "UICommon/GameFile.h"
 
diff --git a/Source/Core/DolphinQt2/MenuBar.h b/Source/Core/DolphinQt/MenuBar.h
similarity index 100%
rename from Source/Core/DolphinQt2/MenuBar.h
rename to Source/Core/DolphinQt/MenuBar.h
diff --git a/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp b/Source/Core/DolphinQt/NetPlay/GameListDialog.cpp
similarity index 92%
rename from Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp
rename to Source/Core/DolphinQt/NetPlay/GameListDialog.cpp
index e56c3e7eff..9fa14e3b30 100644
--- a/Source/Core/DolphinQt2/NetPlay/GameListDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/GameListDialog.cpp
@@ -2,14 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/NetPlay/GameListDialog.h"
+#include "DolphinQt/NetPlay/GameListDialog.h"
 
 #include <QDialogButtonBox>
 #include <QListWidget>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/GameList/GameListModel.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/GameList/GameListModel.h"
+#include "DolphinQt/Settings.h"
 
 GameListDialog::GameListDialog(QWidget* parent) : QDialog(parent)
 {
diff --git a/Source/Core/DolphinQt2/NetPlay/GameListDialog.h b/Source/Core/DolphinQt/NetPlay/GameListDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/NetPlay/GameListDialog.h
rename to Source/Core/DolphinQt/NetPlay/GameListDialog.h
diff --git a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp b/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp
rename to Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp
index ecfafac610..4b778849dc 100644
--- a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/NetPlay/MD5Dialog.h"
+#include "DolphinQt/NetPlay/MD5Dialog.h"
 
 #include <algorithm>
 #include <functional>
@@ -13,7 +13,7 @@
 #include <QProgressBar>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 static QString GetPlayerNameFromPID(int pid)
 {
diff --git a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.h b/Source/Core/DolphinQt/NetPlay/MD5Dialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/NetPlay/MD5Dialog.h
rename to Source/Core/DolphinQt/NetPlay/MD5Dialog.h
diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
rename to Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
index 0a7caf45e8..c61adc081b 100644
--- a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/NetPlay/NetPlayDialog.h"
+#include "DolphinQt/NetPlay/NetPlayDialog.h"
 
 #include <QAction>
 #include <QApplication>
@@ -36,14 +36,14 @@
 #include "Core/Core.h"
 #include "Core/NetPlayServer.h"
 
-#include "DolphinQt2/GameList/GameList.h"
-#include "DolphinQt2/NetPlay/GameListDialog.h"
-#include "DolphinQt2/NetPlay/MD5Dialog.h"
-#include "DolphinQt2/NetPlay/PadMappingDialog.h"
-#include "DolphinQt2/QtUtils/QueueOnObject.h"
-#include "DolphinQt2/QtUtils/RunOnObject.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/GameList/GameList.h"
+#include "DolphinQt/NetPlay/GameListDialog.h"
+#include "DolphinQt/NetPlay/MD5Dialog.h"
+#include "DolphinQt/NetPlay/PadMappingDialog.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
+#include "DolphinQt/QtUtils/RunOnObject.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
 
 #include "VideoCommon/VideoConfig.h"
 
diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h
rename to Source/Core/DolphinQt/NetPlay/NetPlayDialog.h
diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp
rename to Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp
index e873a0726a..6f7818e2b0 100644
--- a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/NetPlay/NetPlaySetupDialog.h"
+#include "DolphinQt/NetPlay/NetPlaySetupDialog.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -18,8 +18,8 @@
 
 #include "Core/Config/NetplaySettings.h"
 
-#include "DolphinQt2/GameList/GameListModel.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/GameList/GameListModel.h"
+#include "DolphinQt/Settings.h"
 
 NetPlaySetupDialog::NetPlaySetupDialog(QWidget* parent)
     : QDialog(parent), m_game_list_model(Settings::Instance().GetGameListModel())
diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.h b/Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.h
rename to Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.h
diff --git a/Source/Core/DolphinQt2/NetPlay/PadMappingDialog.cpp b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/NetPlay/PadMappingDialog.cpp
rename to Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
index 7617475c91..f526546d1a 100644
--- a/Source/Core/DolphinQt2/NetPlay/PadMappingDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/NetPlay/PadMappingDialog.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/NetPlay/PadMappingDialog.h"
+#include "DolphinQt/Settings.h"
 
 #include "Core/NetPlayClient.h"
 
diff --git a/Source/Core/DolphinQt2/NetPlay/PadMappingDialog.h b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/NetPlay/PadMappingDialog.h
rename to Source/Core/DolphinQt/NetPlay/PadMappingDialog.h
diff --git a/Source/Core/DolphinQt2/QtUtils/ActionHelper.h b/Source/Core/DolphinQt/QtUtils/ActionHelper.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/ActionHelper.h
rename to Source/Core/DolphinQt/QtUtils/ActionHelper.h
diff --git a/Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.cpp b/Source/Core/DolphinQt/QtUtils/AspectRatioWidget.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.cpp
rename to Source/Core/DolphinQt/QtUtils/AspectRatioWidget.cpp
index 804db5cc87..b7f0cd5062 100644
--- a/Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.cpp
+++ b/Source/Core/DolphinQt/QtUtils/AspectRatioWidget.cpp
@@ -5,7 +5,7 @@
 // Based on:
 // https://stackoverflow.com/questions/30005540/keeping-the-aspect-ratio-of-a-sub-classed-qwidget-during-resize
 
-#include "DolphinQt2/QtUtils/AspectRatioWidget.h"
+#include "DolphinQt/QtUtils/AspectRatioWidget.h"
 
 #include <QBoxLayout>
 #include <QResizeEvent>
diff --git a/Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.h b/Source/Core/DolphinQt/QtUtils/AspectRatioWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/AspectRatioWidget.h
rename to Source/Core/DolphinQt/QtUtils/AspectRatioWidget.h
diff --git a/Source/Core/DolphinQt2/QtUtils/BlockUserInputFilter.cpp b/Source/Core/DolphinQt/QtUtils/BlockUserInputFilter.cpp
similarity index 92%
rename from Source/Core/DolphinQt2/QtUtils/BlockUserInputFilter.cpp
rename to Source/Core/DolphinQt/QtUtils/BlockUserInputFilter.cpp
index 6368ae072a..d9ac74041e 100644
--- a/Source/Core/DolphinQt2/QtUtils/BlockUserInputFilter.cpp
+++ b/Source/Core/DolphinQt/QtUtils/BlockUserInputFilter.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/QtUtils/BlockUserInputFilter.h"
+#include "DolphinQt/QtUtils/BlockUserInputFilter.h"
 
 #include <QEvent>
 
diff --git a/Source/Core/DolphinQt2/QtUtils/BlockUserInputFilter.h b/Source/Core/DolphinQt/QtUtils/BlockUserInputFilter.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/BlockUserInputFilter.h
rename to Source/Core/DolphinQt/QtUtils/BlockUserInputFilter.h
diff --git a/Source/Core/DolphinQt2/QtUtils/DoubleClickEventFilter.cpp b/Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.cpp
similarity index 84%
rename from Source/Core/DolphinQt2/QtUtils/DoubleClickEventFilter.cpp
rename to Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.cpp
index 3a626e1203..993da44f62 100644
--- a/Source/Core/DolphinQt2/QtUtils/DoubleClickEventFilter.cpp
+++ b/Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.cpp
@@ -4,7 +4,7 @@
 
 #include <QEvent>
 
-#include "DolphinQt2/QtUtils/DoubleClickEventFilter.h"
+#include "DolphinQt/QtUtils/DoubleClickEventFilter.h"
 
 bool DoubleClickEventFilter::eventFilter(QObject* object, QEvent* event)
 {
diff --git a/Source/Core/DolphinQt2/QtUtils/DoubleClickEventFilter.h b/Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/DoubleClickEventFilter.h
rename to Source/Core/DolphinQt/QtUtils/DoubleClickEventFilter.h
diff --git a/Source/Core/DolphinQt2/QtUtils/ElidedButton.cpp b/Source/Core/DolphinQt/QtUtils/ElidedButton.cpp
similarity index 95%
rename from Source/Core/DolphinQt2/QtUtils/ElidedButton.cpp
rename to Source/Core/DolphinQt/QtUtils/ElidedButton.cpp
index 309c4b5d29..a77ba82c53 100644
--- a/Source/Core/DolphinQt2/QtUtils/ElidedButton.cpp
+++ b/Source/Core/DolphinQt/QtUtils/ElidedButton.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/QtUtils/ElidedButton.h"
+#include "DolphinQt/QtUtils/ElidedButton.h"
 
 #include <QFontMetrics>
 #include <QStyleOptionButton>
diff --git a/Source/Core/DolphinQt2/QtUtils/ElidedButton.h b/Source/Core/DolphinQt/QtUtils/ElidedButton.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/ElidedButton.h
rename to Source/Core/DolphinQt/QtUtils/ElidedButton.h
diff --git a/Source/Core/DolphinQt2/QtUtils/ImageConverter.cpp b/Source/Core/DolphinQt/QtUtils/ImageConverter.cpp
similarity index 94%
rename from Source/Core/DolphinQt2/QtUtils/ImageConverter.cpp
rename to Source/Core/DolphinQt/QtUtils/ImageConverter.cpp
index 32fadf788e..116c08f48b 100644
--- a/Source/Core/DolphinQt2/QtUtils/ImageConverter.cpp
+++ b/Source/Core/DolphinQt/QtUtils/ImageConverter.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/QtUtils/ImageConverter.h"
+#include "DolphinQt/QtUtils/ImageConverter.h"
 
 #include <vector>
 
diff --git a/Source/Core/DolphinQt2/QtUtils/ImageConverter.h b/Source/Core/DolphinQt/QtUtils/ImageConverter.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/ImageConverter.h
rename to Source/Core/DolphinQt/QtUtils/ImageConverter.h
diff --git a/Source/Core/DolphinQt2/QtUtils/QueueOnObject.h b/Source/Core/DolphinQt/QtUtils/QueueOnObject.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/QueueOnObject.h
rename to Source/Core/DolphinQt/QtUtils/QueueOnObject.h
diff --git a/Source/Core/DolphinQt2/QtUtils/RunOnObject.h b/Source/Core/DolphinQt/QtUtils/RunOnObject.h
similarity index 97%
rename from Source/Core/DolphinQt2/QtUtils/RunOnObject.h
rename to Source/Core/DolphinQt/QtUtils/RunOnObject.h
index 61628e7b3d..a768b71cb1 100644
--- a/Source/Core/DolphinQt2/QtUtils/RunOnObject.h
+++ b/Source/Core/DolphinQt/QtUtils/RunOnObject.h
@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "Common/Event.h"
-#include "DolphinQt2/QtUtils/QueueOnObject.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
 
 class QObject;
 
diff --git a/Source/Core/DolphinQt2/QtUtils/SignalDaemon.cpp b/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/QtUtils/SignalDaemon.cpp
rename to Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp
index 546b03a252..b0690a66ee 100644
--- a/Source/Core/DolphinQt2/QtUtils/SignalDaemon.cpp
+++ b/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/QtUtils/SignalDaemon.h"
+#include "DolphinQt/QtUtils/SignalDaemon.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
diff --git a/Source/Core/DolphinQt2/QtUtils/SignalDaemon.h b/Source/Core/DolphinQt/QtUtils/SignalDaemon.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/SignalDaemon.h
rename to Source/Core/DolphinQt/QtUtils/SignalDaemon.h
diff --git a/Source/Core/DolphinQt2/QtUtils/WinIconHelper.cpp b/Source/Core/DolphinQt/QtUtils/WinIconHelper.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/QtUtils/WinIconHelper.cpp
rename to Source/Core/DolphinQt/QtUtils/WinIconHelper.cpp
index c076a9c250..10cadb216c 100644
--- a/Source/Core/DolphinQt2/QtUtils/WinIconHelper.cpp
+++ b/Source/Core/DolphinQt/QtUtils/WinIconHelper.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/QtUtils/WinIconHelper.h"
+#include "DolphinQt/QtUtils/WinIconHelper.h"
 
 #ifdef _WIN32
 
diff --git a/Source/Core/DolphinQt2/QtUtils/WinIconHelper.h b/Source/Core/DolphinQt/QtUtils/WinIconHelper.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/WinIconHelper.h
rename to Source/Core/DolphinQt/QtUtils/WinIconHelper.h
diff --git a/Source/Core/DolphinQt2/QtUtils/WindowActivationEventFilter.cpp b/Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.cpp
similarity index 87%
rename from Source/Core/DolphinQt2/QtUtils/WindowActivationEventFilter.cpp
rename to Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.cpp
index 97263c3747..74907c46d6 100644
--- a/Source/Core/DolphinQt2/QtUtils/WindowActivationEventFilter.cpp
+++ b/Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.cpp
@@ -5,7 +5,7 @@
 #include <QEvent>
 #include <QObject>
 
-#include "DolphinQt2/QtUtils/WindowActivationEventFilter.h"
+#include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
 
 bool WindowActivationEventFilter::eventFilter(QObject* object, QEvent* event)
 {
diff --git a/Source/Core/DolphinQt2/QtUtils/WindowActivationEventFilter.h b/Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/WindowActivationEventFilter.h
rename to Source/Core/DolphinQt/QtUtils/WindowActivationEventFilter.h
diff --git a/Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp b/Source/Core/DolphinQt/QtUtils/WrapInScrollArea.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp
rename to Source/Core/DolphinQt/QtUtils/WrapInScrollArea.cpp
index ef3a1f1fff..d06f7b957f 100644
--- a/Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp
+++ b/Source/Core/DolphinQt/QtUtils/WrapInScrollArea.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
+#include "DolphinQt/QtUtils/WrapInScrollArea.h"
 
 #include <QFrame>
 #include <QLayout>
diff --git a/Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.h b/Source/Core/DolphinQt/QtUtils/WrapInScrollArea.h
similarity index 100%
rename from Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.h
rename to Source/Core/DolphinQt/QtUtils/WrapInScrollArea.h
diff --git a/Source/Core/DolphinQt2/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/RenderWidget.cpp
rename to Source/Core/DolphinQt/RenderWidget.cpp
index 8d61e05b23..d37872dcdf 100644
--- a/Source/Core/DolphinQt2/RenderWidget.cpp
+++ b/Source/Core/DolphinQt/RenderWidget.cpp
@@ -15,10 +15,10 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Host.h"
-#include "DolphinQt2/RenderWidget.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Host.h"
+#include "DolphinQt/RenderWidget.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
 
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/DolphinQt2/RenderWidget.h b/Source/Core/DolphinQt/RenderWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/RenderWidget.h
rename to Source/Core/DolphinQt/RenderWidget.h
diff --git a/Source/Core/DolphinQt2/Resources.cpp b/Source/Core/DolphinQt/Resources.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/Resources.cpp
rename to Source/Core/DolphinQt/Resources.cpp
index eb0172c7bc..c631b98d95 100644
--- a/Source/Core/DolphinQt2/Resources.cpp
+++ b/Source/Core/DolphinQt/Resources.cpp
@@ -11,11 +11,11 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
 
 #ifdef _WIN32
-#include "DolphinQt2/QtUtils/WinIconHelper.h"
+#include "DolphinQt/QtUtils/WinIconHelper.h"
 #endif
 
 QList<QPixmap> Resources::m_platforms;
diff --git a/Source/Core/DolphinQt2/Resources.h b/Source/Core/DolphinQt/Resources.h
similarity index 100%
rename from Source/Core/DolphinQt2/Resources.h
rename to Source/Core/DolphinQt/Resources.h
diff --git a/Source/Core/DolphinQt2/SearchBar.cpp b/Source/Core/DolphinQt/SearchBar.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/SearchBar.cpp
rename to Source/Core/DolphinQt/SearchBar.cpp
index f12b359727..e546a18d98 100644
--- a/Source/Core/DolphinQt2/SearchBar.cpp
+++ b/Source/Core/DolphinQt/SearchBar.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/SearchBar.h"
+#include "DolphinQt/SearchBar.h"
 
 #include <QHBoxLayout>
 #include <QLineEdit>
diff --git a/Source/Core/DolphinQt2/SearchBar.h b/Source/Core/DolphinQt/SearchBar.h
similarity index 100%
rename from Source/Core/DolphinQt2/SearchBar.h
rename to Source/Core/DolphinQt/SearchBar.h
diff --git a/Source/Core/DolphinQt2/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Settings.cpp
rename to Source/Core/DolphinQt/Settings.cpp
index c04e57ec2a..fa992bee7d 100644
--- a/Source/Core/DolphinQt2/Settings.cpp
+++ b/Source/Core/DolphinQt/Settings.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 #include <QApplication>
 #include <QDir>
@@ -19,8 +19,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/GameList/GameListModel.h"
-#include "DolphinQt2/QtUtils/QueueOnObject.h"
+#include "DolphinQt/GameList/GameListModel.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
 
 #include "InputCommon/InputConfig.h"
 
diff --git a/Source/Core/DolphinQt2/Settings.h b/Source/Core/DolphinQt/Settings.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings.h
rename to Source/Core/DolphinQt/Settings.h
diff --git a/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp b/Source/Core/DolphinQt/Settings/AdvancedPane.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Settings/AdvancedPane.cpp
rename to Source/Core/DolphinQt/Settings/AdvancedPane.cpp
index 1cac06d60e..831bbb228f 100644
--- a/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp
+++ b/Source/Core/DolphinQt/Settings/AdvancedPane.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Settings/AdvancedPane.h"
+#include "DolphinQt/Settings/AdvancedPane.h"
 
 #include <QCheckBox>
 #include <QDateTimeEdit>
@@ -17,7 +17,7 @@
 #include "Core/Core.h"
 #include "Core/HW/SystemTimers.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 AdvancedPane::AdvancedPane(QWidget* parent) : QWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Settings/AdvancedPane.h b/Source/Core/DolphinQt/Settings/AdvancedPane.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings/AdvancedPane.h
rename to Source/Core/DolphinQt/Settings/AdvancedPane.h
diff --git a/Source/Core/DolphinQt2/Settings/AudioPane.cpp b/Source/Core/DolphinQt/Settings/AudioPane.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Settings/AudioPane.cpp
rename to Source/Core/DolphinQt/Settings/AudioPane.cpp
index 9cf4c4e66b..8a3f1fbcd6 100644
--- a/Source/Core/DolphinQt2/Settings/AudioPane.cpp
+++ b/Source/Core/DolphinQt/Settings/AudioPane.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Settings/AudioPane.h"
+#include "DolphinQt/Settings/AudioPane.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -22,8 +22,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 
-#include "DolphinQt2/Config/SettingsWindow.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Config/SettingsWindow.h"
+#include "DolphinQt/Settings.h"
 
 AudioPane::AudioPane()
 {
diff --git a/Source/Core/DolphinQt2/Settings/AudioPane.h b/Source/Core/DolphinQt/Settings/AudioPane.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings/AudioPane.h
rename to Source/Core/DolphinQt/Settings/AudioPane.h
diff --git a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp b/Source/Core/DolphinQt/Settings/GameCubePane.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Settings/GameCubePane.cpp
rename to Source/Core/DolphinQt/Settings/GameCubePane.cpp
index aeb6337ea2..7b50677cfe 100644
--- a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp
+++ b/Source/Core/DolphinQt/Settings/GameCubePane.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Settings/GameCubePane.h"
+#include "DolphinQt/Settings/GameCubePane.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -23,7 +23,7 @@
 #include "Core/HW/EXI/EXI.h"
 #include "Core/HW/GCMemcard/GCMemcard.h"
 
-#include "DolphinQt2/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
 
 constexpr int SLOT_A_INDEX = 0;
 constexpr int SLOT_B_INDEX = 1;
diff --git a/Source/Core/DolphinQt2/Settings/GameCubePane.h b/Source/Core/DolphinQt/Settings/GameCubePane.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings/GameCubePane.h
rename to Source/Core/DolphinQt/Settings/GameCubePane.h
diff --git a/Source/Core/DolphinQt2/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Settings/GeneralPane.cpp
rename to Source/Core/DolphinQt/Settings/GeneralPane.cpp
index 46e29732a5..a7037d96ee 100644
--- a/Source/Core/DolphinQt2/Settings/GeneralPane.cpp
+++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Settings/GeneralPane.h"
+#include "DolphinQt/Settings/GeneralPane.h"
 
 #include <map>
 
@@ -24,7 +24,7 @@
 #include "Core/Core.h"
 #include "Core/PowerPC/PowerPC.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 #include "UICommon/AutoUpdate.h"
 #ifdef USE_DISCORD_PRESENCE
diff --git a/Source/Core/DolphinQt2/Settings/GeneralPane.h b/Source/Core/DolphinQt/Settings/GeneralPane.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings/GeneralPane.h
rename to Source/Core/DolphinQt/Settings/GeneralPane.h
diff --git a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp b/Source/Core/DolphinQt/Settings/InterfacePane.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Settings/InterfacePane.cpp
rename to Source/Core/DolphinQt/Settings/InterfacePane.cpp
index 332ef02609..af1225f90a 100644
--- a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp
+++ b/Source/Core/DolphinQt/Settings/InterfacePane.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Settings/InterfacePane.h"
+#include "DolphinQt/Settings/InterfacePane.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -21,7 +21,7 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/Settings.h"
 
 static QComboBox* MakeLanguageComboBox()
 {
diff --git a/Source/Core/DolphinQt2/Settings/InterfacePane.h b/Source/Core/DolphinQt/Settings/InterfacePane.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings/InterfacePane.h
rename to Source/Core/DolphinQt/Settings/InterfacePane.h
diff --git a/Source/Core/DolphinQt2/Settings/PathPane.cpp b/Source/Core/DolphinQt/Settings/PathPane.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Settings/PathPane.cpp
rename to Source/Core/DolphinQt/Settings/PathPane.cpp
index 4f6099dabc..97e6f63b2b 100644
--- a/Source/Core/DolphinQt2/Settings/PathPane.cpp
+++ b/Source/Core/DolphinQt/Settings/PathPane.cpp
@@ -17,8 +17,8 @@
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Settings.h"
-#include "DolphinQt2/Settings/PathPane.h"
+#include "DolphinQt/Settings.h"
+#include "DolphinQt/Settings/PathPane.h"
 
 PathPane::PathPane(QWidget* parent) : QWidget(parent)
 {
diff --git a/Source/Core/DolphinQt2/Settings/PathPane.h b/Source/Core/DolphinQt/Settings/PathPane.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings/PathPane.h
rename to Source/Core/DolphinQt/Settings/PathPane.h
diff --git a/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp
rename to Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
index e7a5f81167..2f4983c00a 100644
--- a/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp
+++ b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h"
+#include "DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h"
 
 #include <QButtonGroup>
 #include <QDialog>
@@ -23,7 +23,7 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DolphinQt2/Settings/WiiPane.h"
+#include "DolphinQt/Settings/WiiPane.h"
 
 #include "UICommon/USBUtils.h"
 
diff --git a/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h b/Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h
rename to Source/Core/DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h
diff --git a/Source/Core/DolphinQt2/Settings/WiiPane.cpp b/Source/Core/DolphinQt/Settings/WiiPane.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Settings/WiiPane.cpp
rename to Source/Core/DolphinQt/Settings/WiiPane.cpp
index 186500908b..2a0932e4c2 100644
--- a/Source/Core/DolphinQt2/Settings/WiiPane.cpp
+++ b/Source/Core/DolphinQt/Settings/WiiPane.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Settings/WiiPane.h"
+#include "DolphinQt/Settings/WiiPane.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -24,7 +24,7 @@
 #include "Core/Core.h"
 #include "Core/IOS/IOS.h"
 
-#include "DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h"
+#include "DolphinQt/Settings/USBDeviceAddToWhitelistDialog.h"
 
 #include "UICommon/USBUtils.h"
 
diff --git a/Source/Core/DolphinQt2/Settings/WiiPane.h b/Source/Core/DolphinQt/Settings/WiiPane.h
similarity index 100%
rename from Source/Core/DolphinQt2/Settings/WiiPane.h
rename to Source/Core/DolphinQt/Settings/WiiPane.h
diff --git a/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp b/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp
rename to Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp
index 61d4173dd3..b2a3d20fbf 100644
--- a/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp
+++ b/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/TAS/GCTASInputWindow.h"
+#include "DolphinQt/TAS/GCTASInputWindow.h"
 
 #include <QCheckBox>
 #include <QGroupBox>
@@ -12,7 +12,7 @@
 
 #include "Common/CommonTypes.h"
 
-#include "DolphinQt2/TAS/Shared.h"
+#include "DolphinQt/TAS/Shared.h"
 
 #include "InputCommon/GCPadStatus.h"
 
diff --git a/Source/Core/DolphinQt2/TAS/GCTASInputWindow.h b/Source/Core/DolphinQt/TAS/GCTASInputWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/TAS/GCTASInputWindow.h
rename to Source/Core/DolphinQt/TAS/GCTASInputWindow.h
diff --git a/Source/Core/DolphinQt2/TAS/IRWidget.cpp b/Source/Core/DolphinQt/TAS/IRWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/TAS/IRWidget.cpp
rename to Source/Core/DolphinQt/TAS/IRWidget.cpp
index 947912db9a..9e4a7d14ae 100644
--- a/Source/Core/DolphinQt2/TAS/IRWidget.cpp
+++ b/Source/Core/DolphinQt/TAS/IRWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/TAS/IRWidget.h"
+#include "DolphinQt/TAS/IRWidget.h"
 
 #include <algorithm>
 
diff --git a/Source/Core/DolphinQt2/TAS/IRWidget.h b/Source/Core/DolphinQt/TAS/IRWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/TAS/IRWidget.h
rename to Source/Core/DolphinQt/TAS/IRWidget.h
diff --git a/Source/Core/DolphinQt2/TAS/Shared.cpp b/Source/Core/DolphinQt/TAS/Shared.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/TAS/Shared.cpp
rename to Source/Core/DolphinQt/TAS/Shared.cpp
index a30405f4fa..91679f121f 100644
--- a/Source/Core/DolphinQt2/TAS/Shared.cpp
+++ b/Source/Core/DolphinQt/TAS/Shared.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/TAS/Shared.h"
+#include "DolphinQt/TAS/Shared.h"
 
 #include <cmath>
 
@@ -16,8 +16,8 @@
 
 #include "Common/CommonTypes.h"
 
-#include "DolphinQt2/QtUtils/AspectRatioWidget.h"
-#include "DolphinQt2/TAS/StickWidget.h"
+#include "DolphinQt/QtUtils/AspectRatioWidget.h"
+#include "DolphinQt/TAS/StickWidget.h"
 
 #include "InputCommon/GCPadStatus.h"
 
diff --git a/Source/Core/DolphinQt2/TAS/Shared.h b/Source/Core/DolphinQt/TAS/Shared.h
similarity index 100%
rename from Source/Core/DolphinQt2/TAS/Shared.h
rename to Source/Core/DolphinQt/TAS/Shared.h
diff --git a/Source/Core/DolphinQt2/TAS/StickWidget.cpp b/Source/Core/DolphinQt/TAS/StickWidget.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/TAS/StickWidget.cpp
rename to Source/Core/DolphinQt/TAS/StickWidget.cpp
index 58714524b8..b9d6a104bc 100644
--- a/Source/Core/DolphinQt2/TAS/StickWidget.cpp
+++ b/Source/Core/DolphinQt/TAS/StickWidget.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/TAS/StickWidget.h"
+#include "DolphinQt/TAS/StickWidget.h"
 
 #include <algorithm>
 
diff --git a/Source/Core/DolphinQt2/TAS/StickWidget.h b/Source/Core/DolphinQt/TAS/StickWidget.h
similarity index 100%
rename from Source/Core/DolphinQt2/TAS/StickWidget.h
rename to Source/Core/DolphinQt/TAS/StickWidget.h
diff --git a/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp
rename to Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp
index 120806c6c9..df9ad7b270 100644
--- a/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp
+++ b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/TAS/WiiTASInputWindow.h"
+#include "DolphinQt/TAS/WiiTASInputWindow.h"
 
 #include <cmath>
 
@@ -22,9 +22,9 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 
-#include "DolphinQt2/QtUtils/AspectRatioWidget.h"
-#include "DolphinQt2/TAS/IRWidget.h"
-#include "DolphinQt2/TAS/Shared.h"
+#include "DolphinQt/QtUtils/AspectRatioWidget.h"
+#include "DolphinQt/TAS/IRWidget.h"
+#include "DolphinQt/TAS/Shared.h"
 
 #include "InputCommon/InputConfig.h"
 
diff --git a/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.h b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.h
similarity index 100%
rename from Source/Core/DolphinQt2/TAS/WiiTASInputWindow.h
rename to Source/Core/DolphinQt/TAS/WiiTASInputWindow.h
diff --git a/Source/Core/DolphinQt2/ToolBar.cpp b/Source/Core/DolphinQt/ToolBar.cpp
similarity index 97%
rename from Source/Core/DolphinQt2/ToolBar.cpp
rename to Source/Core/DolphinQt/ToolBar.cpp
index 1f2fd7e70d..911f643ce9 100644
--- a/Source/Core/DolphinQt2/ToolBar.cpp
+++ b/Source/Core/DolphinQt/ToolBar.cpp
@@ -8,11 +8,11 @@
 #include <QIcon>
 
 #include "Core/Core.h"
-#include "DolphinQt2/Host.h"
-#include "DolphinQt2/QtUtils/ActionHelper.h"
-#include "DolphinQt2/Resources.h"
-#include "DolphinQt2/Settings.h"
-#include "DolphinQt2/ToolBar.h"
+#include "DolphinQt/Host.h"
+#include "DolphinQt/QtUtils/ActionHelper.h"
+#include "DolphinQt/Resources.h"
+#include "DolphinQt/Settings.h"
+#include "DolphinQt/ToolBar.h"
 
 static QSize ICON_SIZE(32, 32);
 
diff --git a/Source/Core/DolphinQt2/ToolBar.h b/Source/Core/DolphinQt/ToolBar.h
similarity index 100%
rename from Source/Core/DolphinQt2/ToolBar.h
rename to Source/Core/DolphinQt/ToolBar.h
diff --git a/Source/Core/DolphinQt2/Translation.cpp b/Source/Core/DolphinQt/Translation.cpp
similarity index 99%
rename from Source/Core/DolphinQt2/Translation.cpp
rename to Source/Core/DolphinQt/Translation.cpp
index cf5decd98e..1f18cecd16 100644
--- a/Source/Core/DolphinQt2/Translation.cpp
+++ b/Source/Core/DolphinQt/Translation.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Translation.h"
+#include "DolphinQt/Translation.h"
 
 #include <QApplication>
 #include <QLocale>
diff --git a/Source/Core/DolphinQt2/Translation.h b/Source/Core/DolphinQt/Translation.h
similarity index 100%
rename from Source/Core/DolphinQt2/Translation.h
rename to Source/Core/DolphinQt/Translation.h
diff --git a/Source/Core/DolphinQt2/Updater.cpp b/Source/Core/DolphinQt/Updater.cpp
similarity index 96%
rename from Source/Core/DolphinQt2/Updater.cpp
rename to Source/Core/DolphinQt/Updater.cpp
index 3c4dc9d889..b93e587a73 100644
--- a/Source/Core/DolphinQt2/Updater.cpp
+++ b/Source/Core/DolphinQt/Updater.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/Updater.h"
+#include "DolphinQt/Updater.h"
 
 #include <QCheckBox>
 #include <QDialog>
@@ -15,8 +15,8 @@
 
 #include "Common/Version.h"
 
-#include "DolphinQt2/QtUtils/RunOnObject.h"
-#include "DolphinQt2/Settings.h"
+#include "DolphinQt/QtUtils/RunOnObject.h"
+#include "DolphinQt/Settings.h"
 
 Updater::Updater(QWidget* parent) : m_parent(parent)
 {
diff --git a/Source/Core/DolphinQt2/Updater.h b/Source/Core/DolphinQt/Updater.h
similarity index 100%
rename from Source/Core/DolphinQt2/Updater.h
rename to Source/Core/DolphinQt/Updater.h
diff --git a/Source/Core/DolphinQt2/WiiUpdate.cpp b/Source/Core/DolphinQt/WiiUpdate.cpp
similarity index 98%
rename from Source/Core/DolphinQt2/WiiUpdate.cpp
rename to Source/Core/DolphinQt/WiiUpdate.cpp
index f09b422824..7eef30460c 100644
--- a/Source/Core/DolphinQt2/WiiUpdate.cpp
+++ b/Source/Core/DolphinQt/WiiUpdate.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/WiiUpdate.h"
+#include "DolphinQt/WiiUpdate.h"
 
 #include <cinttypes>
 #include <future>
@@ -21,7 +21,7 @@
 
 #include "DiscIO/NANDImporter.h"
 
-#include "DolphinQt2/QtUtils/QueueOnObject.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
 
 namespace WiiUpdate
 {
diff --git a/Source/Core/DolphinQt2/WiiUpdate.h b/Source/Core/DolphinQt/WiiUpdate.h
similarity index 100%
rename from Source/Core/DolphinQt2/WiiUpdate.h
rename to Source/Core/DolphinQt/WiiUpdate.h
diff --git a/Source/Core/DolphinQt2/qt.conf b/Source/Core/DolphinQt/qt.conf
similarity index 100%
rename from Source/Core/DolphinQt2/qt.conf
rename to Source/Core/DolphinQt/qt.conf
diff --git a/Source/Core/DolphinQt2/resource.h b/Source/Core/DolphinQt/resource.h
similarity index 94%
rename from Source/Core/DolphinQt2/resource.h
rename to Source/Core/DolphinQt/resource.h
index 08c25f1111..01cffe2848 100644
--- a/Source/Core/DolphinQt2/resource.h
+++ b/Source/Core/DolphinQt/resource.h
@@ -4,7 +4,7 @@
 
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by DolphinQt2.rc
+// Used by DolphinQt.rc
 //
 #define IDI_ICON1 101
 
diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln
index f81b704973..2a9e75e5e0 100644
--- a/Source/dolphin-emu.sln
+++ b/Source/dolphin-emu.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinQt2\DolphinQt2.vcxproj", "{FA3FA62B-6F58-4B86-9453-4D149940A066}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinQt\DolphinQt.vcxproj", "{FA3FA62B-6F58-4B86-9453-4D149940A066}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{E54CF649-140E-4255-81A5-30A673C1FB36}"
 EndProject