diff --git a/Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs b/Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs
index d778ae7ee..7c970c341 100644
--- a/Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs
+++ b/Templates/Empty/game/core/scripts/gui/messageBoxes/messageBox.ed.cs
@@ -42,8 +42,8 @@ if( isObject( IODropdownDlg ) )
 exec("./messageBoxOk.ed.gui");
 exec("./messageBoxYesNo.ed.gui");
 exec("./messageBoxYesNoCancel.ed.gui");
-exec("./messageBoxOKCancel.ed.gui");
-exec("./messageBoxOKCancelDetailsDlg.ed.gui");
+exec("./messageBoxOkCancel.ed.gui");
+exec("./MessageBoxOKCancelDetailsDlg.ed.gui");
 exec("./messagePopup.ed.gui");
 exec("./IODropdownDlg.ed.gui");
 
diff --git a/Templates/Empty/game/tools/gui/profiles.ed.cs b/Templates/Empty/game/tools/gui/profiles.ed.cs
index 8d6718601..b3a5b2295 100644
--- a/Templates/Empty/game/tools/gui/profiles.ed.cs
+++ b/Templates/Empty/game/tools/gui/profiles.ed.cs
@@ -764,7 +764,7 @@ singleton GuiControlProfile( GuiInspectorGroupProfile )
    opaque = false;
    border = false;
   
-   bitmap = "tools/editorclasses/gui/images/rollout";
+   bitmap = "tools/editorClasses/gui/images/rollout";
    
    textOffset = "20 0";
 
diff --git a/Templates/Empty/game/tools/riverEditor/main.cs b/Templates/Empty/game/tools/riverEditor/main.cs
index b51bd5273..eafb3c3c8 100644
--- a/Templates/Empty/game/tools/riverEditor/main.cs
+++ b/Templates/Empty/game/tools/riverEditor/main.cs
@@ -25,8 +25,8 @@ function initializeRiverEditor()
    echo(" % - Initializing River Editor");
      
    exec( "./riverEditor.cs" );
-   exec( "./riverEditorGui.gui" );
-   exec( "./riverEditorToolbar.gui" );
+   exec( "./RiverEditorGui.gui" );
+   exec( "./RiverEditorToolbar.gui" );
    exec( "./riverEditorGui.cs" );
    
    // Add ourselves to EditorGui, where all the other tools reside
diff --git a/Templates/Empty/game/tools/roadEditor/main.cs b/Templates/Empty/game/tools/roadEditor/main.cs
index cb7ea052c..f45823670 100644
--- a/Templates/Empty/game/tools/roadEditor/main.cs
+++ b/Templates/Empty/game/tools/roadEditor/main.cs
@@ -25,8 +25,8 @@ function initializeRoadEditor()
    echo( " - Initializing Road and Path Editor" );
    
    exec( "./roadEditor.cs" );
-   exec( "./roadEditorGui.gui" );
-   exec( "./roadEditorToolbar.gui");
+   exec( "./RoadEditorGui.gui" );
+   exec( "./RoadEditorToolbar.gui");
    exec( "./roadEditorGui.cs" );
    
    // Add ourselves to EditorGui, where all the other tools reside
diff --git a/Templates/Empty/game/tools/shapeEditor/gui/Profiles.ed.cs b/Templates/Empty/game/tools/shapeEditor/gui/Profiles.ed.cs
index 0b92a30e2..cb42ef169 100644
--- a/Templates/Empty/game/tools/shapeEditor/gui/Profiles.ed.cs
+++ b/Templates/Empty/game/tools/shapeEditor/gui/Profiles.ed.cs
@@ -41,7 +41,7 @@ singleton GuiControlProfile(GuiShapeEdTextListProfile : ToolsGuiTextListProfile)
 
 singleton GuiControlProfile(GuiShapeEdRolloutProfile : GuiInspectorRolloutProfile0)
 {
-   bitmap = "tools/editorclasses/gui/images/rollout";
+   bitmap = "tools/editorClasses/gui/images/rollout";
    category = "Editor";
 };
 
