diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
index 86fce47ff..4dd7918d3 100644
--- a/Source/Project64/Project64.vcxproj
+++ b/Source/Project64/Project64.vcxproj
@@ -100,7 +100,7 @@
     <ClCompile Include="UserInterface\Debugger\ScriptInstance.cpp" />
     <ClCompile Include="UserInterface\Debugger\ScriptSystem.cpp" />
     <ClCompile Include="UserInterface\Debugger\Symbols.cpp" />
-    <ClCompile Include="UserInterface\GuiClass.cpp" />
+    <ClCompile Include="UserInterface\MainWindow.cpp" />
     <ClCompile Include="UserInterface\LoggingUI.cpp" />
     <ClCompile Include="UserInterface\MainMenu.cpp" />
     <ClCompile Include="UserInterface\MenuClass.cpp" />
@@ -162,7 +162,7 @@
     <ClInclude Include="UserInterface\Debugger\ScriptSystem.h" />
     <ClInclude Include="UserInterface\Debugger\stdafx.h" />
     <ClInclude Include="UserInterface\Debugger\Symbols.h" />
-    <ClInclude Include="UserInterface\GuiClass.h" />
+    <ClInclude Include="UserInterface\MainWindow.h" />
     <ClInclude Include="UserInterface\LoggingUI.h" />
     <ClInclude Include="UserInterface\MainMenu.h" />
     <ClInclude Include="UserInterface\MenuClass.h" />
diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters
index c14bef862..863b978a2 100644
--- a/Source/Project64/Project64.vcxproj.filters
+++ b/Source/Project64/Project64.vcxproj.filters
@@ -105,7 +105,7 @@
     <ClCompile Include="UserInterface\CheatClassUI.cpp">
       <Filter>Source Files\User Interface Source</Filter>
     </ClCompile>
-    <ClCompile Include="UserInterface\GuiClass.cpp">
+    <ClCompile Include="UserInterface\MainWindow.cpp">
       <Filter>Source Files\User Interface Source</Filter>
     </ClCompile>
     <ClCompile Include="UserInterface\LoggingUI.cpp">
@@ -227,7 +227,7 @@
     <ClInclude Include="UserInterface\CheatClassUI.h">
       <Filter>Header Files\User Interface Headers</Filter>
     </ClInclude>
-    <ClInclude Include="UserInterface\GuiClass.h">
+    <ClInclude Include="UserInterface\MainWindow.h">
       <Filter>Header Files\User Interface Headers</Filter>
     </ClInclude>
     <ClInclude Include="UserInterface\LoggingUI.h">
diff --git a/Source/Project64/UserInterface.h b/Source/Project64/UserInterface.h
index 870a7b1a7..b3c450d6e 100644
--- a/Source/Project64/UserInterface.h
+++ b/Source/Project64/UserInterface.h
@@ -19,7 +19,7 @@
 #include "WTLApp.h"
 #include "UserInterface/MenuShortCuts.h"
 #include "UserInterface/RomBrowser.h"
-#include "UserInterface/GuiClass.h"
+#include "UserInterface/MainWindow.h"
 #include "UserInterface/MenuClass.h"
 #include "UserInterface/MainMenu.h"
 #include "UserInterface/NotificationClass.h"
diff --git a/Source/Project64/UserInterface/GuiClass.cpp b/Source/Project64/UserInterface/MainWindow.cpp
similarity index 100%
rename from Source/Project64/UserInterface/GuiClass.cpp
rename to Source/Project64/UserInterface/MainWindow.cpp
diff --git a/Source/Project64/UserInterface/GuiClass.h b/Source/Project64/UserInterface/MainWindow.h
similarity index 100%
rename from Source/Project64/UserInterface/GuiClass.h
rename to Source/Project64/UserInterface/MainWindow.h