diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index de51ba83..102a617e 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -73,8 +73,8 @@ libsodium_la_SOURCES = \
 	crypto_sign/ed25519/ref/sc25519.h \
 	crypto_sign/ed25519/ref/sc25519_ed25519.c \
 	randombytes/randombytes.c \
-	randombytes/salsa20_random.c \
-	randombytes/salsa20_random.h \
+	randombytes/randombytes_salsa20_random.c \
+	randombytes/randombytes_salsa20_random.h \
 	version.c
 
 EXTRA_DIST = \
diff --git a/src/libsodium/include/Makefile.am b/src/libsodium/include/Makefile.am
index 84ae0b17..c6598fbb 100644
--- a/src/libsodium/include/Makefile.am
+++ b/src/libsodium/include/Makefile.am
@@ -36,7 +36,7 @@ SODIUM_EXPORT = \
 	sodium/crypto_verify_16.h \
 	sodium/crypto_verify_32.h \
 	sodium/randombytes.h \
-	sodium/salsa20_random.h \
+	sodium/randombytes_salsa20_random.h \
 	sodium/version.h
 
 EXTRA_SRC = $(SODIUM_EXPORT) \
diff --git a/src/libsodium/include/sodium/salsa20_random.h b/src/libsodium/include/sodium/randombytes_salsa20_random.h
similarity index 100%
rename from src/libsodium/include/sodium/salsa20_random.h
rename to src/libsodium/include/sodium/randombytes_salsa20_random.h
diff --git a/src/libsodium/randombytes/randombytes.c b/src/libsodium/randombytes/randombytes.c
index 52583624..c681c7df 100644
--- a/src/libsodium/randombytes/randombytes.c
+++ b/src/libsodium/randombytes/randombytes.c
@@ -5,7 +5,7 @@
 #include <limits.h>
 
 #include "randombytes.h"
-#include "salsa20_random.h"
+#include "randombytes_salsa20_random.h"
 
 static randombytes_implementation implementation = {
     .randombytes_implementation_name = salsa20_random_implementation_name,
diff --git a/src/libsodium/randombytes/salsa20_random.c b/src/libsodium/randombytes/randombytes_salsa20_random.c
similarity index 99%
rename from src/libsodium/randombytes/salsa20_random.c
rename to src/libsodium/randombytes/randombytes_salsa20_random.c
index 923508eb..367c7717 100644
--- a/src/libsodium/randombytes/salsa20_random.c
+++ b/src/libsodium/randombytes/randombytes_salsa20_random.c
@@ -17,7 +17,7 @@
 #include "crypto_core_salsa20.h"
 #include "crypto_hash_sha256.h"
 #include "crypto_stream_salsa20.h"
-#include "salsa20_random.h"
+#include "randombytes_salsa20_random.h"
 
 #ifdef _WIN32
 # include <Windows.h>