diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index a06c19e6..03294991 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -76,13 +76,13 @@ libsodium_la_SOURCES = \
 	crypto_sign/ed25519/ref10/sign.c \
 	crypto_stream/chacha20/stream_chacha20.c \
 	crypto_stream/chacha20/stream_chacha20.h \
-	crypto_stream/chacha20/ref/stream_chacha20_ref.h \
-	crypto_stream/chacha20/ref/stream_chacha20_ref.c \
+	crypto_stream/chacha20/ref/chacha20_ref.h \
+	crypto_stream/chacha20/ref/chacha20_ref.c \
 	crypto_stream/crypto_stream.c \
 	crypto_stream/salsa20/stream_salsa20.c \
 	crypto_stream/salsa20/stream_salsa20.h \
-	crypto_stream/salsa20/ref/stream_salsa20_ref.c \
-	crypto_stream/salsa20/ref/stream_salsa20_ref.h \
+	crypto_stream/salsa20/ref/salsa20_ref.c \
+	crypto_stream/salsa20/ref/salsa20_ref.h \
 	crypto_stream/xsalsa20/stream_xsalsa20.c \
 	crypto_verify/sodium/verify.c \
 	include/sodium/private/common.h \
@@ -207,8 +207,8 @@ libsse2_la_SOURCES = \
 	crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c \
 	crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c \
 	crypto_onetimeauth/poly1305/sse2/poly1305_sse2.h \
-	crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c \
-	crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.h \
+	crypto_stream/salsa20/xmm6int/salsa20_xmm6int.c \
+	crypto_stream/salsa20/xmm6int/salsa20_xmm6int.h \
 	crypto_stream/salsa20/xmm6int/u0.h \
 	crypto_stream/salsa20/xmm6int/u1.h \
 	crypto_stream/salsa20/xmm6int/u4.h
@@ -221,8 +221,8 @@ libssse3_la_SOURCES = \
 	crypto_generichash/blake2b/ref/blake2b-compress-ssse3.h \
 	crypto_pwhash/argon2/argon2-fill-block-ssse3.c \
 	crypto_pwhash/argon2/blamka-round-ssse3.h \
-	crypto_stream/chacha20/vec/stream_chacha20_vec.h \
-	crypto_stream/chacha20/vec/stream_chacha20_vec.c
+	crypto_stream/chacha20/vec/chacha20_vec.h \
+	crypto_stream/chacha20/vec/chacha20_vec.c
 
 libsse41_la_LDFLAGS = $(libsodium_la_LDFLAGS)
 libsse41_la_CPPFLAGS = $(libsodium_la_CPPFLAGS) \
diff --git a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c b/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c
similarity index 99%
rename from src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
rename to src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c
index afb384f5..65229edf 100644
--- a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
+++ b/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c
@@ -14,7 +14,7 @@
 #include "utils.h"
 
 #include "../stream_chacha20.h"
-#include "stream_chacha20_ref.h"
+#include "chacha20_ref.h"
 
 struct chacha_ctx {
     uint32_t input[16];
diff --git a/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.h b/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.h
similarity index 100%
rename from src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.h
rename to src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.h
diff --git a/src/libsodium/crypto_stream/chacha20/stream_chacha20.c b/src/libsodium/crypto_stream/chacha20/stream_chacha20.c
index 5f65de16..8c678fc4 100644
--- a/src/libsodium/crypto_stream/chacha20/stream_chacha20.c
+++ b/src/libsodium/crypto_stream/chacha20/stream_chacha20.c
@@ -2,9 +2,9 @@
 #include "stream_chacha20.h"
 #include "randombytes.h"
 #include "runtime.h"
-#include "ref/stream_chacha20_ref.h"
+#include "ref/chacha20_ref.h"
 #if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(__GNUC__))
-# include "vec/stream_chacha20_vec.h"
+# include "vec/chacha20_vec.h"
 #endif
 
 static const crypto_stream_chacha20_implementation *implementation =
diff --git a/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c b/src/libsodium/crypto_stream/chacha20/vec/chacha20_vec.c
similarity index 99%
rename from src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c
rename to src/libsodium/crypto_stream/chacha20/vec/chacha20_vec.c
index 734c9b0c..52b6ce64 100644
--- a/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c
+++ b/src/libsodium/crypto_stream/chacha20/vec/chacha20_vec.c
@@ -9,7 +9,7 @@
 #include "utils.h"
 
 #include "../stream_chacha20.h"
-#include "stream_chacha20_vec.h"
+#include "chacha20_vec.h"
 
 #if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && \
      defined(__GNUC__))
diff --git a/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.h b/src/libsodium/crypto_stream/chacha20/vec/chacha20_vec.h
similarity index 100%
rename from src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.h
rename to src/libsodium/crypto_stream/chacha20/vec/chacha20_vec.h
diff --git a/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.c b/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c
similarity index 98%
rename from src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.c
rename to src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c
index 82d3351e..47f3ba29 100644
--- a/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.c
+++ b/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c
@@ -11,7 +11,7 @@ Public domain.
 #include "utils.h"
 
 #include "../stream_salsa20.h"
-#include "stream_salsa20_ref.h"
+#include "salsa20_ref.h"
 
 #if !(defined(HAVE_EMMINTRIN_H) && defined(__x86_64__))
 
diff --git a/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.h b/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.h
similarity index 100%
rename from src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.h
rename to src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.h
diff --git a/src/libsodium/crypto_stream/salsa20/stream_salsa20.c b/src/libsodium/crypto_stream/salsa20/stream_salsa20.c
index fae43f57..a1e7f1b8 100644
--- a/src/libsodium/crypto_stream/salsa20/stream_salsa20.c
+++ b/src/libsodium/crypto_stream/salsa20/stream_salsa20.c
@@ -4,9 +4,9 @@
 #include "runtime.h"
 #include "stream_salsa20.h"
 
-#include "ref/stream_salsa20_ref.h"
+#include "ref/salsa20_ref.h"
 #ifdef HAVE_EMMINTRIN_H
-# include "xmm6int/stream_salsa20_xmm6int.h"
+# include "xmm6int/salsa20_xmm6int.h"
 #endif
 
 #if defined(HAVE_EMMINTRIN_H) && defined(__x86_64__)
diff --git a/src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c b/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int.c
similarity index 98%
rename from src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c
rename to src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int.c
index 3b81e99f..5a34d543 100644
--- a/src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c
+++ b/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int.c
@@ -15,7 +15,7 @@
 # include <emmintrin.h>
 
 # include "../stream_salsa20.h"
-# include "stream_salsa20_xmm6int.h"
+# include "salsa20_xmm6int.h"
 
 # define ROUNDS 20
 
diff --git a/src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.h b/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int.h
similarity index 100%
rename from src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.h
rename to src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int.h