diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8286945382..280ed0e323 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,8 +261,8 @@ add_library(Common STATIC
 	Common/StringUtils.h
 	Common/Thread.cpp
 	Common/Thread.h
-	Common/ThreadPool.cpp
-	Common/ThreadPool.h
+	Common/ThreadPools.cpp
+	Common/ThreadPools.h
 	Common/Timer.cpp
 	Common/Timer.h
 	Common/Version.cpp)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index b4390897ab..e580e7716e 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -14,7 +14,7 @@ set(SRCS
 	MsgHandler.cpp
 	StringUtils.cpp
 	Thread.cpp
-	ThreadPool.cpp
+	ThreadPools.cpp
 	Timer.cpp
 )
 
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index f5b215f4e6..1a78ca4aba 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -191,7 +191,7 @@
     <ClInclude Include="StringUtils.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="Thread.h" />
-    <ClInclude Include="ThreadPool.h" />
+    <ClInclude Include="ThreadPools.h" />
     <ClInclude Include="Thunk.h" />
     <ClInclude Include="Timer.h" />
     <ClInclude Include="x64Analyzer.h" />
@@ -227,7 +227,7 @@
     </ClCompile>
     <ClCompile Include="StringUtils.cpp" />
     <ClCompile Include="Thread.cpp" />
-    <ClCompile Include="ThreadPool.cpp" />
+    <ClCompile Include="ThreadPools.cpp" />
     <ClCompile Include="Thunk.cpp" />
     <ClCompile Include="Timer.cpp" />
     <ClCompile Include="Version.cpp" />
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index 39a5dce5f0..4775e5f398 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -42,7 +42,7 @@
     <ClInclude Include="x64Emitter.h" />
     <ClInclude Include="ArmEmitter.h" />
     <ClInclude Include="FixedSizeUnorderedSet.h" />
-    <ClInclude Include="ThreadPool.h" />
+    <ClInclude Include="ThreadPools.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp" />
@@ -69,7 +69,7 @@
     <ClCompile Include="x64Emitter.cpp" />
     <ClCompile Include="ArmEmitter.cpp" />
     <ClCompile Include="ArmCPUDetect.cpp" />
-    <ClCompile Include="ThreadPool.cpp" />
+    <ClCompile Include="ThreadPools.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
diff --git a/Common/ThreadPool.cpp b/Common/ThreadPools.cpp
similarity index 94%
rename from Common/ThreadPool.cpp
rename to Common/ThreadPools.cpp
index c6de1a44e9..7c40b7023b 100644
--- a/Common/ThreadPool.cpp
+++ b/Common/ThreadPools.cpp
@@ -1,4 +1,4 @@
-#include "ThreadPool.h"
+#include "ThreadPools.h"
 
 #include "../Core/Config.h"
 
diff --git a/Common/ThreadPool.h b/Common/ThreadPools.h
similarity index 100%
rename from Common/ThreadPool.h
rename to Common/ThreadPools.h
diff --git a/GPU/GLES/TextureScaler.cpp b/GPU/GLES/TextureScaler.cpp
index 953eb99828..ff32acb861 100644
--- a/GPU/GLES/TextureScaler.cpp
+++ b/GPU/GLES/TextureScaler.cpp
@@ -21,7 +21,7 @@
 #include "Common/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/CommonFuncs.h"
-#include "Common/ThreadPool.h"
+#include "Common/ThreadPools.h"
 #include "ext/xbrz/xbrz.h"
 
 #ifdef __SYMBIAN32__
@@ -33,11 +33,6 @@ namespace p = std::tr1::placeholders;
 namespace p = std::placeholders;
 #endif
 
-// Hack for Meego
-#ifdef MEEGO_EDITION_HARMATTAN
-#include "Common/ThreadPool.cpp"
-#endif
-
 // Report the time and throughput for each larger scaling operation in the log
 //#define SCALING_MEASURE_TIME
 
diff --git a/Qt/Common.pro b/Qt/Common.pro
index 84a3ff745e..ed69d9c4c9 100755
--- a/Qt/Common.pro
+++ b/Qt/Common.pro
@@ -44,7 +44,7 @@ SOURCES += ../Common/ColorUtil.cpp \
 	../Common/MsgHandler.cpp \
 	../Common/StringUtils.cpp \
 	../Common/Thread.cpp \
-	../Common/ThreadPool.cpp \
+	../Common/ThreadPools.cpp \
 	../Common/Timer.cpp \
 	../Common/Version.cpp \
 	../Common/Crypto/*.cpp
@@ -62,7 +62,7 @@ HEADERS += ../Common/ChunkFile.h \
 	../Common/MsgHandler.h \
 	../Common/StringUtils.h \
 	../Common/Thread.h \
-	../Common/ThreadPool.h \
+	../Common/ThreadPools.h \
 	../Common/Timer.h \
 	../Common/Crypto/*.h
 
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 2272a9fda5..95d75ea0bc 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -136,7 +136,7 @@ LOCAL_SRC_FILES := \
   $(SRC)/Common/FileUtil.cpp \
   $(SRC)/Common/StringUtils.cpp \
   $(SRC)/Common/Thread.cpp \
-  $(SRC)/Common/ThreadPool.cpp \
+  $(SRC)/Common/ThreadPools.cpp \
   $(SRC)/Common/Timer.cpp \
   $(SRC)/Common/Misc.cpp \
   $(SRC)/Common/MathUtil.cpp \