diff --git a/Filelist.txt b/Filelist.txt
index ed09654a..1cbb0869 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -1,12 +1,12 @@
 3way.cpp
 3way.h
 adhoc.cpp.proto
-adv-simd.h
+adv_simd.h
 adler32.cpp
 adler32.h
 aes.h
-aes-armv4.h
-aes-armv4.S
+aes_armv4.h
+aes_armv4.S
 algebra.cpp
 algebra.h
 algparam.cpp
@@ -15,7 +15,7 @@ arc4.cpp
 arc4.h
 ariatab.cpp
 aria.cpp
-aria-simd.cpp
+aria_simd.cpp
 aria.h
 argnames.h
 asn.cpp
@@ -35,8 +35,8 @@ bench2.cpp
 bench3.cpp
 bfinit.cpp
 blake2.cpp
-blake2s-simd.cpp
-blake2b-simd.cpp
+blake2s_simd.cpp
+blake2b_simd.cpp
 blake2.h
 blowfish.cpp
 blowfish.h
@@ -52,11 +52,11 @@ cbcmac.h
 ccm.cpp
 ccm.h
 chacha.cpp
-chacha-avx.cpp
-chacha-simd.cpp
+chacha_avx.cpp
+chacha_simd.cpp
 chacha.h
 cham.cpp
-cham-simd.cpp
+cham_simd.cpp
 cham.h
 channels.cpp
 channels.h
@@ -66,7 +66,7 @@ config.h
 cpu.cpp
 cpu.h
 crc.cpp
-crc-simd.cpp
+crc_simd.cpp
 crc.h
 cryptdll.vcxproj
 cryptdll.vcxproj.filters
@@ -130,7 +130,7 @@ fips140.h
 fipsalgt.cpp
 fipstest.cpp
 fltrimpl.h
-gcm-simd.cpp
+gcm_simd.cpp
 gcm.cpp
 gcm.h
 gf256.cpp
@@ -178,7 +178,7 @@ keccakc.cpp
 keccakc.h
 lubyrack.h
 lea.cpp
-lea-simd.cpp
+lea_simd.cpp
 lea.h
 luc.cpp
 luc.h
@@ -206,7 +206,7 @@ mqv.h
 naclite.h
 nbtheory.cpp
 nbtheory.h
-neon-simd.cpp
+neon_simd.cpp
 nr.h
 oaep.cpp
 oaep.h
@@ -226,8 +226,8 @@ poly1305.cpp
 poly1305.h
 polynomi.cpp
 polynomi.h
-ppc-simd.h
-ppc-simd.cpp
+ppc_simd.h
+ppc_simd.cpp
 pssr.cpp
 pssr.h
 pubkey.cpp
@@ -260,7 +260,7 @@ regtest3.cpp
 regtest4.cpp
 resource.h
 rijndael.cpp
-rijndael-simd.cpp
+rijndael_simd.cpp
 rijndael.h
 ripemd.cpp
 ripemd.h
@@ -286,12 +286,12 @@ serpent.cpp
 serpent.h
 serpentp.h
 sha.cpp
-sha-simd.cpp
+sha_simd.cpp
 sha.h
 sha3.cpp
 sha3.h
 shacal2.cpp
-shacal2-simd.cpp
+shacal2_simd.cpp
 shacal2.h
 shark.cpp
 shark.h
@@ -300,30 +300,30 @@ simple.cpp
 simple.h
 siphash.h
 simeck.cpp
-simeck-simd.cpp
+simeck_simd.cpp
 simeck.h
 simon.cpp
-simon64-simd.cpp
-simon128-simd.cpp
+simon64_simd.cpp
+simon128_simd.cpp
 simon.h
 skipjack.cpp
 skipjack.h
 sm3.cpp
 sm3.h
 sm4.cpp
-sm4-simd.cpp
+sm4_simd.cpp
 sm4.h
 smartptr.h
 sosemanuk.cpp
 sosemanuk.h
 speck.cpp
-speck64-simd.cpp
-speck128-simd.cpp
+speck64_simd.cpp
+speck128_simd.cpp
 speck.h
 square.cpp
 square.h
 squaretb.cpp
-sse-simd.cpp
+sse_simd.cpp
 stdcpp.h
 strciphr.cpp
 strciphr.h
diff --git a/GNUmakefile b/GNUmakefile
index ad9ff18a..b3709610 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -126,7 +126,7 @@ else
   CXXFLAGS ?= -DNDEBUG -g2 -O3
 endif
 
-# On ARM we may compile aes-armv4.S though the CC compiler
+# On ARM we may compile aes_armv4.S though the CC compiler
 ifeq ($(GCC_COMPILER),1)
   CC=gcc
 else ifeq ($(CLANG_COMPILER),1)
@@ -525,7 +525,7 @@ ifneq ($(IS_PPC32)$(IS_PPC64),00)
   endif
 
   # LLVM front-ends only provide Power8. It really jambs us up
-  # for ppc-simd.cpp which needs ALTIVEC/POWER4. We have similar
+  # for ppc_simd.cpp which needs ALTIVEC/POWER4. We have similar
   # problems {lea|cham|simon|speck|...}-simd.cpp and POWER7.
   HAVE_LLVM = $(shell $(CXX) $(CXXFLAGS) -qshowmacros -E pch.cpp 2>&1 | $(GREP) -i -c '__llvm__')
   ifneq ($(HAVE_LLVM),0)
