diff --git a/cryptdll.vcxproj.filters b/cryptdll.vcxproj.filters
index 05608922..6eeaa91d 100644
--- a/cryptdll.vcxproj.filters
+++ b/cryptdll.vcxproj.filters
@@ -89,7 +89,7 @@
     <ClCompile Include="gcm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gcm-simd.cpp">
+    <ClCompile Include="gcm_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="gf2n.cpp">
@@ -155,7 +155,7 @@
     <ClCompile Include="rijndael.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="rijndael-simd.cpp">
+    <ClCompile Include="rijndael_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="rng.cpp">
@@ -170,7 +170,7 @@
     <ClCompile Include="sha.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sha-simd.cpp">
+    <ClCompile Include="sha_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="simple.cpp">
@@ -179,7 +179,7 @@
     <ClCompile Include="skipjack.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sse-simd.cpp">
+    <ClCompile Include="sse_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="strciphr.cpp">
diff --git a/cryptest.nmake b/cryptest.nmake
index 1e28576a..50f0ca42 100644
--- a/cryptest.nmake
+++ b/cryptest.nmake
@@ -52,28 +52,28 @@
 
 LIB_SRCS = \
     cryptlib.cpp cpu.cpp integer.cpp 3way.cpp adler32.cpp algebra.cpp \
-    algparam.cpp arc4.cpp aria-simd.cpp aria.cpp ariatab.cpp asn.cpp \
-    authenc.cpp base32.cpp base64.cpp basecode.cpp bfinit.cpp blake2s-simd.cpp \
-    blake2b-simd.cpp blake2.cpp blowfish.cpp blumshub.cpp camellia.cpp cast.cpp casts.cpp \
-    cbcmac.cpp ccm.cpp chacha-avx.cpp chacha-simd.cpp chacha.cpp cham-simd.cpp cham.cpp \
-    channels.cpp cmac.cpp crc-simd.cpp crc.cpp default.cpp des.cpp dessp.cpp dh.cpp \
+    algparam.cpp arc4.cpp aria_simd.cpp aria.cpp ariatab.cpp asn.cpp \
+    authenc.cpp base32.cpp base64.cpp basecode.cpp bfinit.cpp blake2s_simd.cpp \
+    blake2b_simd.cpp blake2.cpp blowfish.cpp blumshub.cpp camellia.cpp cast.cpp casts.cpp \
+    cbcmac.cpp ccm.cpp chacha_avx.cpp chacha_simd.cpp chacha.cpp cham_simd.cpp cham.cpp \
+    channels.cpp cmac.cpp crc_simd.cpp crc.cpp default.cpp des.cpp dessp.cpp dh.cpp \
     dh2.cpp dll.cpp dsa.cpp eax.cpp ec2n.cpp eccrypto.cpp ecp.cpp elgamal.cpp \
     emsa2.cpp eprecomp.cpp esign.cpp files.cpp filters.cpp fips140.cpp \
-    fipstest.cpp gcm-simd.cpp gcm.cpp gf256.cpp gf2_32.cpp gf2n.cpp \
+    fipstest.cpp gcm_simd.cpp gcm.cpp gf256.cpp gf2_32.cpp gf2n.cpp \
     gfpcrypt.cpp gost.cpp gzip.cpp hc128.cpp hc256.cpp hex.cpp hight.cpp \
     hmac.cpp hrtimer.cpp ida.cpp idea.cpp iterhash.cpp kalyna.cpp \
-    kalynatab.cpp keccak.cpp keccakc.cpp lea-simd.cpp lea.cpp luc.cpp \
+    kalynatab.cpp keccak.cpp keccakc.cpp lea_simd.cpp lea.cpp luc.cpp \
     mars.cpp marss.cpp md2.cpp md4.cpp md5.cpp misc.cpp modes.cpp mqueue.cpp \
-    mqv.cpp nbtheory.cpp neon-simd.cpp oaep.cpp osrng.cpp padlkrng.cpp \
-    panama.cpp pkcspad.cpp poly1305.cpp polynomi.cpp ppc-simd.cpp pssr.cpp \
+    mqv.cpp nbtheory.cpp neon_simd.cpp oaep.cpp osrng.cpp padlkrng.cpp \
+    panama.cpp pkcspad.cpp poly1305.cpp polynomi.cpp ppc_simd.cpp pssr.cpp \
     pubkey.cpp queue.cpp rabbit.cpp rabin.cpp randpool.cpp rc2.cpp rc5.cpp \
-    rc6.cpp rdrand.cpp rdtables.cpp rijndael-simd.cpp rijndael.cpp ripemd.cpp \
+    rc6.cpp rdrand.cpp rdtables.cpp rijndael_simd.cpp rijndael.cpp ripemd.cpp \
     rng.cpp rsa.cpp rw.cpp safer.cpp salsa.cpp scrypt.cpp seal.cpp seed.cpp \