diff --git a/Templates/Empty/game/tools/shapeEditor/main.cs b/Templates/Empty/game/tools/shapeEditor/main.cs
index f033bae86..721313e95 100644
--- a/Templates/Empty/game/tools/shapeEditor/main.cs
+++ b/Templates/Empty/game/tools/shapeEditor/main.cs
@@ -33,7 +33,7 @@ function initializeShapeEditor()
    exec("./gui/shapeEdPreviewWindow.ed.gui");
    exec("./gui/shapeEdAnimWindow.ed.gui");
    exec("./gui/shapeEdAdvancedWindow.ed.gui");
-   exec("./gui/shapeEditorToolbar.ed.gui");
+   exec("./gui/ShapeEditorToolbar.ed.gui");
    exec("./gui/shapeEdSelectWindow.ed.gui");
    exec("./gui/shapeEdPropWindow.ed.gui");
 
diff --git a/Templates/Empty/game/tools/worldEditor/main.cs b/Templates/Empty/game/tools/worldEditor/main.cs
index 1b20201e0..773dbac17 100644
--- a/Templates/Empty/game/tools/worldEditor/main.cs
+++ b/Templates/Empty/game/tools/worldEditor/main.cs
@@ -29,7 +29,7 @@ function initializeWorldEditor()
    exec("./scripts/cursors.ed.cs");
 
    exec("./gui/guiCreateNewTerrainGui.gui" );
-   exec("./gui/genericPromptDialog.ed.gui" );
+   exec("./gui/GenericPromptDialog.ed.gui" );
    exec("./gui/guiTerrainImportGui.gui" );
    exec("./gui/guiTerrainExportGui.gui" );
    exec("./gui/EditorGui.ed.gui");
diff --git a/Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs b/Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs
index d778ae7ee..7c970c341 100644
--- a/Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs
+++ b/Templates/Full/game/core/scripts/gui/messageBoxes/messageBox.ed.cs
@@ -42,8 +42,8 @@ if( isObject( IODropdownDlg ) )
 exec("./messageBoxOk.ed.gui");
 exec("./messageBoxYesNo.ed.gui");
 exec("./messageBoxYesNoCancel.ed.gui");
-exec("./messageBoxOKCancel.ed.gui");
-exec("./messageBoxOKCancelDetailsDlg.ed.gui");
+exec("./messageBoxOkCancel.ed.gui");
+exec("./MessageBoxOKCancelDetailsDlg.ed.gui");
 exec("./messagePopup.ed.gui");
 exec("./IODropdownDlg.ed.gui");
 
diff --git a/Templates/Full/game/scripts/client/init.cs b/Templates/Full/game/scripts/client/init.cs
index 3f7f2d96a..56da1c945 100644
--- a/Templates/Full/game/scripts/client/init.cs
+++ b/Templates/Full/game/scripts/client/init.cs
@@ -73,8 +73,8 @@ function initClient()
 
    // Load up the Game GUIs
    exec("art/gui/defaultGameProfiles.cs");
-   exec("art/gui/PlayGui.gui");
-   exec("art/gui/ChatHud.gui");
+   exec("art/gui/playGui.gui");
+   exec("art/gui/chatHud.gui");
    exec("art/gui/playerList.gui");
    exec("art/gui/hudlessGui.gui");
 
diff --git a/Templates/Full/game/tools/gui/profiles.ed.cs b/Templates/Full/game/tools/gui/profiles.ed.cs
index 8d6718601..b3a5b2295 100644
--- a/Templates/Full/game/tools/gui/profiles.ed.cs
+++ b/Templates/Full/game/tools/gui/profiles.ed.cs
@@ -764,7 +764,7 @@ singleton GuiControlProfile( GuiInspectorGroupProfile )
    opaque = false;
    border = false;
   
-   bitmap = "tools/editorclasses/gui/images/rollout";
+   bitmap = "tools/editorClasses/gui/images/rollout";
    
    textOffset = "20 0";
 
