diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 6876deb8..b203599d 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -17,9 +17,9 @@ libsodium_la_SOURCES = \
 	crypto_generichash/blake2/ref/blake2s-ref.c \
 	crypto_generichash/blake2/ref/crypto_generichash.h \
 	crypto_generichash/blake2/ref/generichash_blake2b.c \
-	crypto_scalarmult/curve25519/ref/base.c \
+	crypto_scalarmult/curve25519/ref/base_curve25519_ref.c \
 	crypto_scalarmult/curve25519/ref/crypto_scalarmult.h \
-	crypto_scalarmult/curve25519/ref/smult.c \
+	crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c \
 	crypto_hashblocks/sha256/ref/blocks_sha256.c \
 	crypto_hashblocks/sha256/ref/crypto_hashblocks.h \
 	crypto_hashblocks/sha512/ref/blocks_sha512.c \
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref/base.c b/src/libsodium/crypto_scalarmult/curve25519/ref/base_curve25519_ref.c
similarity index 100%
rename from src/libsodium/crypto_scalarmult/curve25519/ref/base.c
rename to src/libsodium/crypto_scalarmult/curve25519/ref/base_curve25519_ref.c
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h b/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h
index ab642f74..bff5993f 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h
+++ b/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h
@@ -3,12 +3,10 @@
 
 #include "crypto_scalarmult_curve25519.h"
 
-#define crypto_scalarmult crypto_scalarmult_curve25519
-#define crypto_scalarmult_base crypto_scalarmult_curve25519_base
-#define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
-#define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
-#define crypto_scalarmult_PRIMITIVE "curve25519"
-#define crypto_scalarmult_IMPLEMENTATION crypto_scalarmult_curve25519_IMPLEMENTATION
-#define crypto_scalarmult_VERSION crypto_scalarmult_curve25519_VERSION
+#define crypto_scalarmult_curve25519_implementation_name \
+    crypto_scalarmult_curve25519_ref_implementation_name
+
+#define crypto_scalarmult crypto_scalarmult_curve25519_ref
+#define crypto_scalarmult_base crypto_scalarmult_curve25519_ref_base
 
 #endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref/smult.c b/src/libsodium/crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c
similarity index 100%
rename from src/libsodium/crypto_scalarmult/curve25519/ref/smult.c
rename to src/libsodium/crypto_scalarmult/curve25519/ref/smult_curve25519_ref.c