diff --git a/obs/CMakeLists.txt b/obs/CMakeLists.txt
index a64a67ca4b1b10a0f2299fbbc65d137bbe8eee6f..58908dde88cbc3debf33b708dff29af66a96664d 100644
--- a/obs/CMakeLists.txt
+++ b/obs/CMakeLists.txt
@@ -30,7 +30,7 @@ link_libraries(${wxWidgets_LIBRARIES})
 add_executable(obs
 	window-obs-basic.cpp
 	window-subclass.cpp
-	obs.cpp
+	obs-app.cpp
 	OBSWindows.cpp)
 
 if(APPLE)
diff --git a/obs/makefile.am b/obs/makefile.am
index dbe8854bc650e3cb9f03ac84d9ff9d4d75c008f2..ce6071c85b7ba7071f06a0ca72e5ca680826ed00 100644
--- a/obs/makefile.am
+++ b/obs/makefile.am
@@ -12,5 +12,5 @@ obs_PROGRAMS = obs
 # obs_LDADD = $(top_srcdir)/libobs/libobs.la
 obs_SOURCES = window-obs-basic.cpp \
 	      window-subclass.cpp \
-	      obs.cpp \
+	      obs-app.cpp \
 	      OBSWindows.cpp
diff --git a/obs/obs.cpp b/obs/obs-app.cpp
similarity index 100%
rename from obs/obs.cpp
rename to obs/obs-app.cpp
diff --git a/obs/obs.hpp b/obs/obs-app.hpp
similarity index 100%
rename from obs/obs.hpp
rename to obs/obs-app.hpp
diff --git a/vs/2010/OBS/OBS.vcxproj b/vs/2010/OBS/OBS.vcxproj
index 37d09c422f3f428a14df42aca5c08c6b82d6d322..41010730ed6ba4468947ba73f3ea6e381543ec0a 100644
--- a/vs/2010/OBS/OBS.vcxproj
+++ b/vs/2010/OBS/OBS.vcxproj
@@ -167,13 +167,13 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\obs\obs.cpp" />
+    <ClCompile Include="..\..\..\obs\obs-app.cpp" />
     <ClCompile Include="..\..\..\obs\OBSWindows.cpp" />
     <ClCompile Include="..\..\..\obs\window-obs-basic.cpp" />
     <ClCompile Include="..\..\..\obs\window-subclass.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\obs\obs.hpp" />
+    <ClInclude Include="..\..\..\obs\obs-app.hpp" />
     <ClInclude Include="..\..\..\obs\OBSWindows.h" />
     <ClInclude Include="..\..\..\obs\window-obs-basic.hpp" />
     <ClInclude Include="..\..\..\obs\window-subclass.hpp" />
diff --git a/vs/2010/OBS/OBS.vcxproj.filters b/vs/2010/OBS/OBS.vcxproj.filters
index bed3854f61d17be5f1050c95a098be1684a1266f..22e21dfb884a3ac4f8bb0f24ca95ddc12782432e 100644
--- a/vs/2010/OBS/OBS.vcxproj.filters
+++ b/vs/2010/OBS/OBS.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\obs\obs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\obs\OBSWindows.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -27,11 +24,11 @@
     <ClCompile Include="..\..\..\obs\window-subclass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\obs\obs-app.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\obs\obs.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\obs\OBSWindows.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -41,5 +38,8 @@
     <ClInclude Include="..\..\..\obs\window-subclass.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\obs\obs-app.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file