diff --git a/test/SystemTests/Game/IW3/simple/SimpleZone.txt b/test/SystemTests/Game/IW3/Simple/SimpleZone.txt
similarity index 100%
rename from test/SystemTests/Game/IW3/simple/SimpleZone.txt
rename to test/SystemTests/Game/IW3/Simple/SimpleZone.txt
diff --git a/test/SystemTests/Game/IW3/simple/SimpleZoneIW3.zone b/test/SystemTests/Game/IW3/Simple/SimpleZoneIW3.zone
similarity index 100%
rename from test/SystemTests/Game/IW3/simple/SimpleZoneIW3.zone
rename to test/SystemTests/Game/IW3/Simple/SimpleZoneIW3.zone
diff --git a/test/SystemTests/Game/IW3/SimpleZoneIW3.cpp b/test/SystemTests/Game/IW3/SimpleZoneIW3.cpp
index 52ba8ac9..4092878a 100644
--- a/test/SystemTests/Game/IW3/SimpleZoneIW3.cpp
+++ b/test/SystemTests/Game/IW3/SimpleZoneIW3.cpp
@@ -17,9 +17,9 @@ namespace
 {
     TEST_CASE("Simple Zone(IW3)", "[iw3][system][simple]")
     {
-        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW3/simple").string();
-        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW3/simple").string();
-        const auto outputPath = oat::paths::GetTempDirectory("iw3_simple").string();
+        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW3/Simple").string();
+        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW3/Simple").string();
+        const auto outputPath = oat::paths::GetTempDirectory("SimpleZoneIW3").string();
 
         const char* argStrings[]{
             "SystemTests", // bin
diff --git a/test/SystemTests/Game/IW4/simple/SimpleZone.txt b/test/SystemTests/Game/IW4/Simple/SimpleZone.txt
similarity index 100%
rename from test/SystemTests/Game/IW4/simple/SimpleZone.txt
rename to test/SystemTests/Game/IW4/Simple/SimpleZone.txt
diff --git a/test/SystemTests/Game/IW4/simple/SimpleZoneIW4.zone b/test/SystemTests/Game/IW4/Simple/SimpleZoneIW4.zone
similarity index 100%
rename from test/SystemTests/Game/IW4/simple/SimpleZoneIW4.zone
rename to test/SystemTests/Game/IW4/Simple/SimpleZoneIW4.zone
diff --git a/test/SystemTests/Game/IW4/SimpleZoneIW4.cpp b/test/SystemTests/Game/IW4/SimpleZoneIW4.cpp
index 3d1e6de1..f89314a7 100644
--- a/test/SystemTests/Game/IW4/SimpleZoneIW4.cpp
+++ b/test/SystemTests/Game/IW4/SimpleZoneIW4.cpp
@@ -17,9 +17,9 @@ namespace
 {
     TEST_CASE("Simple Zone(IW4)", "[iw4][system][simple]")
     {
-        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW4/simple").string();
-        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW4/simple").string();
-        const auto outputPath = oat::paths::GetTempDirectory("iw4_simple").string();
+        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW4/Simple").string();
+        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW4/Simple").string();
+        const auto outputPath = oat::paths::GetTempDirectory("SimpleZoneIW4").string();
 
         const char* argStrings[]{
             "SystemTests", // bin
diff --git a/test/SystemTests/Game/IW5/simple/SimpleZone.txt b/test/SystemTests/Game/IW5/Simple/SimpleZone.txt
similarity index 100%
rename from test/SystemTests/Game/IW5/simple/SimpleZone.txt
rename to test/SystemTests/Game/IW5/Simple/SimpleZone.txt
diff --git a/test/SystemTests/Game/IW5/simple/SimpleZoneIW5.zone b/test/SystemTests/Game/IW5/Simple/SimpleZoneIW5.zone
similarity index 100%
rename from test/SystemTests/Game/IW5/simple/SimpleZoneIW5.zone
rename to test/SystemTests/Game/IW5/Simple/SimpleZoneIW5.zone
diff --git a/test/SystemTests/Game/IW5/SimpleZoneIW5.cpp b/test/SystemTests/Game/IW5/SimpleZoneIW5.cpp
index b298848c..bd3c80d3 100644
--- a/test/SystemTests/Game/IW5/SimpleZoneIW5.cpp
+++ b/test/SystemTests/Game/IW5/SimpleZoneIW5.cpp
@@ -17,9 +17,9 @@ namespace
 {
     TEST_CASE("Simple Zone(IW5)", "[iw5][system][simple]")
     {
-        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW5/simple").string();
-        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW5/simple").string();
-        const auto outputPath = oat::paths::GetTempDirectory("iw5_simple").string();
+        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW5/Simple").string();
+        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/IW5/Simple").string();
+        const auto outputPath = oat::paths::GetTempDirectory("SimpleZoneIW5").string();
 
         const char* argStrings[]{
             "SystemTests", // bin
diff --git a/test/SystemTests/Game/T5/simple/SimpleZone.txt b/test/SystemTests/Game/T5/Simple/SimpleZone.txt
similarity index 100%
rename from test/SystemTests/Game/T5/simple/SimpleZone.txt
rename to test/SystemTests/Game/T5/Simple/SimpleZone.txt
diff --git a/test/SystemTests/Game/T5/simple/SimpleZoneT5.zone b/test/SystemTests/Game/T5/Simple/SimpleZoneT5.zone
similarity index 100%
rename from test/SystemTests/Game/T5/simple/SimpleZoneT5.zone
rename to test/SystemTests/Game/T5/Simple/SimpleZoneT5.zone
diff --git a/test/SystemTests/Game/T5/SimpleZoneT5.cpp b/test/SystemTests/Game/T5/SimpleZoneT5.cpp
index a8997923..7ba904b0 100644
--- a/test/SystemTests/Game/T5/SimpleZoneT5.cpp
+++ b/test/SystemTests/Game/T5/SimpleZoneT5.cpp
@@ -17,9 +17,9 @@ namespace
 {
     TEST_CASE("Simple Zone(T5)", "[t5][system][simple]")
     {
-        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/T5/simple").string();
-        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/T5/simple").string();
-        const auto outputPath = oat::paths::GetTempDirectory("t5_simple").string();
+        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/T5/Simple").string();
+        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/T5/Simple").string();
+        const auto outputPath = oat::paths::GetTempDirectory("SimpleZoneT5").string();
 
         const char* argStrings[]{
             "SystemTests", // bin
diff --git a/test/SystemTests/Game/T6/simple/SimpleZone.txt b/test/SystemTests/Game/T6/Simple/SimpleZone.txt
similarity index 100%
rename from test/SystemTests/Game/T6/simple/SimpleZone.txt
rename to test/SystemTests/Game/T6/Simple/SimpleZone.txt
diff --git a/test/SystemTests/Game/T6/simple/SimpleZoneT6.zone b/test/SystemTests/Game/T6/Simple/SimpleZoneT6.zone
similarity index 100%
rename from test/SystemTests/Game/T6/simple/SimpleZoneT6.zone
rename to test/SystemTests/Game/T6/Simple/SimpleZoneT6.zone
diff --git a/test/SystemTests/Game/T6/SimpleZoneT6.cpp b/test/SystemTests/Game/T6/SimpleZoneT6.cpp
index 8afd0440..e2eae4c9 100644
--- a/test/SystemTests/Game/T6/SimpleZoneT6.cpp
+++ b/test/SystemTests/Game/T6/SimpleZoneT6.cpp
@@ -17,9 +17,9 @@ namespace
 {
     TEST_CASE("Simple Zone(T6)", "[t6][system][simple]")
     {
-        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/T6/simple").string();
-        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/T6/simple").string();
-        const auto outputPath = oat::paths::GetTempDirectory("t6_simple").string();
+        const auto assetSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/T6/Simple").string();
+        const auto sourceSearchPath = (oat::paths::GetSystemTestsDirectory() / "Game/T6/Simple").string();
+        const auto outputPath = oat::paths::GetTempDirectory("SimpleZoneT6").string();
 
         const char* argStrings[]{
             "SystemTests", // bin