@@ -849,7 +849,7 @@ endif
 ifeq ($(IS_ARM32),1)
 CRYPTOGAMS_AES_FLAG = -march=armv7-a
 CRYPTOGAMS_AES_FLAG += -Wa,--noexecstack
-SRCS += aes-armv4.S
+SRCS += aes_armv4.S
 endif
 
 # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems.
@@ -1199,91 +1199,91 @@ ifeq ($(wildcard GNUmakefile.deps),GNUmakefile.deps)
 endif # Dependencies
 
 # Cryptogams ARM asm implementation.
-aes-armv4.o : aes-armv4.S
+aes_armv4.o : aes_armv4.S
 	$(CC) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_FLAG) -mfloat-abi=$(FP_ABI) -c) $<
 
 # SSSE3 or NEON available
-aria-simd.o : aria-simd.cpp
+aria_simd.o : aria_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(ARIA_FLAG) -c) $<
 
 # SSE, NEON or POWER7 available
-blake2s-simd.o : blake2s-simd.cpp
+blake2s_simd.o : blake2s_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(BLAKE2S_FLAG) -c) $<
 
 # SSE, NEON or POWER8 available
-blake2b-simd.o : blake2b-simd.cpp
+blake2b_simd.o : blake2b_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(BLAKE2B_FLAG) -c) $<
 
 # SSE2 or NEON available
-chacha-simd.o : chacha-simd.cpp
+chacha_simd.o : chacha_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(CHACHA_FLAG) -c) $<
 
 # AVX2 available
-chacha-avx.o : chacha-avx.cpp
+chacha_avx.o : chacha_avx.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(CHACHA_AVX2_FLAG) -c) $<
 
 # SSSE3 available
-cham-simd.o : cham-simd.cpp
+cham_simd.o : cham_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(CHAM_FLAG) -c) $<
 
 # SSE2 on i586
-sse-simd.o : sse-simd.cpp
+sse_simd.o : sse_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SSE_FLAG) -c) $<
 
 # SSE4.2 or ARMv8a available
-crc-simd.o : crc-simd.cpp
+crc_simd.o : crc_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(CRC_FLAG) -c) $<
 
 # PCLMUL or ARMv7a/ARMv8a available
-gcm-simd.o : gcm-simd.cpp
+gcm_simd.o : gcm_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(GCM_FLAG) -c) $<
 
 # SSSE3 available
-lea-simd.o : lea-simd.cpp
+lea_simd.o : lea_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(LEA_FLAG) -c) $<
 
 # NEON available
-neon-simd.o : neon-simd.cpp
+neon_simd.o : neon_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(NEON_FLAG) -c) $<
 
 # AltiVec, Power7, Power8 available
-ppc-simd.o : ppc-simd.cpp
+ppc_simd.o : ppc_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(ALTIVEC_FLAG) -c) $<
 
 # AESNI or ARMv7a/ARMv8a available
-rijndael-simd.o : rijndael-simd.cpp
+rijndael_simd.o : rijndael_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(AES_FLAG) -c) $<
 
 # SSE4.2/SHA-NI or ARMv8a available
-sha-simd.o : sha-simd.cpp
+sha_simd.o : sha_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SHA_FLAG) -c) $<
 
 # SSE4.2/SHA-NI or ARMv8a available
-shacal2-simd.o : shacal2-simd.cpp
+shacal2_simd.o : shacal2_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SHA_FLAG) -c) $<
 
 # SSSE3 or NEON available
-simeck-simd.o : simeck-simd.cpp
+simeck_simd.o : simeck_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SIMECK_FLAG) -c) $<
 
 # SSE4.1, NEON or POWER7 available
-simon64-simd.o : simon64-simd.cpp
+simon64_simd.o : simon64_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SIMON64_FLAG) -c) $<
 
 # SSSE3, NEON or POWER8 available
-simon128-simd.o : simon128-simd.cpp
+simon128_simd.o : simon128_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SIMON128_FLAG) -c) $<
 
 # SSE4.1, NEON or POWER7 available
-speck64-simd.o : speck64-simd.cpp
+speck64_simd.o : speck64_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SPECK64_FLAG) -c) $<
 
 # SSSE3, NEON or POWER8 available
-speck128-simd.o : speck128-simd.cpp
+speck128_simd.o : speck128_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SPECK128_FLAG) -c) $<
 
 # AESNI available
-sm4-simd.o : sm4-simd.cpp
+sm4_simd.o : sm4_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SM4_FLAG) -c) $<
 
 # IBM XLC -O3 optimization bug
diff --git a/GNUmakefile-cross b/GNUmakefile-cross
index 72477831..8ebb251b 100755
--- a/GNUmakefile-cross
+++ b/GNUmakefile-cross
@@ -374,7 +374,7 @@ INCL := $(filter-out resource.h,$(sort $(wildcard *.h)))
 ifeq ($(IS_ARM32),1)
 CRYPTOGAMS_AES_FLAG = -march=armv7-a
 CRYPTOGAMS_AES_FLAG += -Wa,--noexecstack
-SRCS += aes-armv4.S
+SRCS += aes_armv4.S
 endif
 
 # List cryptlib.cpp first, then cpu.cpp, then integer.cpp to tame C++ static initialization problems.
@@ -568,23 +568,23 @@ cpu-features.o: cpu-features.h cpu-features.c
 	$(CXX) $(strip $(CXXFLAGS) -fpermissive -c) cpu-features.c
 
 # Cryptogams ARM asm implementation.
