diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-deinterleave-load.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-deinterleave-load.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-deinterleave-load.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-deinterleave-load.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-fpext-vp.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-fpext-vp.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-fpext-vp.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-fpext-vp.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-fptrunc-vp.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-fptrunc-vp.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-fptrunc-vp.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-fptrunc-vp.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-interleave-store.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-interleave-store.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-interleave-store.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-interleave-store.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-inttoptr-ptrtoint.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-inttoptr-ptrtoint.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-inttoptr-ptrtoint.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-inttoptr-ptrtoint.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-segN-load.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-segN-load.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-segN-load.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-segN-load.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-segN-store.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-segN-store.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-segN-store.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-segN-store.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-extract-subvector.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-extract-subvector.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-extract-subvector.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-extract-subvector.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-reverse.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-reverse.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-reverse.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-reverse.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-transpose.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-transpose.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-transpose.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-transpose.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-vslide1down.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-vslide1down.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-vslide1down.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-vslide1down.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-vslide1up.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-vslide1up.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-shuffle-vslide1up.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-shuffle-vslide1up.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-strided-load-store-asm.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-strided-load-store-asm.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-strided-load-store-asm.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-strided-load-store-asm.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-strided-load-store-negative.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-strided-load-store-negative.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-strided-load-store-negative.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-strided-load-store-negative.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-strided-load-store.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-strided-load-store.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-strided-load-store.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-strided-load-store.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-trunc-vp-mask.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-trunc-vp-mask.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-trunc-vp-mask.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-trunc-vp-mask.ll
diff --git a/llvm/test/CodeGen/RISCV/rvv/fixed-vector-trunc-vp.ll b/llvm/test/CodeGen/RISCV/rvv/fixed-vectors-trunc-vp.ll
rename from llvm/test/CodeGen/RISCV/rvv/fixed-vector-trunc-vp.ll
rename to llvm/test/CodeGen/RISCV/rvv/fixed-vectors-trunc-vp.ll