diff --git a/Templates/Full/game/tools/riverEditor/main.cs b/Templates/Full/game/tools/riverEditor/main.cs
index b51bd5273..eafb3c3c8 100644
--- a/Templates/Full/game/tools/riverEditor/main.cs
+++ b/Templates/Full/game/tools/riverEditor/main.cs
@@ -25,8 +25,8 @@ function initializeRiverEditor()
    echo(" % - Initializing River Editor");
      
    exec( "./riverEditor.cs" );
-   exec( "./riverEditorGui.gui" );
-   exec( "./riverEditorToolbar.gui" );
+   exec( "./RiverEditorGui.gui" );
+   exec( "./RiverEditorToolbar.gui" );
    exec( "./riverEditorGui.cs" );
    
    // Add ourselves to EditorGui, where all the other tools reside
diff --git a/Templates/Full/game/tools/roadEditor/main.cs b/Templates/Full/game/tools/roadEditor/main.cs
index cb7ea052c..f45823670 100644
--- a/Templates/Full/game/tools/roadEditor/main.cs
+++ b/Templates/Full/game/tools/roadEditor/main.cs
@@ -25,8 +25,8 @@ function initializeRoadEditor()
    echo( " - Initializing Road and Path Editor" );
    
    exec( "./roadEditor.cs" );
-   exec( "./roadEditorGui.gui" );
-   exec( "./roadEditorToolbar.gui");
+   exec( "./RoadEditorGui.gui" );
+   exec( "./RoadEditorToolbar.gui");
    exec( "./roadEditorGui.cs" );
    
    // Add ourselves to EditorGui, where all the other tools reside
diff --git a/Templates/Full/game/tools/shapeEditor/gui/Profiles.ed.cs b/Templates/Full/game/tools/shapeEditor/gui/Profiles.ed.cs
index 0b92a30e2..cb42ef169 100644
--- a/Templates/Full/game/tools/shapeEditor/gui/Profiles.ed.cs
+++ b/Templates/Full/game/tools/shapeEditor/gui/Profiles.ed.cs
@@ -41,7 +41,7 @@ singleton GuiControlProfile(GuiShapeEdTextListProfile : ToolsGuiTextListProfile)
 
 singleton GuiControlProfile(GuiShapeEdRolloutProfile : GuiInspectorRolloutProfile0)
 {
-   bitmap = "tools/editorclasses/gui/images/rollout";
+   bitmap = "tools/editorClasses/gui/images/rollout";
    category = "Editor";
 };
 
diff --git a/Templates/Full/game/tools/shapeEditor/main.cs b/Templates/Full/game/tools/shapeEditor/main.cs
index f033bae86..721313e95 100644
--- a/Templates/Full/game/tools/shapeEditor/main.cs
+++ b/Templates/Full/game/tools/shapeEditor/main.cs
@@ -33,7 +33,7 @@ function initializeShapeEditor()
    exec("./gui/shapeEdPreviewWindow.ed.gui");
    exec("./gui/shapeEdAnimWindow.ed.gui");
    exec("./gui/shapeEdAdvancedWindow.ed.gui");
-   exec("./gui/shapeEditorToolbar.ed.gui");
+   exec("./gui/ShapeEditorToolbar.ed.gui");
    exec("./gui/shapeEdSelectWindow.ed.gui");
    exec("./gui/shapeEdPropWindow.ed.gui");
 
diff --git a/Templates/Full/game/tools/worldEditor/main.cs b/Templates/Full/game/tools/worldEditor/main.cs
index 1b20201e0..773dbac17 100644
--- a/Templates/Full/game/tools/worldEditor/main.cs
+++ b/Templates/Full/game/tools/worldEditor/main.cs
@@ -29,7 +29,7 @@ function initializeWorldEditor()
    exec("./scripts/cursors.ed.cs");
 
    exec("./gui/guiCreateNewTerrainGui.gui" );
-   exec("./gui/genericPromptDialog.ed.gui" );
+   exec("./gui/GenericPromptDialog.ed.gui" );
    exec("./gui/guiTerrainImportGui.gui" );
    exec("./gui/guiTerrainExportGui.gui" );
    exec("./gui/EditorGui.ed.gui");