-aes-armv4.o : aes-armv4.S
+aes_armv4.o : aes_armv4.S
 	$(CXX) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_FLAG) -c) $<
 
 # SSE4.2 or NEON available
-aria-simd.o : aria-simd.cpp
+aria_simd.o : aria_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(ARIA_FLAG) -c) $<
 
 # SSE4.2 or ARMv8a available
-blake2-simd.o : blake2-simd.cpp
+blake2_simd.o : blake2-simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(BLAKE2_FLAG) -c) $<
 
 # SSE2 or NEON available
-chacha-simd.o : chacha-simd.cpp
+chacha_simd.o : chacha_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(CHACHA_FLAG) -c) $<
 
 # SSSE3 available
-cham-simd.o : cham-simd.cpp
+cham_simd.o : cham_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(CHAM_FLAG) -c) $<
 
 # SSE2 on i586
@@ -592,55 +592,55 @@ cpu.o : cpu.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(CPU_FLAG) -c) $<
 
 # SSE4.2 or ARMv8a available
-crc-simd.o : crc-simd.cpp
+crc_simd.o : crc_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(CRC_FLAG) -c) $<
 
 # PCLMUL or ARMv7a/ARMv8a available
-gcm-simd.o : gcm-simd.cpp
+gcm_simd.o : gcm_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(GCM_FLAG) -c) $<
 
 # SSSE3 or ARMv8a available
-lea-simd.o : lea-simd.cpp
+lea_simd.o : lea_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(LEA_FLAG) -c) $<
 
 # NEON available
-neon-simd.o : neon-simd.cpp
+neon_simd.o : neon_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(NEON_FLAG) -c) $<
 
 # AESNI or ARMv7a/ARMv8a available
-rijndael-simd.o : rijndael-simd.cpp
+rijndael_simd.o : rijndael_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(AES_FLAG) -c) $<
 
 # SSE4.2/SHA-NI or ARMv8a available
-sha-simd.o : sha-simd.cpp
+sha_simd.o : sha_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SHA_FLAG) -c) $<
 
 # SSE4.2/SHA-NI or ARMv8a available
-shacal2-simd.o : shacal2-simd.cpp
+shacal2_simd.o : shacal2_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SHA_FLAG) -c) $<
 
 # SSSE3 or NEON available
-simeck-simd.o : simeck-simd.cpp
+simeck_simd.o : simeck_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SIMECK_FLAG) -c) $<
 
 # SSE4.1, NEON or POWER7 available
-simon64-simd.o : simon64-simd.cpp
+simon64_simd.o : simon64_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SIMON64_FLAG) -c) $<
 
 # SSSE3, NEON or POWER8 available
-simon128-simd.o : simon128-simd.cpp
+simon128_simd.o : simon128_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SIMON128_FLAG) -c) $<
 
 # SSE4.1, NEON or POWER7 available
-speck64-simd.o : speck64-simd.cpp
+speck64_simd.o : speck64_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SPECK64_FLAG) -c) $<
 
 # SSSE3, NEON or POWER8 available
-speck128-simd.o : speck128-simd.cpp
+speck128_simd.o : speck128_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SPECK128_FLAG) -c) $<
 
 # AESNI available
-sm4-simd.o : sm4-simd.cpp
+sm4_simd.o : sm4_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(SM4_FLAG) -c) $<
 
 %.o : %.cpp
diff --git a/adv-simd.h b/adv_simd.h
similarity index 97%
rename from adv-simd.h
rename to adv_simd.h
index df109ebe..76954e99 100644
--- a/adv-simd.h
+++ b/adv_simd.h
@@ -1,13 +1,13 @@
-// adv-simd.h - written and placed in the public domain by Jeffrey Walton
+// adv_simd.h - written and placed in the public domain by Jeffrey Walton
 
-/// \file adv-simd.h
+/// \file adv_simd.h
 /// \brief Template for AdvancedProcessBlocks and SIMD processing
 
 //    The SIMD based implementations for ciphers that use SSE, NEON and Power7
 //    have a commom pattern. Namely, they have a specialized implementation of
 //    AdvancedProcessBlocks which processes multiple block using hardware
 //    acceleration. After several implementations we noticed a lot of copy and
-//    paste occuring. adv-simd.h provides a template to avoid the copy and paste.
+//    paste occuring. adv_simd.h provides a template to avoid the copy and paste.
 //
 //    There are 11 templates provided in this file. The number following the
 //    function name, 64 or 128, is the block size. The name following the block
@@ -71,7 +71,7 @@
 #endif
 
 #if defined(CRYPTOPP_ALTIVEC_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 // ************************ All block ciphers *********************** //
diff --git a/aes-armv4.S b/aes_armv4.S
similarity index 100%
rename from aes-armv4.S
rename to aes_armv4.S
diff --git a/aes-armv4.h b/aes_armv4.h
similarity index 100%
rename from aes-armv4.h
rename to aes_armv4.h
diff --git a/aria-simd.cpp b/aria_simd.cpp
similarity index 95%
rename from aria-simd.cpp
rename to aria_simd.cpp
index 9c741d7e..536cfb84 100644
--- a/aria-simd.cpp
+++ b/aria_simd.cpp
@@ -1,4 +1,4 @@
-// aria-simd.cpp - written and placed in the public domain by
+// aria_simd.cpp - written and placed in the public domain by
 //                 Jeffrey Walton, Uri Blumenthal and Marcel Raad.
 //
 //    This source file uses intrinsics to gain access to ARMv7a and
