diff --git a/Makefile b/Makefile
index bc63cbc31e..d25deb6938 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ endif
 
 ifeq ($(PERF_TEST), 1)
    DEFINES += -DPERF_TEST
-   OBJ += benchmark.o
+   OBJ += performance.o
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/Makefile.win b/Makefile.win
index 23b366357b..40b3b7acd8 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -78,7 +78,7 @@ endif
 
 ifeq ($(PERF_TEST), 1)
    DEFINES += -DPERF_TEST
-   OBJ += benchmark.o
+   OBJ += performance.o
 endif
 
 JLIBS =
diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index 4806eb0a49..f5c49bce84 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -58,7 +58,7 @@ LOCAL_SRC_FILES    =	$(RARCH_PATH)/retroarch.c \
 			main.c
 
 ifeq ($(PERF_TEST), 1)
-LOCAL_SRC_FILES += $(RARCH_PATH)/benchmark.c
+LOCAL_SRC_FILES += $(RARCH_PATH)/performance.c
 LOCAL_CFLAGS += -DPERF_TEST
 endif
 
diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index cf6165eef0..8c53b79585 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -17,7 +17,7 @@
 #include <android/keycodes.h>
 #include <unistd.h>
 #include "android_general.h"
-#include "../../../benchmark.h"
+#include "../../../performance.h"
 #include "../../../general.h"
 #include "../../../driver.h"
 #include "input_android.h"
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 02df0a3a9c..18fdfb1eca 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -43,7 +43,7 @@ CONSOLE EXTENSIONS
 #endif
 
 #ifdef PERF_TEST
-#include "../../benchmark.c"
+#include "../../performance.c"
 #endif
 
 #ifdef HAVE_RSOUND
diff --git a/gfx/gl.c b/gfx/gl.c
index c758166612..ec6c2f9c98 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -15,7 +15,7 @@
  */
 
 #include "../driver.h"
-#include "../benchmark.h"
+#include "../performance.h"
 #include "scaler/scaler.h"
 
 #include <stdint.h>
diff --git a/gfx/scaler/scaler.c b/gfx/scaler/scaler.c
index 5f2bc6d978..54b88b16ae 100644
--- a/gfx/scaler/scaler.c
+++ b/gfx/scaler/scaler.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
-#include "../../benchmark.h"
+#include "../../performance.h"
 
 // In case aligned allocs are needed later ...
 void *scaler_alloc(size_t elem_size, size_t size)
diff --git a/gfx/vg.c b/gfx/vg.c
index 792f557270..d42bd5f5f5 100644
--- a/gfx/vg.c
+++ b/gfx/vg.c
@@ -24,7 +24,7 @@
 #include "../libretro.h"
 #include "../general.h"
 #include "../driver.h"
-#include "../benchmark.h"
+#include "../performance.h"
 
 #ifdef HAVE_FREETYPE
 #include "fonts/fonts.h"
diff --git a/msvc/msvc-2012/GL/glext.h b/msvc/msvc-2010/GL/glext.h
similarity index 100%
rename from msvc/msvc-2012/GL/glext.h
rename to msvc/msvc-2010/GL/glext.h
diff --git a/msvc/msvc-2012/RetroArch-msvc2012.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
similarity index 97%
rename from msvc/msvc-2012/RetroArch-msvc2012.vcxproj
rename to msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index b764b8c9e1..79c0010226 100644
--- a/msvc/msvc-2012/RetroArch-msvc2012.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{27FF7CE1-4059-4AA1-8062-FD529560FA54}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>RetroArchmsvc2012</RootNamespace>
+    <RootNamespace>RetroArchmsvc2010</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -114,7 +114,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\benchmark.c">
+    <ClCompile Include="..\..\performance.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
     </ClCompile>
@@ -269,4 +269,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msvc/msvc-2012/RetroArch-msvc2012.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
similarity index 96%
rename from msvc/msvc-2012/RetroArch-msvc2012.vcxproj.filters
rename to msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index e6cd831a83..51d39472d1 100644
--- a/msvc/msvc-2012/RetroArch-msvc2012.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -42,7 +42,7 @@
     <ClCompile Include="..\..\autosave.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\benchmark.c">
+    <ClCompile Include="..\..\performance.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\cheats.c">
@@ -175,4 +175,4 @@
       <Filter>Source Files\gfx\math</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msvc/msvc-2012/RetroArch-msvc2012.sln b/msvc/msvc-2012/RetroArch-msvc2012.sln
deleted file mode 100644
index db4561547c..0000000000
--- a/msvc/msvc-2012/RetroArch-msvc2012.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2012", "RetroArch-msvc2012.vcxproj", "{27FF7CE1-4059-4AA1-8062-FD529560FA54}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|Win32.Build.0 = Debug|Win32
-		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|Win32.ActiveCfg = Release|Win32
-		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/benchmark.c b/performance.c
similarity index 99%
rename from benchmark.c
rename to performance.c
index 082348ec18..5323eed461 100644
--- a/benchmark.c
+++ b/performance.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "benchmark.h"
+#include "performance.h"
 
 #if defined(__CELLOS_LV2__) || defined(GEKKO)
 #ifndef _PPU_INTRINSICS_H
diff --git a/benchmark.h b/performance.h
similarity index 97%
rename from benchmark.h
rename to performance.h
index 543fa5101d..3c3f98d509 100644
--- a/benchmark.h
+++ b/performance.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _RARCH_BENCHMARK_H
-#define _RARCH_BENCHMARK_H
+#ifndef _RARCH_PERF_H
+#define _RARCH_PERF_H
 
 #include "general.h"
 
diff --git a/retroarch.c b/retroarch.c
index 29559533db..f2382400b3 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -24,7 +24,7 @@
 #include "file.h"
 #include "general.h"
 #include "dynamic.h"
-#include "benchmark.h"
+#include "performance.h"
 #include "audio/utils.h"
 #include "record/ffemu.h"
 #include "rewind.h"