diff --git a/Source/Core/Common/SymbolDB.h b/Source/Core/Common/SymbolDB.h
index dd65f5fe5d..1b75a58b5f 100644
--- a/Source/Core/Common/SymbolDB.h
+++ b/Source/Core/Common/SymbolDB.h
@@ -23,10 +23,10 @@ struct SCall
 
 struct Symbol
 {
-  enum
+  enum class Type
   {
-    SYMBOL_FUNCTION = 0,
-    SYMBOL_DATA = 1,
+    Function,
+    Data,
   };
 
   std::string name;
@@ -37,7 +37,7 @@ struct Symbol
   u32 flags = 0;
   int size = 0;
   int numCalls = 0;
-  int type = SYMBOL_FUNCTION;
+  Type type = Type::Function;
   int index = 0;  // only used for coloring the disasm view
   int analyzed = 0;
 };
diff --git a/Source/Core/Core/Boot/ElfReader.cpp b/Source/Core/Core/Boot/ElfReader.cpp
index 6f86130de9..d7ab06eccf 100644
--- a/Source/Core/Core/Boot/ElfReader.cpp
+++ b/Source/Core/Core/Boot/ElfReader.cpp
@@ -182,14 +182,14 @@ bool ElfReader::LoadSymbols()
       if (bRelocate)
         value += sectionAddrs[sectionIndex];
 
-      int symtype = Symbol::SYMBOL_DATA;
+      auto symtype = Symbol::Type::Data;
       switch (type)
       {
       case STT_OBJECT:
-        symtype = Symbol::SYMBOL_DATA;
+        symtype = Symbol::Type::Data;
         break;
       case STT_FUNC:
-        symtype = Symbol::SYMBOL_FUNCTION;
+        symtype = Symbol::Type::Function;
         break;
       default:
         continue;
diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
index 1d7fd7343e..e96a44f923 100644
--- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp
+++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp
@@ -186,7 +186,7 @@ int PPCDebugInterface::GetColor(unsigned int address)
   Symbol* symbol = g_symbolDB.GetSymbolFromAddr(address);
   if (!symbol)
     return 0xFFFFFF;
-  if (symbol->type != Symbol::SYMBOL_FUNCTION)
+  if (symbol->type != Symbol::Type::Function)
     return 0xEEEEFF;
   return colors[symbol->index % 6];
 }
diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
index 4165581a65..56330dc963 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp
@@ -170,7 +170,7 @@ int DSPDebugInterface::GetColor(unsigned int address)
   Symbol* symbol = DSPSymbols::g_dsp_symbol_db.GetSymbolFromAddr(addr);
   if (!symbol)
     return 0xFFFFFF;
-  if (symbol->type != Symbol::SYMBOL_FUNCTION)
+  if (symbol->type != Symbol::Type::Function)
     return 0xEEEEFF;
   return colors[symbol->index % 6];
 }
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
index dca7a8f48f..d6a4e5d13c 100644
--- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
+++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
@@ -47,13 +47,14 @@ Symbol* PPCSymbolDB::AddFunction(u32 startAddr)
       return nullptr;  // found a dud :(
     // LOG(OSHLE, "Symbol found at %08x", startAddr);
     functions[startAddr] = tempFunc;
-    tempFunc.type = Symbol::SYMBOL_FUNCTION;
+    tempFunc.type = Symbol::Type::Function;
     checksumToFunction[tempFunc.hash] = &(functions[startAddr]);
     return &functions[startAddr];
   }
 }
 
-void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const std::string& name, int type)
+void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const std::string& name,
+                                 Symbol::Type type)
 {
   XFuncMap::iterator iter = functions.find(startAddr);
   if (iter != functions.end())
@@ -72,7 +73,7 @@ void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const std::string& nam
     tf.name = name;
     tf.type = type;
     tf.address = startAddr;
-    if (tf.type == Symbol::SYMBOL_FUNCTION)
+    if (tf.type == Symbol::Type::Function)
     {
       PPCAnalyst::AnalyzeFunction(startAddr, tf, size);
       checksumToFunction[tf.hash] = &(functions[startAddr]);
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.h b/Source/Core/Core/PowerPC/PPCSymbolDB.h
index 80104414f1..25d05678fe 100644
--- a/Source/Core/Core/PowerPC/PPCSymbolDB.h
+++ b/Source/Core/Core/PowerPC/PPCSymbolDB.h
@@ -27,7 +27,7 @@ public:
 
   Symbol* AddFunction(u32 startAddr) override;
   void AddKnownSymbol(u32 startAddr, u32 size, const std::string& name,
-                      int type = Symbol::SYMBOL_FUNCTION);
+                      Symbol::Type type = Symbol::Type::Function);
 
   Symbol* GetSymbolFromAddr(u32 addr) override;
 
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
index 8a46245f37..0a1300146b 100644
--- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
+++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
@@ -485,7 +485,7 @@ void CCodeWindow::OnSymbolListChange(wxCommandEvent& event)
     Symbol* pSymbol = static_cast<Symbol*>(symbols->GetClientData(index));
     if (pSymbol != nullptr)
     {
-      if (pSymbol->type == Symbol::SYMBOL_DATA)
+      if (pSymbol->type == Symbol::Type::Data)
       {
         if (m_MemoryWindow)  // && m_MemoryWindow->IsVisible())
           m_MemoryWindow->JumpToAddress(pSymbol->address);
diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
index c3d2aef98c..d4e9907841 100644
--- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
+++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
@@ -224,7 +224,7 @@ void DSPDebuggerLLE::OnSymbolListChange(wxCommandEvent& event)
     Symbol* pSymbol = static_cast<Symbol*>(m_SymbolList->GetClientData(index));
     if (pSymbol != nullptr)
     {
-      if (pSymbol->type == Symbol::SYMBOL_FUNCTION)
+      if (pSymbol->type == Symbol::Type::Function)
       {
         JumpToAddress(pSymbol->address);
       }