diff --git a/blake2b-simd.cpp b/blake2b_simd.cpp
similarity index 97%
rename from blake2b-simd.cpp
rename to blake2b_simd.cpp
index 62a1f4e4..853a4cb5 100644
--- a/blake2b-simd.cpp
+++ b/blake2b_simd.cpp
@@ -42,7 +42,7 @@
 #endif
 
 #if (CRYPTOPP_POWER8_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/blake2s-simd.cpp b/blake2s_simd.cpp
similarity index 97%
rename from blake2s-simd.cpp
rename to blake2s_simd.cpp
index 419ac413..1cd21d30 100644
--- a/blake2s-simd.cpp
+++ b/blake2s_simd.cpp
@@ -42,7 +42,7 @@
 #endif
 
 #if (CRYPTOPP_POWER7_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 NAMESPACE_BEGIN(CryptoPP)
diff --git a/chacha-avx.cpp b/chacha_avx.cpp
similarity index 97%
rename from chacha-avx.cpp
rename to chacha_avx.cpp
index 9ee6934e..fd9d42e5 100644
--- a/chacha-avx.cpp
+++ b/chacha_avx.cpp
@@ -1,4 +1,4 @@
-// chacha-avx.cpp - written and placed in the public domain by
+// chacha_avx.cpp - written and placed in the public domain by
 //                  Jack Lloyd and Jeffrey Walton
 //
 //    This source file uses intrinsics and built-ins to gain access to
diff --git a/chacha-simd.cpp b/chacha_simd.cpp
similarity index 96%
rename from chacha-simd.cpp
rename to chacha_simd.cpp
index f30ecb27..6e619281 100644
--- a/chacha-simd.cpp
+++ b/chacha_simd.cpp
@@ -1,4 +1,4 @@
-// chacha-simd.cpp - written and placed in the public domain by
+// chacha_simd.cpp - written and placed in the public domain by
 //                   Jack Lloyd and Jeffrey Walton
 //
 //    This source file uses intrinsics and built-ins to gain access to
@@ -55,7 +55,7 @@
 #endif
 
 #if defined(CRYPTOPP_POWER8_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 // Squash MS LNK4221 and libtool warnings
diff --git a/cham-simd.cpp b/cham_simd.cpp
similarity index 97%
rename from cham-simd.cpp
rename to cham_simd.cpp
index a6e1018f..b56e6d76 100644
--- a/cham-simd.cpp
+++ b/cham_simd.cpp
@@ -1,4 +1,4 @@
-// cham-simd.cpp - written and placed in the public domain by Jeffrey Walton
+// cham_simd.cpp - written and placed in the public domain by Jeffrey Walton
 //
 //    This source file uses intrinsics and built-ins to gain access to
 //    SSSE3, ARM NEON and ARMv8a, and Power7 Altivec instructions. A separate
@@ -10,7 +10,7 @@
 
 #include "cham.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE or NEON.
 // Do so in both simon.cpp and simon-simd.cpp.
diff --git a/config.h b/config.h
index c4748136..91a9db47 100644
--- a/config.h
+++ b/config.h
@@ -758,7 +758,7 @@ NAMESPACE_END
 // not provide an asm implementation. The Cryptogams implementation
 // is about 2x faster than C/C++. Define this to use the Cryptogams
 // AES implementation on GNU Linux systems. When defined, Crypto++
-// will use aes-armv4.S. LLVM miscompiles aes-armv4.S so disable
+// will use aes_armv4.S. LLVM miscompiles aes_armv4.S so disable
 // under Clang. See https://bugs.llvm.org/show_bug.cgi?id=38133.
 #if !defined(CRYPTOPP_DISABLE_ASM) && defined(__arm__)
 # if defined(__GNUC__) && !defined(__clang__)
diff --git a/cpu.h b/cpu.h
index 8f2f3850..648c859f 100644
--- a/cpu.h
+++ b/cpu.h
@@ -18,8 +18,8 @@
 /// </pre>
 /// \details Generally speaking, CPU_Query() is in the source file <tt>cpu.cpp</tt> because it
 ///   does not require special architectural flags. CPU_Probe() is in a source file that recieves
-///   architectural flags, like <tt>sse-simd.cpp</tt>, <tt>neon-simd.cpp</tt> and
-///   <tt>ppc-simd.cpp</tt>. For example, compiling <tt>neon-simd.cpp</tt> on an ARM64 machine will
+///   architectural flags, like <tt>sse_simd.cpp</tt>, <tt>neon_simd.cpp</tt> and
+///   <tt>ppc_simd.cpp</tt>. For example, compiling <tt>neon_simd.cpp</tt> on an ARM64 machine will
 ///   have <tt>-march=armv8-a</tt> applied during a compile to make the instruction set architecture
 ///   (ISA) available.
 /// \details The cpu probes are expensive when compared to a standard OS feature query. The library
diff --git a/crc.cpp b/crc.cpp
index 854886c2..20addce6 100644
--- a/crc.cpp
+++ b/crc.cpp
@@ -8,13 +8,13 @@
 
 NAMESPACE_BEGIN(CryptoPP)
 
