9 files changed, 16 insertions, 16 deletions
diff --git a/plugins/HwHotKeys/HwHotKeys_10.vcxproj b/plugins/HwHotKeys/HwHotKeys_10.vcxproj
index effa6ac14d..dbea58307a 100644
--- a/plugins/HwHotKeys/HwHotKeys_10.vcxproj
+++ b/plugins/HwHotKeys/HwHotKeys_10.vcxproj
@@ -183,8 +183,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="src\HwHotKeys.h" />
-    <ClInclude Include="src\HwHotKeys_version.h" />
-    <ClInclude Include="src\HwHotKeys_resource.h" />
+    <ClInclude Include="src\Version.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HwHotKeys_Dlg.cpp" />
@@ -197,7 +197,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="res\HwHotKeys_version.rc" />
+    <ResourceCompile Include="res\Version.rc" />
     <ResourceCompile Include="res\HwHotKeys.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters b/plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters
index 0dc01c54f3..2c2e2f7b70 100644
--- a/plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters
+++ b/plugins/HwHotKeys/HwHotKeys_10.vcxproj.filters
@@ -18,10 +18,10 @@
     <ClInclude Include="src\HwHotKeys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\HwHotKeys_version.h">
+    <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\HwHotKeys_resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -49,7 +49,7 @@
     <ResourceCompile Include="res\HwHotKeys.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="res\HwHotKeys_version.rc">
+    <ResourceCompile Include="res\Version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/HwHotKeys/HwHotKeys_12.vcxproj b/plugins/HwHotKeys/HwHotKeys_12.vcxproj
index cad3f6c7e4..d58dcdff4c 100644
--- a/plugins/HwHotKeys/HwHotKeys_12.vcxproj
+++ b/plugins/HwHotKeys/HwHotKeys_12.vcxproj
@@ -186,8 +186,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="src\HwHotKeys.h" />
-    <ClInclude Include="src\HwHotKeys_version.h" />
-    <ClInclude Include="src\HwHotKeys_resource.h" />
+    <ClInclude Include="src\Version.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HwHotKeys_Dlg.cpp" />
@@ -200,7 +200,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="res\HwHotKeys_version.rc" />
+    <ResourceCompile Include="res\Version.rc" />
     <ResourceCompile Include="res\HwHotKeys.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters b/plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters
index 0dc01c54f3..2c2e2f7b70 100644
--- a/plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters
+++ b/plugins/HwHotKeys/HwHotKeys_12.vcxproj.filters
@@ -18,10 +18,10 @@
     <ClInclude Include="src\HwHotKeys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\HwHotKeys_version.h">
+    <ClInclude Include="src\Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\HwHotKeys_resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -49,7 +49,7 @@
     <ResourceCompile Include="res\HwHotKeys.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="res\HwHotKeys_version.rc">
+    <ResourceCompile Include="res\Version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/HwHotKeys/res/HwHotKeys.rc b/plugins/HwHotKeys/res/HwHotKeys.rc
index 693266bbe8..d91ad2fc5a 100644
--- a/plugins/HwHotKeys/res/HwHotKeys.rc
+++ b/plugins/HwHotKeys/res/HwHotKeys.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "..\src\HwHotKeys_resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/HwHotKeys/res/HwHotKeys_version.rc b/plugins/HwHotKeys/res/Version.rc
index e2a0e7b639..46d811b4ac 100644
--- a/plugins/HwHotKeys/res/HwHotKeys_version.rc
+++ b/plugins/HwHotKeys/res/Version.rc
@@ -1,7 +1,7 @@
 
 
 #include "afxres.h"
-#include "..\src\HwHotKeys_version.h"
+#include "..\src\Version.h"
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058%28v=vs.85%29.aspx
 
diff --git a/plugins/HwHotKeys/src/HwHotKeys.h b/plugins/HwHotKeys/src/HwHotKeys.h
index 82b3a7bb61..114451a9d7 100644
--- a/plugins/HwHotKeys/src/HwHotKeys.h
+++ b/plugins/HwHotKeys/src/HwHotKeys.h
@@ -28,8 +28,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111 - 1307, USA.
 
 #include <Strsafe.h>
 
-#include "HwHotKeys_resource.h"
-#include "HwHotKeys_version.h"
+#include "resource.h"
+#include "Version.h"
 
 int initializeOptions(WPARAM, LPARAM);
 INT_PTR CALLBACK OptDlgProc(HWND, UINT, WPARAM, LPARAM);
diff --git a/plugins/HwHotKeys/src/HwHotKeys_version.h b/plugins/HwHotKeys/src/Version.h
index e4d52b0082..e4d52b0082 100644
--- a/plugins/HwHotKeys/src/HwHotKeys_version.h
+++ b/plugins/HwHotKeys/src/Version.h
diff --git a/plugins/HwHotKeys/src/HwHotKeys_resource.h b/plugins/HwHotKeys/src/resource.h
index 3cc2ad8f81..3cc2ad8f81 100644
--- a/plugins/HwHotKeys/src/HwHotKeys_resource.h
+++ b/plugins/HwHotKeys/src/resource.h