diff --git a/src/Crypto/Crypto.h b/src/Crypto/Crypto.h
index 9a1e4ce1..ca9dc4ca 100644
--- a/src/Crypto/Crypto.h
+++ b/src/Crypto/Crypto.h
@@ -6,7 +6,7 @@
 class Crypto
 {
 public:
-    enum RSAPaddingMode
+    enum class RSAPaddingMode
     {
         RSA_PADDING_PKS1,
         RSA_PADDING_PSS,
diff --git a/src/Crypto/IPublicKeyAlgorithm.h b/src/Crypto/IPublicKeyAlgorithm.h
index 323ceebf..c9195df9 100644
--- a/src/Crypto/IPublicKeyAlgorithm.h
+++ b/src/Crypto/IPublicKeyAlgorithm.h
@@ -5,7 +5,7 @@
 class IPublicKeyAlgorithm
 {
 public:
-    enum HashingAlgorithm
+    enum class HashingAlgorithm
     {
         RSA_HASH_SHA256,
         RSA_HASH_SHA512
diff --git a/src/Crypto/Impl/AlgorithmRSA.cpp b/src/Crypto/Impl/AlgorithmRSA.cpp
index 209ece1f..c0e84cf1 100644
--- a/src/Crypto/Impl/AlgorithmRSA.cpp
+++ b/src/Crypto/Impl/AlgorithmRSA.cpp
@@ -13,11 +13,11 @@ class AlgorithmRSA::AlgorithmRSAImpl
     {
         switch(m_hash)
         {
-        case RSA_HASH_SHA256:
+        case HashingAlgorithm::RSA_HASH_SHA256:
             return &sha256_desc;
 
         default:
-        case RSA_HASH_SHA512:
+        case HashingAlgorithm::RSA_HASH_SHA512:
             return &sha512_desc;
         }
     }
@@ -26,11 +26,11 @@ class AlgorithmRSA::AlgorithmRSAImpl
     {
         switch(m_padding)
         {
-        case Crypto::RSA_PADDING_PKS1:
+        case Crypto::RSAPaddingMode::RSA_PADDING_PKS1:
             return LTC_PKCS_1_V1_5;
 
         default:
-        case Crypto::RSA_PADDING_PSS:
+        case Crypto::RSAPaddingMode::RSA_PADDING_PSS:
             return LTC_PKCS_1_PSS;
         }
     }
diff --git a/src/Utils/Utils/FileAPI.cpp b/src/Utils/Utils/FileAPI.cpp
index 9398ab0c..358fa20d 100644
--- a/src/Utils/Utils/FileAPI.cpp
+++ b/src/Utils/Utils/FileAPI.cpp
@@ -35,11 +35,11 @@ FileAPI::File FileAPI::Open(const std::string& filename, const Mode mode)
     switch(mode)
     {
     default:
-    case MODE_READ:
+    case Mode::MODE_READ:
         modeStr = "rb";
         break;
 
-    case MODE_WRITE:
+    case Mode::MODE_WRITE:
         modeStr = "wb";
         break;
     }
diff --git a/src/Utils/Utils/FileAPI.h b/src/Utils/Utils/FileAPI.h
index f8cc0c25..4b8a4962 100644
--- a/src/Utils/Utils/FileAPI.h
+++ b/src/Utils/Utils/FileAPI.h
@@ -6,7 +6,7 @@
 class FileAPI
 {
 public:
-    enum Mode
+    enum class Mode
     {
         MODE_READ = 0,
         MODE_WRITE = 1
diff --git a/src/ZoneCommon/Zone/XBlock.h b/src/ZoneCommon/Zone/XBlock.h
index d47e7c50..f16b1fa4 100644
--- a/src/ZoneCommon/Zone/XBlock.h
+++ b/src/ZoneCommon/Zone/XBlock.h
@@ -4,7 +4,7 @@
 class XBlock
 {
 public:
-    enum Type
+    enum class Type
     {
         BLOCK_TYPE_TEMP,
         BLOCK_TYPE_RUNTIME,
diff --git a/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
index 937c6009..53296a0b 100644
--- a/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
+++ b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
@@ -133,14 +133,14 @@ class ZoneLoaderFactoryT6::ZoneLoaderFactoryT6Impl
     {
 #define XBLOCK_DEF(name, type) new XBlock(STR(name), name, type)
 
-        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_TEMP, XBlock::BLOCK_TYPE_TEMP));
-        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_RUNTIME_VIRTUAL, XBlock::BLOCK_TYPE_RUNTIME));
-        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_RUNTIME_PHYSICAL, XBlock::BLOCK_TYPE_RUNTIME));
-        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_DELAY_VIRTUAL, XBlock::BLOCK_TYPE_DELAY));
-        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_DELAY_PHYSICAL, XBlock::BLOCK_TYPE_DELAY));
-        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_VIRTUAL, XBlock::BLOCK_TYPE_NORMAL));
-        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_PHYSICAL, XBlock::BLOCK_TYPE_NORMAL));
-        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_STREAMER_RESERVE, XBlock::BLOCK_TYPE_NORMAL));
+        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_TEMP, XBlock::Type::BLOCK_TYPE_TEMP));
+        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_RUNTIME_VIRTUAL, XBlock::Type::BLOCK_TYPE_RUNTIME));
+        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_RUNTIME_PHYSICAL, XBlock::Type::BLOCK_TYPE_RUNTIME));
+        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_DELAY_VIRTUAL, XBlock::Type::BLOCK_TYPE_DELAY));
+        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_DELAY_PHYSICAL, XBlock::Type::BLOCK_TYPE_DELAY));
+        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_VIRTUAL, XBlock::Type::BLOCK_TYPE_NORMAL));
+        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_PHYSICAL, XBlock::Type::BLOCK_TYPE_NORMAL));
+        zoneLoader->AddXBlock(XBLOCK_DEF(T6::XFILE_BLOCK_STREAMER_RESERVE, XBlock::Type::BLOCK_TYPE_NORMAL));
 
 #undef XBLOCK_DEF
     }