-// crc-simd.cpp
+// crc_simd.cpp
 #if (CRYPTOPP_ARM_CRC32_AVAILABLE)
 extern void CRC32_Update_ARMV8(const byte *s, size_t n, word32& c);
 extern void CRC32C_Update_ARMV8(const byte *s, size_t n, word32& c);
 #endif
 
-// crc-simd.cpp
+// crc_simd.cpp
 #if (CRYPTOPP_SSE42_AVAILABLE)
 extern void CRC32C_Update_SSE42(const byte *s, size_t n, word32& c);
 #endif
diff --git a/crc-simd.cpp b/crc_simd.cpp
similarity index 94%
rename from crc-simd.cpp
rename to crc_simd.cpp
index 0de26514..84a4a081 100644
--- a/crc-simd.cpp
+++ b/crc_simd.cpp
@@ -1,4 +1,4 @@
-// crc-simd.cpp - written and placed in the public domain by
+// crc_simd.cpp - written and placed in the public domain by
 //                Jeffrey Walton, Uri Blumenthal and Marcel Raad.
 //
 //    This source file uses intrinsics to gain access to SSE4.2 and
diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj
index 971cbb79..88360ed5 100644
--- a/cryptdll.vcxproj
+++ b/cryptdll.vcxproj
@@ -210,7 +210,7 @@
     <ClCompile Include="fips140.cpp" />
     <ClCompile Include="fipstest.cpp" />
     <ClCompile Include="gcm.cpp" />
-    <ClCompile Include="gcm-simd.cpp" />
+    <ClCompile Include="gcm_simd.cpp" />
     <ClCompile Include="gf2n.cpp" />
     <ClCompile Include="gfpcrypt.cpp" />
     <ClCompile Include="hex.cpp" />
@@ -230,15 +230,15 @@
     <ClCompile Include="randpool.cpp" />
     <ClCompile Include="rdtables.cpp" />
     <ClCompile Include="rijndael.cpp" />
-    <ClCompile Include="rijndael-simd.cpp" />
+    <ClCompile Include="rijndael_simd.cpp" />
     <ClCompile Include="rng.cpp" />
     <ClCompile Include="rsa.cpp" />
     <ClCompile Include="rw.cpp" />
     <ClCompile Include="sha.cpp" />
-    <ClCompile Include="sha-simd.cpp" />
+    <ClCompile Include="sha_simd.cpp" />
     <ClCompile Include="simple.cpp" />
     <ClCompile Include="skipjack.cpp" />
-    <ClCompile Include="sse-simd.cpp" />
+    <ClCompile Include="sse_simd.cpp" />
     <ClCompile Include="strciphr.cpp" />
   </ItemGroup>
   <!-- Header Files -->
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj
index f28fd431..1126d7b4 100644
--- a/cryptlib.vcxproj
+++ b/cryptlib.vcxproj
@@ -173,7 +173,7 @@
     <ClCompile Include="algparam.cpp" />
     <ClCompile Include="arc4.cpp" />
     <ClCompile Include="aria.cpp" />
-    <ClCompile Include="aria-simd.cpp" />
+    <ClCompile Include="aria_simd.cpp" />
     <ClCompile Include="ariatab.cpp" />
     <ClCompile Include="asn.cpp" />
     <ClCompile Include="authenc.cpp" />
@@ -182,8 +182,8 @@
     <ClCompile Include="basecode.cpp" />
     <ClCompile Include="bfinit.cpp" />
     <ClCompile Include="blake2.cpp" />
-    <ClCompile Include="blake2s-simd.cpp" />
-    <ClCompile Include="blake2b-simd.cpp" />
+    <ClCompile Include="blake2s_simd.cpp" />
+    <ClCompile Include="blake2b_simd.cpp" />
     <ClCompile Include="blowfish.cpp" />
     <ClCompile Include="blumshub.cpp" />
     <ClCompile Include="camellia.cpp" />
@@ -192,17 +192,17 @@
     <ClCompile Include="cbcmac.cpp" />
     <ClCompile Include="ccm.cpp" />
     <ClCompile Include="chacha.cpp" />
-    <ClCompile Include="chacha-simd.cpp" />
-    <ClCompile Include="chacha-avx.cpp">
+    <ClCompile Include="chacha_simd.cpp" />
+    <ClCompile Include="chacha_avx.cpp">
       <!-- Requires Visual Studio 2013 and above -->
       <ExcludedFromBuild Condition=" '$(PlatformToolset)' == 'v100' Or '$(PlatformToolset)' == 'v110' ">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="cham.cpp" />
-    <ClCompile Include="cham-simd.cpp" />
+    <ClCompile Include="cham_simd.cpp" />
     <ClCompile Include="channels.cpp" />
     <ClCompile Include="cmac.cpp" />
     <ClCompile Include="crc.cpp" />
-    <ClCompile Include="crc-simd.cpp" />
+    <ClCompile Include="crc_simd.cpp" />
     <ClCompile Include="default.cpp" />
     <ClCompile Include="des.cpp" />
     <ClCompile Include="dessp.cpp" />
@@ -229,7 +229,7 @@
     <ClCompile Include="fips140.cpp" />
     <ClCompile Include="fipstest.cpp" />
     <ClCompile Include="gcm.cpp" />
-    <ClCompile Include="gcm-simd.cpp" />
+    <ClCompile Include="gcm_simd.cpp" />
     <ClCompile Include="gf256.cpp" />
     <ClCompile Include="gf2_32.cpp" />
     <ClCompile Include="gf2n.cpp" />
