diff --git a/Makefile.am b/Makefile.am
index 901448b42e..d7d2a0bb58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,9 +76,9 @@ ccminer_SOURCES	= elist.h miner.h compat.h \
 			  x13/hsr.cu x13/cuda_hsr_sm3.cu x13/sm3.c \
 			  x15/x14.cu x15/x15.cu x15/cuda_x14_shabal512.cu x15/cuda_x15_whirlpool.cu \
 			  x15/whirlpool.cu x15/cuda_x15_whirlpool_sm3.cu \
-			  x16r/x16r.cu x16r/x16s.cu x16r/cuda_x16_echo512.cu x16r/cuda_x16_fugue512.cu \
-			  x16r/cuda_x16_shabal512.cu x16r/cuda_x16_simd512_80.cu \
-			  x16r/cuda_x16_echo512_64.cu \
+			  x16/x16r.cu x16/x16s.cu x16/cuda_x16_echo512.cu x16/cuda_x16_fugue512.cu \
+			  x16/cuda_x16_shabal512.cu x16/cuda_x16_simd512_80.cu \
+			  x16/cuda_x16_echo512_64.cu \
 			  x17/x17.cu x17/hmq17.cu x17/cuda_x17_haval256.cu x17/cuda_x17_sha512.cu \
 			  x11/phi.cu x11/cuda_streebog_maxwell.cu \
 			  x11/c11.cu x11/s3.cu x11/sib.cu x11/veltor.cu x11/cuda_streebog.cu
diff --git a/ccminer.vcxproj b/ccminer.vcxproj
index 38fc198834..f995f4afcf 100644
--- a/ccminer.vcxproj
+++ b/ccminer.vcxproj
@@ -269,7 +269,7 @@
     <ClCompile Include="neoscrypt\neoscrypt-cpu.c" />
     <ClInclude Include="neoscrypt\cuda_vectors.h" />
     <ClInclude Include="x11\cuda_x11_simd512_sm2.cuh" />
-    <ClInclude Include="x16r\cuda_x16r.h" />
+    <ClInclude Include="x16\cuda_x16.h" />
     <CudaCompile Include="Algo256\bmw.cu" />
     <CudaCompile Include="Algo256\cuda_bmw.cu">
       <MaxRegCount>76</MaxRegCount>
@@ -590,13 +590,13 @@
     <CudaCompile Include="x15\x15.cu" />
     <CudaCompile Include="x15\whirlpool.cu" />
     <CudaCompile Include="x15\cuda_x15_whirlpool_sm3.cu" />
-    <CudaCompile Include="x16r\x16r.cu" />
-    <CudaCompile Include="x16r\x16s.cu" />
-    <CudaCompile Include="x16r\cuda_x16_echo512.cu" />
-    <CudaCompile Include="x16r\cuda_x16_fugue512.cu" />
-    <CudaCompile Include="x16r\cuda_x16_shabal512.cu" />
-    <CudaCompile Include="x16r\cuda_x16_simd512_80.cu" />
-    <CudaCompile Include="x16r\cuda_x16_echo512_64.cu">
+    <CudaCompile Include="x16\x16r.cu" />
+    <CudaCompile Include="x16\x16s.cu" />
+    <CudaCompile Include="x16\cuda_x16_echo512.cu" />
+    <CudaCompile Include="x16\cuda_x16_fugue512.cu" />
+    <CudaCompile Include="x16\cuda_x16_shabal512.cu" />
+    <CudaCompile Include="x16\cuda_x16_simd512_80.cu" />
+    <CudaCompile Include="x16\cuda_x16_echo512_64.cu">
       <CodeGeneration>compute_50,sm_50;compute_52,sm_52</CodeGeneration>
     </CudaCompile>
     <CudaCompile Include="x17\x17.cu" />
diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
index 66abda24ec..4c1b8d6b1d 100644
--- a/ccminer.vcxproj.filters
+++ b/ccminer.vcxproj.filters
@@ -58,7 +58,7 @@
     <Filter Include="Source Files\CUDA\x15">
       <UniqueIdentifier>{a2403c22-6777-46ab-a55a-3fcc7386c974}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\CUDA\x16r">
+    <Filter Include="Source Files\CUDA\x16">
       <UniqueIdentifier>{55dfae6a-66ba-43e2-8ceb-98ee70cbdf16}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\CUDA\x17">
@@ -602,7 +602,7 @@
     <ClInclude Include="equi\equihash.h">
       <Filter>Source Files\equi</Filter>
     </ClInclude>
-    <ClInclude Include="x16r\cuda_x16r.h">
+    <ClInclude Include="x16\cuda_x16.h">
       <Filter>Header Files\CUDA</Filter>
     </ClInclude>
   </ItemGroup>
