diff --git a/Source/Core/Core/DSP/DSPAnalyzer.cpp b/Source/Core/Core/DSP/DSPAnalyzer.cpp
index a86b9c2c3e..ccafaebc51 100644
--- a/Source/Core/Core/DSP/DSPAnalyzer.cpp
+++ b/Source/Core/Core/DSP/DSPAnalyzer.cpp
@@ -12,7 +12,7 @@
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPTables.h"
 
-namespace DSP::Analyzer
+namespace DSP
 {
 // Good candidates for idle skipping is mail wait loops. If we're time slicing
 // between the main CPU and the DSP, if the DSP runs into one of these, it might
@@ -160,4 +160,4 @@ void Analyzer::AnalyzeRange(u16 start_addr, u16 end_addr)
   }
   INFO_LOG_FMT(DSPLLE, "Finished analysis.");
 }
-}  // namespace DSP::Analyzer
+}  // namespace DSP
diff --git a/Source/Core/Core/DSP/DSPAnalyzer.h b/Source/Core/Core/DSP/DSPAnalyzer.h
index 21dc740908..d3077fc48b 100644
--- a/Source/Core/Core/DSP/DSPAnalyzer.h
+++ b/Source/Core/Core/DSP/DSPAnalyzer.h
@@ -12,8 +12,7 @@ namespace DSP
 struct SDSP;
 }
 
-// Basic code analysis.
-namespace DSP::Analyzer
+namespace DSP
 {
 // Useful things to detect:
 // * Loop endpoints - so that we can avoid checking for loops every cycle.
@@ -102,4 +101,4 @@ private:
   // DSP context for analysis to be run under.
   const SDSP& m_dsp;
 };
-}  // namespace DSP::Analyzer
+}  // namespace DSP
diff --git a/Source/Core/Core/DSP/DSPCore.h b/Source/Core/Core/DSP/DSPCore.h
index f25c302a70..e3ed8f6f76 100644
--- a/Source/Core/Core/DSP/DSPCore.h
+++ b/Source/Core/Core/DSP/DSPCore.h
@@ -398,8 +398,8 @@ struct SDSP
   void DoState(PointerWrap& p);
 
   // DSP static analyzer.
-  Analyzer::Analyzer& GetAnalyzer() { return m_analyzer; }
-  const Analyzer::Analyzer& GetAnalyzer() const { return m_analyzer; }
+  Analyzer& GetAnalyzer() { return m_analyzer; }
+  const Analyzer& GetAnalyzer() const { return m_analyzer; }
 
   DSP_Regs r{};
   u16 pc = 0;
@@ -454,7 +454,7 @@ private:
   u16 ReadIFXImpl(u16 address);
 
   DSPCore& m_dsp_core;
-  Analyzer::Analyzer m_analyzer;
+  Analyzer m_analyzer;
 };
 
 enum class State