@@ -252,7 +252,7 @@
     <ClCompile Include="keccak.cpp" />
     <ClCompile Include="keccakc.cpp" />
     <ClCompile Include="lea.cpp" />
-    <ClCompile Include="lea-simd.cpp" />
+    <ClCompile Include="lea_simd.cpp" />
     <ClCompile Include="luc.cpp" />
     <ClCompile Include="mars.cpp" />
     <ClCompile Include="marss.cpp" />
@@ -286,7 +286,7 @@
     <ClCompile Include="rdrand.cpp" />
     <ClCompile Include="rdtables.cpp" />
     <ClCompile Include="rijndael.cpp" />
-    <ClCompile Include="rijndael-simd.cpp" />
+    <ClCompile Include="rijndael_simd.cpp" />
     <ClCompile Include="ripemd.cpp" />
     <ClCompile Include="rng.cpp" />
     <ClCompile Include="rsa.cpp" />
@@ -298,29 +298,29 @@
     <ClCompile Include="seed.cpp" />
     <ClCompile Include="serpent.cpp" />
     <ClCompile Include="sha.cpp" />
-    <ClCompile Include="sha-simd.cpp" />
+    <ClCompile Include="sha_simd.cpp" />
     <ClCompile Include="sha3.cpp" />
     <ClCompile Include="shacal2.cpp" />
-    <ClCompile Include="shacal2-simd.cpp" />
+    <ClCompile Include="shacal2_simd.cpp" />
     <ClCompile Include="shark.cpp" />
     <ClCompile Include="sharkbox.cpp" />
     <ClCompile Include="simeck.cpp" />
-    <ClCompile Include="simeck-simd.cpp" />
+    <ClCompile Include="simeck_simd.cpp" />
     <ClCompile Include="simon.cpp" />
-    <ClCompile Include="simon64-simd.cpp" />
-    <ClCompile Include="simon128-simd.cpp" />
+    <ClCompile Include="simon64_simd.cpp" />
+    <ClCompile Include="simon128_simd.cpp" />
     <ClCompile Include="simple.cpp" />
     <ClCompile Include="skipjack.cpp" />
     <ClCompile Include="sm3.cpp" />
     <ClCompile Include="sm4.cpp" />
-    <ClCompile Include="sm4-simd.cpp" />
+    <ClCompile Include="sm4_simd.cpp" />
     <ClCompile Include="sosemanuk.cpp" />
     <ClCompile Include="speck.cpp" />
-    <ClCompile Include="speck64-simd.cpp" />
-    <ClCompile Include="speck128-simd.cpp" />
+    <ClCompile Include="speck64_simd.cpp" />
+    <ClCompile Include="speck128_simd.cpp" />
     <ClCompile Include="square.cpp" />
     <ClCompile Include="squaretb.cpp" />
-    <ClCompile Include="sse-simd.cpp" />
+    <ClCompile Include="sse_simd.cpp" />
     <ClCompile Include="strciphr.cpp" />
     <ClCompile Include="tea.cpp" />
     <ClCompile Include="tftables.cpp" />
@@ -377,7 +377,7 @@
   <ItemGroup>
     <ClInclude Include="3way.h" />
     <ClInclude Include="adler32.h" />
-    <ClInclude Include="adv-simd.h" />
+    <ClInclude Include="adv_simd.h" />
     <ClInclude Include="aes.h" />
     <ClInclude Include="algebra.h" />
     <ClInclude Include="algparam.h" />
diff --git a/gcm-simd.cpp b/gcm_simd.cpp
similarity index 96%
rename from gcm-simd.cpp
rename to gcm_simd.cpp
index 16ab1a43..92647cfb 100644
--- a/gcm-simd.cpp
+++ b/gcm_simd.cpp
@@ -1,4 +1,4 @@
-// gcm-simd.cpp - written and placed in the public domain by
+// gcm_simd.cpp - written and placed in the public domain by
 //                Jeffrey Walton, Uri Blumenthal and Marcel Raad.
 //                Original x86 CLMUL by Wei Dai. ARM and POWER8
 //                PMULL and VMULL by JW, UB and MR.
@@ -39,7 +39,7 @@
 #endif
 
 #if defined(CRYPTOPP_ALTIVEC_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY
@@ -186,7 +186,7 @@ using CryptoPP::VectorRotateLeft;
 // algorithm on both big and little-endian systems, but it is
 // awful to try to follow the logic because it is so backwards.
 // Because functions like VMULL_NN are so backwards we can't put
-// them in ppc-simd.h. They simply don't work the way a typical
+// them in ppc_simd.h. They simply don't work the way a typical
 // user expects them to work.
 
 inline uint64x2_p VMULL2LE(const uint64x2_p& val)
diff --git a/lea-simd.cpp b/lea_simd.cpp
similarity index 97%
rename from lea-simd.cpp
rename to lea_simd.cpp
index e8af1ded..245407bf 100644
--- a/lea-simd.cpp
+++ b/lea_simd.cpp
@@ -1,4 +1,4 @@
-// lea-simd.cpp - written and placed in the public domain by Jeffrey Walton
+// lea_simd.cpp - written and placed in the public domain by Jeffrey Walton
 //
 //    This source file uses intrinsics and built-ins to gain access to
 //    SSSE3, ARM NEON and ARMv8a, and Power8 Altivec instructions. A separate