-    serpent.cpp sha-simd.cpp sha.cpp sha3.cpp shacal2-simd.cpp shacal2.cpp \
-    shark.cpp sharkbox.cpp simeck-simd.cpp simeck.cpp simon.cpp \
-    simon128-simd.cpp simon64-simd.cpp skipjack.cpp sm3.cpp sm4-simd.cpp \
-    sm4.cpp sosemanuk.cpp speck.cpp speck128-simd.cpp speck64-simd.cpp \
-    square.cpp squaretb.cpp sse-simd.cpp strciphr.cpp tea.cpp tftables.cpp \
+    serpent.cpp sha_simd.cpp sha.cpp sha3.cpp shacal2_simd.cpp shacal2.cpp \
+    shark.cpp sharkbox.cpp simeck_simd.cpp simeck.cpp simon.cpp \
+    simon128_simd.cpp simon64_simd.cpp skipjack.cpp sm3.cpp sm4_simd.cpp \
+    sm4.cpp sosemanuk.cpp speck.cpp speck128_simd.cpp speck64_simd.cpp \
+    square.cpp squaretb.cpp sse_simd.cpp strciphr.cpp tea.cpp tftables.cpp \
     threefish.cpp tiger.cpp tigertab.cpp ttmac.cpp tweetnacl.cpp twofish.cpp \
     vmac.cpp wake.cpp whrlpool.cpp xtr.cpp xtrcrypt.cpp zdeflate.cpp \
     zinflate.cpp zlib.cpp
@@ -194,7 +194,7 @@ LDLIBS = $(LDLIBS) kernel32.lib
 !IF "$(PLATFORM)" == "ARM" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "ARM64" || "$(PLATFORM)" == "arm64"
 # CXXFLAGS = $(CXXFLAGS) /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
 CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
-LIB_SRCS = $(LIB_SRCS) neon-simd.cpp
+LIB_SRCS = $(LIB_SRCS) neon_simd.cpp
 LIB_OBJS = $(LIB_OBJS) neon-simd.obj
 # CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP
 # LDLIBS = $(LDLIBS)
diff --git a/cryptlib.vcxproj.filters b/cryptlib.vcxproj.filters
index 71957da0..0dd63b56 100644
--- a/cryptlib.vcxproj.filters
+++ b/cryptlib.vcxproj.filters
@@ -32,7 +32,7 @@
     <ClCompile Include="aria.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="aria-simd.cpp">
+    <ClCompile Include="aria_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="ariatab.cpp">
@@ -59,10 +59,10 @@
     <ClCompile Include="blake2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="blake2s-simd.cpp">
+    <ClCompile Include="blake2s_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="blake2b-simd.cpp">
+    <ClCompile Include="blake2b_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="blowfish.cpp">
@@ -89,16 +89,16 @@
     <ClCompile Include="chacha.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="chacha-simd.cpp">
+    <ClCompile Include="chacha_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="chacha-avx.cpp">
+    <ClCompile Include="chacha_avx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="cham.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cham-simd.cpp">
+    <ClCompile Include="cham_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="channels.cpp">
@@ -113,7 +113,7 @@
     <ClCompile Include="crc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crc-simd.cpp">
+    <ClCompile Include="crc_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="cryptlib.cpp">
@@ -179,7 +179,7 @@
     <ClCompile Include="gcm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gcm-simd.cpp">
+    <ClCompile Include="gcm_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="gf256.cpp">
@@ -245,7 +245,7 @@
     <ClCompile Include="lea.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="lea-simd.cpp">
+    <ClCompile Include="lea_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="luc.cpp">
@@ -341,7 +341,7 @@
     <ClCompile Include="rijndael.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="rijndael-simd.cpp">
+    <ClCompile Include="rijndael_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="ripemd.cpp">
@@ -377,7 +377,7 @@
     <ClCompile Include="sha.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sha-simd.cpp">
+    <ClCompile Include="sha_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="sha3.cpp">
@@ -386,7 +386,7 @@
     <ClCompile Include="shacal2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="shacal2-simd.cpp">
+    <ClCompile Include="shacal2_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="shark.cpp">
@@ -398,16 +398,16 @@
     <ClCompile Include="simeck.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="simeck-simd.cpp">
+    <ClCompile Include="simeck_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="simon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="simon64-simd.cpp">
+    <ClCompile Include="simon64_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="simon128-simd.cpp">
+    <ClCompile Include="simon128_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="simple.cpp">
@@ -422,16 +422,16 @@
     <ClCompile Include="sm4.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sm4-simd.cpp">
+    <ClCompile Include="sm4_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="speck.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="speck64-simd.cpp">
+    <ClCompile Include="speck64_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="speck128-simd.cpp">
+    <ClCompile Include="speck128_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="sosemanuk.cpp">
@@ -443,7 +443,7 @@
     <ClCompile Include="squaretb.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sse-simd.cpp">
+    <ClCompile Include="sse_simd.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="strciphr.cpp">
@@ -519,7 +519,7 @@
     <ClInclude Include="adler32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="adv-simd.h">
+    <ClInclude Include="adv_simd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="aes.h">