@@ -982,26 +982,26 @@
     <CudaCompile Include="x15\cuda_x15_whirlpool_sm3.cu">
       <Filter>Source Files\CUDA\x15</Filter>
     </CudaCompile>
-    <CudaCompile Include="x16r\cuda_x16_echo512.cu">
-      <Filter>Source Files\CUDA\x16r</Filter>
+    <CudaCompile Include="x16\cuda_x16_echo512.cu">
+      <Filter>Source Files\CUDA\x16</Filter>
     </CudaCompile>
-    <CudaCompile Include="x16r\cuda_x16_echo512_64.cu">
-      <Filter>Source Files\CUDA\x16r</Filter>
+    <CudaCompile Include="x16\cuda_x16_echo512_64.cu">
+      <Filter>Source Files\CUDA\x16</Filter>
     </CudaCompile>
-    <CudaCompile Include="x16r\cuda_x16_fugue512.cu">
-      <Filter>Source Files\CUDA\x16r</Filter>
+    <CudaCompile Include="x16\cuda_x16_fugue512.cu">
+      <Filter>Source Files\CUDA\x16</Filter>
     </CudaCompile>
-    <CudaCompile Include="x16r\cuda_x16_shabal512.cu">
-      <Filter>Source Files\CUDA\x16r</Filter>
+    <CudaCompile Include="x16\cuda_x16_shabal512.cu">
+      <Filter>Source Files\CUDA\x16</Filter>
     </CudaCompile>
-    <CudaCompile Include="x16r\cuda_x16_simd512_80.cu">
-      <Filter>Source Files\CUDA\x16r</Filter>
+    <CudaCompile Include="x16\cuda_x16_simd512_80.cu">
+      <Filter>Source Files\CUDA\x16</Filter>
     </CudaCompile>
-    <CudaCompile Include="x16r\x16r.cu">
-      <Filter>Source Files\CUDA\x16r</Filter>
+    <CudaCompile Include="x16\x16r.cu">
+      <Filter>Source Files\CUDA\x16</Filter>
     </CudaCompile>
-    <CudaCompile Include="x16r\x16s.cu">
-      <Filter>Source Files\CUDA\x16r</Filter>
+    <CudaCompile Include="x16\x16s.cu">
+      <Filter>Source Files\CUDA\x16</Filter>
     </CudaCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/x16r/cuda_x16r.h b/x16/cuda_x16.h
similarity index 100%
rename from x16r/cuda_x16r.h
rename to x16/cuda_x16.h
diff --git a/x16r/cuda_x16_echo512.cu b/x16/cuda_x16_echo512.cu
similarity index 100%
rename from x16r/cuda_x16_echo512.cu
rename to x16/cuda_x16_echo512.cu
diff --git a/x16r/cuda_x16_echo512_64.cu b/x16/cuda_x16_echo512_64.cu
similarity index 100%
rename from x16r/cuda_x16_echo512_64.cu
rename to x16/cuda_x16_echo512_64.cu
diff --git a/x16r/cuda_x16_fugue512.cu b/x16/cuda_x16_fugue512.cu
similarity index 100%
rename from x16r/cuda_x16_fugue512.cu
rename to x16/cuda_x16_fugue512.cu
diff --git a/x16r/cuda_x16_shabal512.cu b/x16/cuda_x16_shabal512.cu
similarity index 100%
rename from x16r/cuda_x16_shabal512.cu
rename to x16/cuda_x16_shabal512.cu
diff --git a/x16r/cuda_x16_simd512_80.cu b/x16/cuda_x16_simd512_80.cu
similarity index 100%
rename from x16r/cuda_x16_simd512_80.cu
rename to x16/cuda_x16_simd512_80.cu
diff --git a/x16r/x16r.cu b/x16/x16r.cu
similarity index 99%
rename from x16r/x16r.cu
rename to x16/x16r.cu
index 3ead3209ab..1319c22d9a 100644
--- a/x16r/x16r.cu
+++ b/x16/x16r.cu
@@ -31,7 +31,7 @@ extern "C" {
 
 #include "miner.h"
 #include "cuda_helper.h"
-#include "cuda_x16r.h"
+#include "cuda_x16.h"
 
 static uint32_t *d_hash[MAX_GPUS];
 
diff --git a/x16r/x16s.cu b/x16/x16s.cu
similarity index 99%
rename from x16r/x16s.cu
rename to x16/x16s.cu
index 0d6c7b26c9..36aeacbc21 100644
--- a/x16r/x16s.cu
+++ b/x16/x16s.cu
@@ -31,7 +31,7 @@ extern "C" {
 
 #include "miner.h"
 #include "cuda_helper.h"
-#include "cuda_x16r.h"
+#include "cuda_x16.h"
 
 static uint32_t *d_hash[MAX_GPUS];