diff --git a/Makefile.win b/Makefile.win
index ddc2dcb..cb911b9 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -4,7 +4,7 @@ EXTVERSION = 0.6.2
 OBJS = src\bitvector.obj src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\vector.obj
 HEADERS = src\vector.h
 
-REGRESS = bit_functions btree cast copy hnsw_cosine hnsw_hamming hnsw_ip hnsw_jaccard hnsw_l2 hnsw_options hnsw_unlogged ivfflat_cosine ivfflat_ip ivfflat_l2 ivfflat_options ivfflat_unlogged vector_functions vector_input
+REGRESS = bit_functions btree cast copy hnsw_bit_hamming hnsw_bit_jaccard hnsw_options hnsw_unlogged hnsw_vector_cosine hnsw_vector_ip hnsw_vector_l2 ivfflat_options ivfflat_unlogged ivfflat_vector_cosine ivfflat_vector_ip ivfflat_vector_l2 vector_functions vector_input
 REGRESS_OPTS = --inputdir=test --load-extension=$(EXTENSION)
 
 # For /arch flags
diff --git a/test/expected/hnsw_hamming.out b/test/expected/hnsw_bit_hamming.out
similarity index 100%
rename from test/expected/hnsw_hamming.out
rename to test/expected/hnsw_bit_hamming.out
diff --git a/test/expected/hnsw_jaccard.out b/test/expected/hnsw_bit_jaccard.out
similarity index 100%
rename from test/expected/hnsw_jaccard.out
rename to test/expected/hnsw_bit_jaccard.out
diff --git a/test/expected/hnsw_cosine.out b/test/expected/hnsw_vector_cosine.out
similarity index 100%
rename from test/expected/hnsw_cosine.out
rename to test/expected/hnsw_vector_cosine.out
diff --git a/test/expected/hnsw_ip.out b/test/expected/hnsw_vector_ip.out
similarity index 100%
rename from test/expected/hnsw_ip.out
rename to test/expected/hnsw_vector_ip.out
diff --git a/test/expected/hnsw_l2.out b/test/expected/hnsw_vector_l2.out
similarity index 100%
rename from test/expected/hnsw_l2.out
rename to test/expected/hnsw_vector_l2.out
diff --git a/test/expected/ivfflat_cosine.out b/test/expected/ivfflat_vector_cosine.out
similarity index 100%
rename from test/expected/ivfflat_cosine.out
rename to test/expected/ivfflat_vector_cosine.out
diff --git a/test/expected/ivfflat_ip.out b/test/expected/ivfflat_vector_ip.out
similarity index 100%
rename from test/expected/ivfflat_ip.out
rename to test/expected/ivfflat_vector_ip.out
diff --git a/test/expected/ivfflat_l2.out b/test/expected/ivfflat_vector_l2.out
similarity index 100%
rename from test/expected/ivfflat_l2.out
rename to test/expected/ivfflat_vector_l2.out
diff --git a/test/sql/hnsw_hamming.sql b/test/sql/hnsw_bit_hamming.sql
similarity index 100%
rename from test/sql/hnsw_hamming.sql
rename to test/sql/hnsw_bit_hamming.sql
diff --git a/test/sql/hnsw_jaccard.sql b/test/sql/hnsw_bit_jaccard.sql
similarity index 100%
rename from test/sql/hnsw_jaccard.sql
rename to test/sql/hnsw_bit_jaccard.sql
diff --git a/test/sql/hnsw_cosine.sql b/test/sql/hnsw_vector_cosine.sql
similarity index 100%
rename from test/sql/hnsw_cosine.sql
rename to test/sql/hnsw_vector_cosine.sql
diff --git a/test/sql/hnsw_ip.sql b/test/sql/hnsw_vector_ip.sql
similarity index 100%
rename from test/sql/hnsw_ip.sql
rename to test/sql/hnsw_vector_ip.sql
diff --git a/test/sql/hnsw_l2.sql b/test/sql/hnsw_vector_l2.sql
similarity index 100%
rename from test/sql/hnsw_l2.sql
rename to test/sql/hnsw_vector_l2.sql
diff --git a/test/sql/ivfflat_cosine.sql b/test/sql/ivfflat_vector_cosine.sql
similarity index 100%
rename from test/sql/ivfflat_cosine.sql
rename to test/sql/ivfflat_vector_cosine.sql
diff --git a/test/sql/ivfflat_ip.sql b/test/sql/ivfflat_vector_ip.sql
similarity index 100%
rename from test/sql/ivfflat_ip.sql
rename to test/sql/ivfflat_vector_ip.sql
diff --git a/test/sql/ivfflat_l2.sql b/test/sql/ivfflat_vector_l2.sql
similarity index 100%
rename from test/sql/ivfflat_l2.sql
rename to test/sql/ivfflat_vector_l2.sql