diff --git a/Resource/EFormatVersion.h b/Resource/EFormatVersion.h
index cbd1a0ba..7b03f464 100644
--- a/Resource/EFormatVersion.h
+++ b/Resource/EFormatVersion.h
@@ -4,7 +4,7 @@
 // Global version enum that can be easily shared between loaders
 enum EGame
 {
-    ePrimeKioskDemo = 0,
+    ePrimeDemo = 0,
     ePrime = 1,
     eEchoesDemo = 2,
     eEchoes = 3,
diff --git a/Resource/cooker/CMaterialCooker.cpp b/Resource/cooker/CMaterialCooker.cpp
index 96ebf7eb..e6b1ad69 100644
--- a/Resource/cooker/CMaterialCooker.cpp
+++ b/Resource/cooker/CMaterialCooker.cpp
@@ -336,7 +336,7 @@ void CMaterialCooker::WriteCookedMatSet(CMaterialSet *pSet, EGame Version, COutp
 
     switch (Version)
     {
-    case ePrimeKioskDemo:
+    case ePrimeDemo:
     case ePrime:
     case eEchoesDemo:
     case eEchoes:
@@ -353,7 +353,7 @@ void CMaterialCooker::WriteCookedMaterial(CMaterial *pMat, EGame Version, COutpu
 
     switch (Version)
     {
-    case ePrimeKioskDemo:
+    case ePrimeDemo:
     case ePrime:
     case eEchoesDemo:
     case eEchoes:
diff --git a/Resource/cooker/CModelCooker.cpp b/Resource/cooker/CModelCooker.cpp
index 8d79b5f8..ea8fa44b 100644
--- a/Resource/cooker/CModelCooker.cpp
+++ b/Resource/cooker/CModelCooker.cpp
@@ -240,7 +240,7 @@ void CModelCooker::WriteCookedModel(CModel *pModel, EGame Version, COutputStream
 
     switch (Version)
     {
-    case ePrimeKioskDemo:
+    case ePrimeDemo:
     case ePrime:
     case eEchoesDemo:
     case eEchoes:
@@ -257,7 +257,7 @@ u32 CModelCooker::GetCMDLVersion(EGame Version)
 {
     switch (Version)
     {
-    case ePrimeKioskDemo:
+    case ePrimeDemo:
     case ePrime:
         return 0x2;
     case eEchoesDemo:
diff --git a/Resource/factory/CAreaLoader.cpp b/Resource/factory/CAreaLoader.cpp
index 94df164c..874d0bf6 100644
--- a/Resource/factory/CAreaLoader.cpp
+++ b/Resource/factory/CAreaLoader.cpp
@@ -480,7 +480,7 @@ CGameArea* CAreaLoader::LoadMREA(CInputStream& MREA)
 
     switch (Loader.mVersion)
     {
-        case ePrimeKioskDemo:
+        case ePrimeDemo:
         case ePrime:
             Loader.ReadHeaderPrime();
             Loader.ReadGeometryPrime();
@@ -524,7 +524,7 @@ EGame CAreaLoader::GetFormatVersion(u32 version)
 {
     switch (version)
     {
-        case 0xC: return ePrimeKioskDemo;
+        case 0xC: return ePrimeDemo;
         case 0xF: return ePrime;
         case 0x15: return eEchoesDemo;
         case 0x19: return eEchoes;
diff --git a/Resource/factory/CFontLoader.cpp b/Resource/factory/CFontLoader.cpp
index a5faded6..e337c695 100644
--- a/Resource/factory/CFontLoader.cpp
+++ b/Resource/factory/CFontLoader.cpp
@@ -13,7 +13,7 @@ CFont* CFontLoader::LoadFont(CInputStream& FONT)
     mpFont->mLineHeight = FONT.ReadLong();
     mpFont->mVerticalOffset = FONT.ReadLong();
     mpFont->mLineMargin = FONT.ReadLong();
-    if (mVersion > ePrimeKioskDemo) FONT.Seek(0x4, SEEK_CUR);
+    if (mVersion > ePrimeDemo) FONT.Seek(0x4, SEEK_CUR);
     FONT.Seek(0x2, SEEK_CUR);
     mpFont->mDefaultSize = FONT.ReadLong();
     mpFont->mFontName = FONT.ReadString();
@@ -110,7 +110,7 @@ EGame CFontLoader::GetFormatVersion(u32 Version)
 {
     switch (Version)
     {
-    case 1: return ePrimeKioskDemo;
+    case 1: return ePrimeDemo;
     case 2: return ePrime;
     case 4: return eEchoes;
     case 5: return eCorruption;
diff --git a/Resource/factory/CMaterialLoader.cpp b/Resource/factory/CMaterialLoader.cpp
index 54d63b37..a8a67ac0 100644
--- a/Resource/factory/CMaterialLoader.cpp
+++ b/Resource/factory/CMaterialLoader.cpp
@@ -606,7 +606,7 @@ CMaterialSet* CMaterialLoader::LoadMaterialSet(CInputStream& Mat, EGame Version)
     Loader.mpFile = &Mat;
     Loader.mVersion = Version;
 
-    if ((Version >= ePrimeKioskDemo) && (Version <= eEchoes))
+    if ((Version >= ePrimeDemo) && (Version <= eEchoes))
         Loader.ReadPrimeMatSet();
     else
         Loader.ReadCorruptionMatSet();
diff --git a/Resource/factory/CStringLoader.cpp b/Resource/factory/CStringLoader.cpp
index f5c6d979..eb2ea65d 100644
--- a/Resource/factory/CStringLoader.cpp
+++ b/Resource/factory/CStringLoader.cpp
@@ -175,10 +175,10 @@ CStringTable* CStringLoader::LoadSTRG(CInputStream& STRG)
         {
             STRG.Seek(Magic, SEEK_SET);
             if ((STRG.EoF()) || (STRG.ReadShort() == 0xFFFF))
-                Version = ePrimeKioskDemo;
+                Version = ePrimeDemo;
         }
 
-        if (Version != ePrimeKioskDemo)
+        if (Version != ePrimeDemo)
         {
             Log::FileError(STRG.GetSourceString(), "Invalid STRG magic: " + StringUtil::ToHexString(Magic));
             return nullptr;
@@ -202,7 +202,7 @@ CStringTable* CStringLoader::LoadSTRG(CInputStream& STRG)
     Loader.mpStringTable = new CStringTable();
     Loader.mVersion = Version;
 
-    if (Version == ePrimeKioskDemo) Loader.LoadPrimeDemoSTRG(STRG);
+    if (Version == ePrimeDemo) Loader.LoadPrimeDemoSTRG(STRG);
     else if (Version < eCorruption) Loader.LoadPrimeSTRG(STRG);
     else Loader.LoadCorruptionSTRG(STRG);
 
diff --git a/Resource/factory/CWorldLoader.cpp b/Resource/factory/CWorldLoader.cpp
index 6e919ca7..09485559 100644
--- a/Resource/factory/CWorldLoader.cpp
+++ b/Resource/factory/CWorldLoader.cpp
@@ -330,7 +330,7 @@ EGame CWorldLoader::GetFormatVersion(u32 Version)
 {
     switch (Version)
     {
-        case 0xD: return ePrimeKioskDemo;
+        case 0xD: return ePrimeDemo;
         case 0x11: return ePrime;
         case 0x14: return eEchoesDemo;
         case 0x17: return eEchoes;