diff --git a/crypto/fipsmodule/ml_dsa/ml_dsa.c b/crypto/fipsmodule/ml_dsa/ml_dsa.c
index eb6b73a0a2..6988621459 100644
--- a/crypto/fipsmodule/ml_dsa/ml_dsa.c
+++ b/crypto/fipsmodule/ml_dsa/ml_dsa.c
@@ -9,12 +9,12 @@
 
 // These includes are required to compile ML-DSA. These can be moved to bcm.c
 // when ML-DSA is added to the fipsmodule directory.
-#include "./ml_dsa_ref/ntt.c"
+#include "./ml_dsa_ref/ml_dsa_ntt.c"
 #include "./ml_dsa_ref/packing.c"
-#include "./ml_dsa_ref/params.c"
-#include "./ml_dsa_ref/poly.c"
-#include "./ml_dsa_ref/polyvec.c"
-#include "./ml_dsa_ref/reduce.c"
+#include "./ml_dsa_ref/ml_dsa_params.c"
+#include "./ml_dsa_ref/ml_dsa_poly.c"
+#include "./ml_dsa_ref/ml_dsa_polyvec.c"
+#include "./ml_dsa_ref/ml_dsa_reduce.c"
 #include "./ml_dsa_ref/rounding.c"
 #include "./ml_dsa_ref/sign.c"
 
diff --git a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ntt.c b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_ntt.c
similarity index 99%
rename from crypto/fipsmodule/ml_dsa/ml_dsa_ref/ntt.c
rename to crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_ntt.c
index 93a91e57c0..7668a244ee 100644
--- a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ntt.c
+++ b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_ntt.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include "params.h"
-#include "ntt.h"
+#include "ml_dsa_ntt.h"
 #include "reduce.h"
 
 static const int32_t zetas[ML_DSA_N] = {
diff --git a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ntt.h b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_ntt.h
similarity index 100%
rename from crypto/fipsmodule/ml_dsa/ml_dsa_ref/ntt.h
rename to crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_ntt.h
diff --git a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/params.c b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_params.c
similarity index 100%
rename from crypto/fipsmodule/ml_dsa/ml_dsa_ref/params.c
rename to crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_params.c
diff --git a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/poly.c b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_poly.c
similarity index 99%
rename from crypto/fipsmodule/ml_dsa/ml_dsa_ref/poly.c
rename to crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_poly.c
index c19314c164..48df1077ad 100644
--- a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/poly.c
+++ b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_poly.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include "params.h"
 #include "poly.h"
-#include "ntt.h"
+#include "ml_dsa_ntt.h"
 #include "reduce.h"
 #include "rounding.h"
 #include "../../sha/internal.h"
diff --git a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/polyvec.c b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_polyvec.c
similarity index 100%
rename from crypto/fipsmodule/ml_dsa/ml_dsa_ref/polyvec.c
rename to crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_polyvec.c
diff --git a/crypto/fipsmodule/ml_dsa/ml_dsa_ref/reduce.c b/crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_reduce.c
similarity index 100%
rename from crypto/fipsmodule/ml_dsa/ml_dsa_ref/reduce.c
rename to crypto/fipsmodule/ml_dsa/ml_dsa_ref/ml_dsa_reduce.c