diff --git a/P3D/Debug/Logger.vb b/P3D/Debug/Logger.vb
index e04e5f942..f722e63c3 100644
--- a/P3D/Debug/Logger.vb
+++ b/P3D/Debug/Logger.vb
@@ -113,7 +113,7 @@ Public Class Logger
 
             Dim GameMode As String = "[No GameMode loaded]"
             If Not GameModeManager.ActiveGameMode Is Nothing Then
-                GameMode = GameModeManager.ActiveGameMode.Name
+                GameMode = GameModeManager.ActiveGameMode.DirectoryName
             End If
 
             Dim OnlineInformation As String = "GameJolt Account: FALSE"
diff --git a/P3D/Network/Servers/PlayerManager.vb b/P3D/Network/Servers/PlayerManager.vb
index 3535255c3..312d1a327 100644
--- a/P3D/Network/Servers/PlayerManager.vb
+++ b/P3D/Network/Servers/PlayerManager.vb
@@ -275,7 +275,7 @@ Namespace Servers
                 GameJoltID = Core.GameJoltSave.GameJoltID
             End If
 
-            AddToDataItems(dataItems, GameModeManager.ActiveGameMode.Name.ToLower(), 0)
+            AddToDataItems(dataItems, GameModeManager.ActiveGameMode.DirectoryName.ToLower(), 0)
             AddToDataItems(dataItems, Core.Player.IsGamejoltSave.ToNumberString(), 1)
             AddToDataItems(dataItems, GameJoltID, 2)
             AddToDataItems(dataItems, GameController.DecSeparator, 3)
diff --git a/P3D/Resources/FontManager.vb b/P3D/Resources/FontManager.vb
index 45ecfa4f5..763a5cfc1 100644
--- a/P3D/Resources/FontManager.vb
+++ b/P3D/Resources/FontManager.vb
@@ -34,7 +34,7 @@ Public Class FontManager
             End If
         Next
         'if there's a game mode loaded, look in that too for additional fonts
-        If Not GameModeManager.ActiveGameMode.Name = "Kolben" Then
+        If Not GameModeManager.ActiveGameMode.DirectoryName = "Kolben" Then
             If Not GameModeManager.ActiveGameMode.ContentPath = "\Content\" Then
                 If System.IO.Directory.Exists(GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "\Fonts\BMP") = True Then
                     For Each s As String In System.IO.Directory.GetFiles(GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "\Fonts\BMP")
diff --git a/P3D/Resources/ModelManager.vb b/P3D/Resources/ModelManager.vb
index 73359729c..14623dc7f 100644
--- a/P3D/Resources/ModelManager.vb
+++ b/P3D/Resources/ModelManager.vb
@@ -32,7 +32,7 @@ Public Class ModelManager
     Public Shared Function ModelExist(ByVal Path As String) As Boolean
         Dim cContent As ContentManager = ContentPackManager.GetContentManager(Path, ".xnb")
         If cContent.RootDirectory = "Content" Then
-            If GameModeManager.ActiveGameMode.Name <> "Kolben" Then
+            If GameModeManager.ActiveGameMode.DirectoryName <> "Kolben" Then
                 Return False
             End If
         End If
diff --git a/P3D/Screens/MainMenu/NewNewGameScreen.vb b/P3D/Screens/MainMenu/NewNewGameScreen.vb
index bf1553fd1..de20dfb7c 100644
--- a/P3D/Screens/MainMenu/NewNewGameScreen.vb
+++ b/P3D/Screens/MainMenu/NewNewGameScreen.vb
@@ -160,7 +160,7 @@
 
             Core.Player.filePrefix = folderPath
             Core.Player.GameStart = Date.Now
-            Core.Player.GameMode = GameModeManager.ActiveGameMode.Name
+            Core.Player.GameMode = GameModeManager.ActiveGameMode.DirectoryName
             Core.Player.startFOV = 60
             Core.Player.startFreeCameraMode = True
             Core.Player.startPosition = New Vector3(x, y, z)
diff --git a/P3D/Screens/MainMenu/PressStartScreen.vb b/P3D/Screens/MainMenu/PressStartScreen.vb
index d1aeeb07b..fff6afced 100644
--- a/P3D/Screens/MainMenu/PressStartScreen.vb
+++ b/P3D/Screens/MainMenu/PressStartScreen.vb
@@ -1631,7 +1631,7 @@ Public Class GameModeSelectionScreen
             Dim displayText = _gameModes(i).Name.CropStringToWidth(FontManager.InGameFont, WIDTH - 32)
 
             If displayText = "Kolben" Then
-                displayText = "Pokemon 3D"
+                displayText = "Pokémon 3D"
             End If
             For x = 0 To CInt(WIDTH / 16)
                 For y = 0 To CInt(HEIGHT / 16)
@@ -1652,7 +1652,7 @@ Public Class GameModeSelectionScreen
 
             Dim dispName As String = GameMode.Name
             If dispName = "Kolben" Then
-                dispName = "Pokemon 3D"
+                dispName = "Pokémon 3D"
             End If
             Dim dispDescription As String = GameMode.Description.Replace("~", Environment.NewLine).Replace("*", Environment.NewLine)
             Dim dispVersion As String = GameMode.Version