diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv64.ad b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv.ad
similarity index 100%
rename from src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv64.ad
rename to src/hotspot/cpu/riscv/gc/shenandoah/shenandoah_riscv.ad
diff --git a/src/hotspot/cpu/riscv/gc/x/x_riscv64.ad b/src/hotspot/cpu/riscv/gc/x/x_riscv.ad
similarity index 100%
rename from src/hotspot/cpu/riscv/gc/x/x_riscv64.ad
rename to src/hotspot/cpu/riscv/gc/x/x_riscv.ad
diff --git a/src/hotspot/cpu/riscv/gc/z/z_riscv64.ad b/src/hotspot/cpu/riscv/gc/z/z_riscv.ad
similarity index 100%
rename from src/hotspot/cpu/riscv/gc/z/z_riscv64.ad
rename to src/hotspot/cpu/riscv/gc/z/z_riscv.ad