@@ -10,7 +10,7 @@
 
 #include "lea.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE or NEON.
 // Do so in both simon.cpp and simon-simd.cpp.
@@ -58,7 +58,7 @@
 
 #undef CRYPTOPP_POWER8_AVAILABLE
 #if defined(CRYPTOPP_POWER8_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 // Squash MS LNK4221 and libtool warnings
diff --git a/modes.h b/modes.h
index 67d8dc1a..425645a2 100644
--- a/modes.h
+++ b/modes.h
@@ -242,7 +242,7 @@ protected:
 	void CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length);
 	void SeekToIteration(lword iterationCount);
 
-	// adv-simd.h increments the counter
+	// adv_simd.h increments the counter
 	mutable SecByteBlock m_counterArray;
 };
 
diff --git a/neon-simd.cpp b/neon_simd.cpp
similarity index 94%
rename from neon-simd.cpp
rename to neon_simd.cpp
index a9690980..1a77260b 100644
--- a/neon-simd.cpp
+++ b/neon_simd.cpp
@@ -1,5 +1,5 @@
 
-// crc-simd.cpp - written and placed in the public domain by
+// crc_simd.cpp - written and placed in the public domain by
 //                Jeffrey Walton, Uri Blumenthal and Marcel Raad.
 //
 //    This source file uses intrinsics to gain access to ARMv7a and
diff --git a/ppc-simd.cpp b/ppc_simd.cpp
similarity index 93%
rename from ppc-simd.cpp
rename to ppc_simd.cpp
index dd4f5c95..99616c4f 100644
--- a/ppc-simd.cpp
+++ b/ppc_simd.cpp
@@ -1,4 +1,4 @@
-// ppc-simd.cpp - written and placed in the public domain by
+// ppc_simd.cpp - written and placed in the public domain by
 //                Jeffrey Walton, Uri Blumenthal and Marcel Raad.
 //
 //    This source file uses intrinsics to gain access to AltiVec,
@@ -11,7 +11,7 @@
 #include "stdcpp.h"
 
 #if defined(CRYPTOPP_ALTIVEC_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY
diff --git a/ppc-simd.h b/ppc_simd.h
similarity index 96%
rename from ppc-simd.h
rename to ppc_simd.h
index 2bbf35b7..1efd2030 100644
--- a/ppc-simd.h
+++ b/ppc_simd.h
@@ -1,6 +1,6 @@
-// ppc-simd.h - written and placed in public domain by Jeffrey Walton
+// ppc_simd.h - written and placed in public domain by Jeffrey Walton
 
-/// \file ppc-simd.h
+/// \file ppc_simd.h
 /// \brief Support functions for PowerPC and vector operations
 /// \details This header provides an agnostic interface into GCC and
 ///   IBM XL C/C++ compilers modulo their different built-in functions
