diff --git a/tests/PQC Intermediate Values/ML-DSA-44.txt b/tests/PQC_Intermediate_Values/ML-DSA-44.txt
similarity index 100%
rename from tests/PQC Intermediate Values/ML-DSA-44.txt
rename to tests/PQC_Intermediate_Values/ML-DSA-44.txt
diff --git a/tests/PQC Intermediate Values/ML-DSA-65.txt b/tests/PQC_Intermediate_Values/ML-DSA-65.txt
similarity index 100%
rename from tests/PQC Intermediate Values/ML-DSA-65.txt
rename to tests/PQC_Intermediate_Values/ML-DSA-65.txt
diff --git a/tests/PQC Intermediate Values/ML-DSA-87.txt b/tests/PQC_Intermediate_Values/ML-DSA-87.txt
similarity index 100%
rename from tests/PQC Intermediate Values/ML-DSA-87.txt
rename to tests/PQC_Intermediate_Values/ML-DSA-87.txt
diff --git a/tests/PQC Intermediate Values/ML-KEM-1024.txt b/tests/PQC_Intermediate_Values/ML-KEM-1024.txt
similarity index 100%
rename from tests/PQC Intermediate Values/ML-KEM-1024.txt
rename to tests/PQC_Intermediate_Values/ML-KEM-1024.txt
diff --git a/tests/PQC Intermediate Values/ML-KEM-512.txt b/tests/PQC_Intermediate_Values/ML-KEM-512.txt
similarity index 100%
rename from tests/PQC Intermediate Values/ML-KEM-512.txt
rename to tests/PQC_Intermediate_Values/ML-KEM-512.txt
diff --git a/tests/PQC Intermediate Values/ML-KEM-768.txt b/tests/PQC_Intermediate_Values/ML-KEM-768.txt
similarity index 100%
rename from tests/PQC Intermediate Values/ML-KEM-768.txt
rename to tests/PQC_Intermediate_Values/ML-KEM-768.txt
diff --git a/tests/PQC Intermediate Values/fetch_values.sh b/tests/PQC_Intermediate_Values/fetch_values.sh
similarity index 87%
rename from tests/PQC Intermediate Values/fetch_values.sh
rename to tests/PQC_Intermediate_Values/fetch_values.sh
index 0f683eba2a..ced9d554b4 100755
--- a/tests/PQC Intermediate Values/fetch_values.sh	
+++ b/tests/PQC_Intermediate_Values/fetch_values.sh
@@ -4,11 +4,11 @@
 # This script fetches the NIST vectors for the ML-KEM-ipd and ML-DSA-ipd and extracts the values we use for testing
 
 wget https://csrc.nist.gov/csrc/media/Projects/post-quantum-cryptography/documents/example-files/PQC%20Intermediate%20Values.zip
-unzip PQC\ Intermediate\ Values.zip
+unzip PQC_Intermediate_Values.zip
 
-file_keygen="PQC Intermediate Values/Key Generation -- "
-file_signature="PQC Intermediate Values/Signature Generation -- "
-file_verification="PQC Intermediate Values/Signature Verification -- "
+file_keygen="PQC_Intermediate_Values/Key Generation -- "
+file_signature="PQC_Intermediate_Values/Signature Generation -- "
+file_verification="PQC_Intermediate_Values/Signature Verification -- "
 
 for VARIANT in "ML-DSA-44" "ML-DSA-65" "ML-DSA-87"
 do
@@ -27,9 +27,9 @@ do
   grep "signature: " "$file_signature$VARIANT.txt" | sed "s/signature: /sig_signature: /g" >> "$VARIANT.txt"
 done
 
-file_keygen="PQC Intermediate Values/Key Generation -- "
-file_encaps="PQC Intermediate Values/Encapsulation -- "
-file_decaps="PQC Intermediate Values/Decapsulation -- "
+file_keygen="PQC_Intermediate_Values/Key Generation -- "
+file_encaps="PQC_Intermediate_Values/Encapsulation -- "
+file_decaps="PQC_Intermediate_Values/Decapsulation -- "
 
 for VARIANT in "ML-KEM-512" "ML-KEM-768" "ML-KEM-1024"
 do
diff --git a/tests/test_vectors.sh b/tests/test_vectors.sh
index 99591eec91..0261dbfc8f 100755
--- a/tests/test_vectors.sh
+++ b/tests/test_vectors.sh
@@ -9,7 +9,7 @@ fi
 
 if [ "$1" = "ML-DSA-44-ipd" ]; then
 
-  file=tests/PQC\ Intermediate\ Values/ML-DSA-44.txt
+  file=tests/PQC_Intermediate_Values/ML-DSA-44.txt
   scheme_name=ML-DSA-44-ipd
   
   sh tests/test_sig_vectors.sh "$scheme_name" "$file" "$build_dir"
@@ -19,7 +19,7 @@ if [ "$1" = "ML-DSA-44-ipd" ]; then
 
 elif [ "$1" = "ML-DSA-65-ipd" ]; then
 
-  file=tests/PQC\ Intermediate\ Values/ML-DSA-65.txt
+  file=tests/PQC_Intermediate_Values/ML-DSA-65.txt
   scheme_name=ML-DSA-65-ipd
   
   sh tests/test_sig_vectors.sh "$scheme_name" "$file" "$build_dir"
@@ -29,7 +29,7 @@ elif [ "$1" = "ML-DSA-65-ipd" ]; then
 
 elif [ "$1" = "ML-DSA-87-ipd" ]; then
 
-  file=tests/PQC\ Intermediate\ Values/ML-DSA-87.txt
+  file=tests/PQC_Intermediate_Values/ML-DSA-87.txt
   scheme_name=ML-DSA-87-ipd
   
   sh tests/test_sig_vectors.sh "$scheme_name" "$file" "$build_dir"
@@ -39,7 +39,7 @@ elif [ "$1" = "ML-DSA-87-ipd" ]; then
 
 elif [ "$1" = "ML-KEM-512-ipd" ]; then
 
-  file=tests/PQC\ Intermediate\ Values/ML-KEM-512.txt
+  file=tests/PQC_Intermediate_Values/ML-KEM-512.txt
   scheme_name=ML-KEM-512-ipd
   
   sh tests/test_kem_vectors.sh "$scheme_name" "$file" "$build_dir"
@@ -49,7 +49,7 @@ elif [ "$1" = "ML-KEM-512-ipd" ]; then
 
 elif [ "$1" = "ML-KEM-768-ipd" ]; then
 
-  file=tests/PQC\ Intermediate\ Values/ML-KEM-768.txt
+  file=tests/PQC_Intermediate_Values/ML-KEM-768.txt
   scheme_name=ML-KEM-768-ipd
   
   sh tests/test_kem_vectors.sh "$scheme_name" "$file" "$build_dir"
@@ -59,7 +59,7 @@ elif [ "$1" = "ML-KEM-768-ipd" ]; then
 
 elif [ "$1" = "ML-KEM-1024-ipd" ]; then
 
-  file=tests/PQC\ Intermediate\ Values/ML-KEM-1024.txt
+  file=tests/PQC_Intermediate_Values/ML-KEM-1024.txt
   scheme_name=ML-KEM-1024-ipd
   
   sh tests/test_kem_vectors.sh "$scheme_name" "$file" "$build_dir"