diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp
@@ -169,7 +169,7 @@ XAudio2::~XAudio2()
     CoUninitialize();
 }
 
-bool XAudio2::Start()
+bool XAudio2::Init()
 {
   HRESULT hr;
 
@@ -210,15 +210,17 @@ void XAudio2::SetVolume(int volume)
     m_mastering_voice->SetVolume(m_volume);
 }
 
-void XAudio2::SetRunning(bool running)
+bool XAudio2::SetRunning(bool running)
 {
-  if (m_voice_context)
-  {
-    if (running)
-      m_voice_context->Play();
-    else
-      m_voice_context->Stop();
-  }
+  if (!m_voice_context)
+    return false;
+
+  if (running)
+    m_voice_context->Play();
+  else
+    m_voice_context->Stop();
+
+  return true;
 }
 
 void XAudio2::Stop()

diff --git a/Source/Core/AudioCommon/XAudio2Stream.h b/Source/Core/AudioCommon/XAudio2Stream.h
@@ -51,15 +51,15 @@ class XAudio2 final : public SoundStream
   static void* PXAudio2Create;
 
   static bool InitLibrary();
+  void Stop();
 
 public:
   XAudio2();
-  virtual ~XAudio2();
+  ~XAudio2() override;
 
-  bool Start() override;
-  void Stop() override;
+  bool Init() override;
 
-  void SetRunning(bool running) override;
+  bool SetRunning(bool running) override;
   void SetVolume(int volume) override;
 
   static bool isValid() { return InitLibrary(); }

diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp
@@ -157,7 +157,7 @@ XAudio2_7::~XAudio2_7()
     CoUninitialize();
 }
 
-bool XAudio2_7::Start()
+bool XAudio2_7::Init()
 {
   HRESULT hr;
 
@@ -198,15 +198,17 @@ void XAudio2_7::SetVolume(int volume)
     m_mastering_voice->SetVolume(m_volume);
 }
 
-void XAudio2_7::SetRunning(bool running)
+bool XAudio2_7::SetRunning(bool running)
 {
-  if (m_voice_context)
-  {
-    if (running)
-      m_voice_context->Play();
-    else
-      m_voice_context->Stop();
-  }
+  if (!m_voice_context)
+    return false;
+
+  if (running)
+    m_voice_context->Play();
+  else
+    m_voice_context->Stop();
+
+  return true;
 }
 
 void XAudio2_7::Stop()

diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.h b/Source/Core/AudioCommon/XAudio2_7Stream.h
@@ -56,15 +56,15 @@ class XAudio2_7 final : public SoundStream
   static HMODULE m_xaudio2_dll;
 
   static bool InitLibrary();
+  void Stop();
 
 public:
   XAudio2_7();
-  virtual ~XAudio2_7();
+  ~XAudio2_7() override;
 
-  bool Start() override;
-  void Stop() override;
+  bool Init() override;
 
-  void SetRunning(bool running) override;
+  bool SetRunning(bool running) override;
   void SetVolume(int volume) override;
 
   static bool isValid() { return InitLibrary(); }