diff --git a/rijndael.cpp b/rijndael.cpp
index 3cc0a46b..213c0a5d 100644
--- a/rijndael.cpp
+++ b/rijndael.cpp
@@ -6,7 +6,7 @@
 
 /*
 July 2018: Added support for ARMv7 AES instructions via Cryptogams ASM.
-           See the head notes in aes-armv4.S for copyright and license.
+           See the head notes in aes_armv4.S for copyright and license.
 */
 
 /*
diff --git a/rijndael-simd.cpp b/rijndael_simd.cpp
similarity index 96%
rename from rijndael-simd.cpp
rename to rijndael_simd.cpp
index aa21cf6c..3d122d70 100644
--- a/rijndael-simd.cpp
+++ b/rijndael_simd.cpp
@@ -1,4 +1,4 @@
-// rijndael-simd.cpp - written and placed in the public domain by
+// rijndael_simd.cpp - written and placed in the public domain by
 //                     Jeffrey Walton, Uri Blumenthal and Marcel Raad.
 //                     AES-NI code originally written by Wei Dai.
 //
@@ -23,7 +23,7 @@
 #include "pch.h"
 #include "config.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 #if (CRYPTOPP_AESNI_AVAILABLE)
 # include <smmintrin.h>
@@ -40,7 +40,7 @@
 #endif
 
 #if defined(CRYPTOPP_POWER8_AES_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY
diff --git a/sha.cpp b/sha.cpp
index 78f0ab5b..aa54af20 100644
--- a/sha.cpp
+++ b/sha.cpp
@@ -73,7 +73,7 @@ extern void SHA256_HashMultipleBlocks_POWER8(word32 *state, const word32 *data,
 extern void SHA512_HashMultipleBlocks_POWER8(word64 *state, const word64 *data, size_t length, ByteOrder order);
 #endif
 
-// We add extern to export table to sha-simd.cpp, but it
+// We add extern to export table to sha_simd.cpp, but it
 //  cleared http://github.com/weidai11/cryptopp/issues/502
 extern const word32 SHA256_K[64];
 extern const word64 SHA512_K[80];
diff --git a/sha-simd.cpp b/sha_simd.cpp
similarity index 96%
rename from sha-simd.cpp
rename to sha_simd.cpp
index e9b8f7d8..bb903c9d 100644
--- a/sha-simd.cpp
+++ b/sha_simd.cpp
@@ -1,4 +1,4 @@
-// sha-simd.cpp - written and placed in the public domain by
+// sha_simd.cpp - written and placed in the public domain by
 //                Jeffrey Walton, Uri Blumenthal and Marcel Raad.
 //
 //    This source file uses intrinsics to gain access to SHA-NI and
@@ -33,7 +33,7 @@
 #endif
 
 #if CRYPTOPP_POWER8_SHA_AVAILABLE
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY
diff --git a/shacal2-simd.cpp b/shacal2_simd.cpp
similarity index 100%
rename from shacal2-simd.cpp
rename to shacal2_simd.cpp
diff --git a/simeck-simd.cpp b/simeck_simd.cpp
similarity index 96%
rename from simeck-simd.cpp
rename to simeck_simd.cpp
index 099b8731..abb4ffbd 100644
--- a/simeck-simd.cpp
+++ b/simeck_simd.cpp
@@ -1,4 +1,4 @@
-// simeck-simd.cpp - written and placed in the public domain by Gangqiang Yang and Jeffrey Walton.
+// simeck_simd.cpp - written and placed in the public domain by Gangqiang Yang and Jeffrey Walton.
 //
 //    This source file uses intrinsics and built-ins to gain access to
 //    SSSE3, ARM NEON and ARMv8a, and Power7 Altivec instructions. A separate
@@ -10,7 +10,7 @@
 
 #include "simeck.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE or NEON.
 // Do so in both simon.cpp and simon-simd.cpp.
diff --git a/simon128-simd.cpp b/simon128_simd.cpp
similarity index 97%
rename from simon128-simd.cpp
rename to simon128_simd.cpp
index 21af1d40..cd8a00c5 100644
--- a/simon128-simd.cpp
+++ b/simon128_simd.cpp
@@ -10,7 +10,7 @@
 
 #include "simon.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE or NEON.
 // Do so in both simon.cpp and simon-simd.cpp.
@@ -43,7 +43,7 @@
 #endif
 
 #if defined(CRYPTOPP_POWER7_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 // Squash MS LNK4221 and libtool warnings
diff --git a/simon64-simd.cpp b/simon64_simd.cpp
similarity index 97%
rename from simon64-simd.cpp
rename to simon64_simd.cpp
index 726d74a3..eecc5409 100644
--- a/simon64-simd.cpp
+++ b/simon64_simd.cpp
@@ -10,7 +10,7 @@
 
 #include "simon.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE or NEON.
 // Do so in both simon.cpp and simon-simd.cpp.
@@ -47,7 +47,7 @@
 #endif
 
 #if defined(CRYPTOPP_POWER7_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 // Squash MS LNK4221 and libtool warnings
diff --git a/sm4-simd.cpp b/sm4_simd.cpp
similarity index 96%
rename from sm4-simd.cpp
rename to sm4_simd.cpp
index bc18e766..3b71c726 100644
--- a/sm4-simd.cpp
+++ b/sm4_simd.cpp
@@ -1,4 +1,4 @@
-// sm4-simd.cpp - written and placed in the public domain by
+// sm4_simd.cpp - written and placed in the public domain by
 //                Markku-Juhani O. Saarinen and Jeffrey Walton
 //
 //    This source file uses intrinsics and built-ins to gain access to
@@ -15,7 +15,7 @@
 
 #include "sm4.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE.
 // Do so in both simon.cpp and simon-simd.cpp.
diff --git a/speck128-simd.cpp b/speck128_simd.cpp
similarity index 96%
rename from speck128-simd.cpp
rename to speck128_simd.cpp
index abb856a0..75e2c48f 100644
--- a/speck128-simd.cpp
+++ b/speck128_simd.cpp
@@ -10,7 +10,7 @@
 
 #include "speck.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE or NEON.
 // Do so in both speck.cpp and speck-simd.cpp.
@@ -43,7 +43,7 @@
 #endif
 
 #if defined(CRYPTOPP_POWER7_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 // Squash MS LNK4221 and libtool warnings
diff --git a/speck64-simd.cpp b/speck64_simd.cpp
similarity index 96%
rename from speck64-simd.cpp
rename to speck64_simd.cpp
index fe970679..15019ddc 100644
--- a/speck64-simd.cpp
+++ b/speck64_simd.cpp
@@ -10,7 +10,7 @@
 
 #include "speck.h"
 #include "misc.h"
-#include "adv-simd.h"
+#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE or NEON.
 // Do so in both speck.cpp and speck-simd.cpp.
@@ -47,7 +47,7 @@
 #endif
 
 #if defined(CRYPTOPP_POWER7_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 // Squash MS LNK4221 and libtool warnings
diff --git a/sse-simd.cpp b/sse_simd.cpp
similarity index 94%
rename from sse-simd.cpp
rename to sse_simd.cpp
index af07048e..09484fa0 100644
--- a/sse-simd.cpp
+++ b/sse_simd.cpp
@@ -1,4 +1,4 @@
-// sse-simd.cpp - written and placed in the public domain by
+// sse_simd.cpp - written and placed in the public domain by
 //                Jeffrey Walton, Uri Blumenthal and Marcel Raad.
 //
 //    This source file uses intrinsics to gain access to SSE for CPU
diff --git a/validat1.cpp b/validat1.cpp
index d7b4ae19..2226a344 100644
--- a/validat1.cpp
+++ b/validat1.cpp
@@ -15,7 +15,7 @@
 #include "zlib.h"
 
 #if defined(CRYPTOPP_ALTIVEC_AVAILABLE)
-# include "ppc-simd.h"
+# include "ppc_simd.h"
 #endif
 
 #include <iostream>