@@ -149,7 +149,7 @@ class ZoneLoaderFactoryT6::ZoneLoaderFactoryT6Impl
     {
         if(isOfficial)
         {
-            auto* rsa = Crypto::CreateRSA(IPublicKeyAlgorithm::RSA_HASH_SHA256, Crypto::RSA_PADDING_PSS);
+            auto* rsa = Crypto::CreateRSA(IPublicKeyAlgorithm::HashingAlgorithm::RSA_HASH_SHA256, Crypto::RSAPaddingMode::RSA_PADDING_PSS);
 
             if(!rsa->SetKey(RSA_PUBLIC_KEY_TREYARCH, sizeof(RSA_PUBLIC_KEY_TREYARCH)))
             {
diff --git a/src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp b/src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp
index 000ec1a2..9813d3d5 100644
--- a/src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp
+++ b/src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp
@@ -66,7 +66,7 @@ block_t XBlockInputStream::PopBlock()
     m_block_in_stack[poppedBlock->m_index]--;
 
     // If the temp block is not used anymore right now, reset it to the buffer start since as the name suggests, the data inside is temporary.
-    if(poppedBlock->m_type == XBlock::BLOCK_TYPE_TEMP && m_block_in_stack[poppedBlock->m_index] == 0)
+    if(poppedBlock->m_type == XBlock::Type::BLOCK_TYPE_TEMP && m_block_in_stack[poppedBlock->m_index] == 0)
     {
         m_block_offsets[poppedBlock->m_index] = 0;
     }
diff --git a/src/ZoneLoading/ZoneLoading.cpp b/src/ZoneLoading/ZoneLoading.cpp
index 5ae4af57..9850db3c 100644
--- a/src/ZoneLoading/ZoneLoading.cpp
+++ b/src/ZoneLoading/ZoneLoading.cpp
@@ -10,7 +10,7 @@ IZoneLoaderFactory* zoneLoaderFactories[]
 Zone* ZoneLoading::LoadZone(const std::string& path)
 {
     std::string zoneName = utils::Path::GetFilenameWithoutExtension(path);
-    FileAPI::File file = FileAPI::Open(path, FileAPI::MODE_READ);
+    FileAPI::File file = FileAPI::Open(path, FileAPI::Mode::MODE_READ);
 
     if(!file.IsOpen())
     {