diff --git a/Source/Core/Core/DSPEmulator.h b/Source/Core/Core/DSPEmulator.h
index 6778e67198..23758ab3ab 100644
--- a/Source/Core/Core/DSPEmulator.h
+++ b/Source/Core/Core/DSPEmulator.h
@@ -19,14 +19,14 @@ public:
   virtual void Shutdown() = 0;
 
   virtual void DoState(PointerWrap& p) = 0;
-  virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock = true) = 0;
+  virtual void PauseAndLock(bool do_lock, bool unpause_on_unlock = true) = 0;
 
-  virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) = 0;
-  virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) = 0;
-  virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) = 0;
-  virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) = 0;
-  virtual unsigned short DSP_ReadControlRegister() = 0;
-  virtual unsigned short DSP_WriteControlRegister(unsigned short) = 0;
+  virtual void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) = 0;
+  virtual void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) = 0;
+  virtual u16 DSP_ReadMailBoxHigh(bool cpu_mailbox) = 0;
+  virtual u16 DSP_ReadMailBoxLow(bool cpu_mailbox) = 0;
+  virtual u16 DSP_ReadControlRegister() = 0;
+  virtual u16 DSP_WriteControlRegister(u16 value) = 0;
   virtual void DSP_Update(int cycles) = 0;
   virtual void DSP_StopSoundStream() = 0;
   virtual u32 DSP_UpdateRate() = 0;