diff --git a/python/raft-ann-bench/src/raft-ann-bench/plot/__main__.py b/python/raft-ann-bench/src/raft-ann-bench/plot/__main__.py
index 233607c281..6ec2cdaf22 100644
--- a/python/raft-ann-bench/src/raft-ann-bench/plot/__main__.py
+++ b/python/raft-ann-bench/src/raft-ann-bench/plot/__main__.py
@@ -352,7 +352,9 @@ def load_all_results(
     result_files = [
         result_filename
         for result_filename in result_files
-        if f"{k}-{batch_size}" in result_filename
+        if "csv" in result_filename
+        and f"{k}-{batch_size}"
+        == "-".join(result_filename.replace(".csv", "").split("-")[1:])
     ]
     if len(algorithms) > 0:
         result_files = [
diff --git a/python/raft-ann-bench/src/raft-ann-bench/run/algos.yaml b/python/raft-ann-bench/src/raft-ann-bench/run/algos.yaml
index f4f928505f..7ea360e0c9 100644
--- a/python/raft-ann-bench/src/raft-ann-bench/run/algos.yaml
+++ b/python/raft-ann-bench/src/raft-ann-bench/run/algos.yaml
@@ -10,13 +10,13 @@ faiss_gpu_ivf_pq:
 faiss_gpu_ivf_sq:
   executable: FAISS_GPU_IVF_PQ_ANN_BENCH
   requires_gpu: true
-faiss_flat:
+faiss_cpu_flat:
   executable: FAISS_CPU_FLAT_ANN_BENCH
   requires_gpu: false
-faiss_ivf_flat:
+faiss_cpu_ivf_flat:
   executable: FAISS_CPU_IVF_FLAT_ANN_BENCH
   requires_gpu: false
-faiss_ivf_pq:
+faiss_cpu_ivf_pq:
   executable: FAISS_CPU_IVF_PQ_ANN_BENCH
   requires_gpu: false
 raft_ivf_flat: