diff --git a/Makefile.am b/Makefile.am
index 95b8fd41..2cd7d1ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,9 +31,9 @@ GIT_VERSION      := $(shell sh -c 'git describe --abbrev=4 --dirty')
 sgminer_CPPFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
 endif
 
-sgminer_SOURCES := sgminer.c
+sgminer_SOURCES := miner.c miner.h
 sgminer_SOURCES	+= api.c
-sgminer_SOURCES	+= elist.h miner.h compat.h bench_block.h
+sgminer_SOURCES	+= elist.h compat.h bench_block.h
 sgminer_SOURCES	+= util.c util.h uthash.h
 sgminer_SOURCES	+= sha2.c sha2.h
 sgminer_SOURCES	+= logging.c logging.h
diff --git a/configure.ac b/configure.ac
index 7f7725f1..3129143e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_INIT([sgminer], [v_ver], [veox@wemakethings.net], [sgminer], [https://github.
 AC_PREREQ(2.59)
 AC_CANONICAL_SYSTEM
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([sgminer.c])
+AC_CONFIG_SRCDIR([miner.c])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
diff --git a/sgminer.c b/miner.c
similarity index 100%
rename from sgminer.c
rename to miner.c
diff --git a/winbuild/sgminer.vcxproj b/winbuild/sgminer.vcxproj
index 66971119..6aa2ec57 100644
--- a/winbuild/sgminer.vcxproj
+++ b/winbuild/sgminer.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -264,7 +264,7 @@ exit 0</Command>
     <ClCompile Include="..\ocl.c" />
     <ClCompile Include="..\pool.c" />
     <ClCompile Include="..\scrypt.c" />
-    <ClCompile Include="..\sgminer.c" />
+    <ClCompile Include="..\miner.c" />
     <ClCompile Include="..\sha2.c" />
     <ClCompile Include="..\util.c" />
   </ItemGroup>
@@ -301,4 +301,4 @@ exit 0</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/winbuild/sgminer.vcxproj.filters b/winbuild/sgminer.vcxproj.filters
index 5e31bb38..4c69f63b 100644
--- a/winbuild/sgminer.vcxproj.filters
+++ b/winbuild/sgminer.vcxproj.filters
@@ -41,7 +41,7 @@
     <ClCompile Include="..\scrypt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\sgminer.c">
+    <ClCompile Include="..\miner.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\sha2.c">