diff --git a/AuroraEnvironment.hpp b/AuroraEnvironment.hpp
index c139cdb..f0c0bf0 100644
--- a/AuroraEnvironment.hpp
+++ b/AuroraEnvironment.hpp
@@ -23,10 +23,10 @@ extern "C"
 
 #else
 #define AUENVHPP_START_ENUM(platform, ...) \
-    enum class platform               \
-    {                                 \
-        eEnumInvalid = -1,            \
-        __VA_ARGS__                   \
+    enum class platform                    \
+    {                                      \
+        e ## platform ## Invalid = -1,     \
+        __VA_ARGS__                        \
     };
 #endif
 
@@ -48,7 +48,7 @@ namespace Aurora::Build
     #elif defined(AURORA_COMPILER_INTEL)
         static const ECompiler kCurrentCompiler = ECompiler::eIntelInside;
     #else
-        static const ECompiler kCurrentCompiler = ECompiler::eEnumInvalid;
+        static const ECompiler kCurrentCompiler = ECompiler::eECompilerEnumInvalid;
     #endif 
 
     enum class EPlatformLTS
@@ -159,7 +159,7 @@ namespace Aurora::Build
     #elif defined(AURORA_PLATFORM_WII_U)
         static const EPlatform kCurrentPlatform = EPlatform::ePlatformWiiU;
     #else
-        static const EPlatform kCurrentPlatform = EPlatform::eEnumInvalid;
+        static const EPlatform kCurrentPlatform = EPlatform::eEPlatformEnumInvalid;
     #endif
 
     AUENVHPP_START_ENUM(EVendor,
@@ -184,7 +184,7 @@ namespace Aurora::Build
     #elif defined(VENDOR_UNKNOWN)                     
         static const EVendor kCurrentVendor = EVendor::eUnknown;
     #else                                             
-        static const EVendor kCurrentVendor = EVendor::eEnumInvalid;
+        static const EVendor kCurrentVendor = EVendor::eEVendorEnumInvalid;
     #endif
     
     AUENVHPP_START_ENUM(EArchitecture,
@@ -200,7 +200,7 @@ namespace Aurora::Build
     #elif defined(AURORA_ARCH_ARM)                     
         static const EArchitecture kCurrentArchitecture = EArchitecture::eAArch64;
     #else                                             
-        static const EArchitecture kCurrentArchitecture = EArchitecture::eEnumInvalid;
+        static const EArchitecture kCurrentArchitecture = EArchitecture::eEArchitectureEnumInvalid;
     #endif
     
     
@@ -239,7 +239,7 @@ namespace Aurora::Build
     #elif defined(AURORA_ABI_APPLE)                     
         static const EABI kCurrentABI = EABI::eAppleArm;
     #else
-        static const EABI kCurrentABI = EABI::eEnumInvalid;
+        static const EABI kCurrentABI = EABI::eEABIEnumInvalid;
     #endif
     
     AUENVHPP_START_ENUM(ECPUEndian,