diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop3c_dpp16.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp16_from_vopc.s
rename from llvm/test/MC/AMDGPU/gfx11_asm_vop3c_dpp16.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp16_from_vopc.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop3cx_dpp16.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp16_from_vopcx.s
rename from llvm/test/MC/AMDGPU/gfx11_asm_vop3cx_dpp16.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp16_from_vopcx.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop3c_dpp8.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp8_from_vopc.s
rename from llvm/test/MC/AMDGPU/gfx11_asm_vop3c_dpp8.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp8_from_vopc.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop3cx_dpp8.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp8_from_vopcx.s
rename from llvm/test/MC/AMDGPU/gfx11_asm_vop3cx_dpp8.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp8_from_vopcx.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop3c.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop3_from_vopc.s
rename from llvm/test/MC/AMDGPU/gfx11_asm_vop3c.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vop3_from_vopc.s
diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop3cx.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop3_from_vopcx.s
rename from llvm/test/MC/AMDGPU/gfx11_asm_vop3cx.s
rename to llvm/test/MC/AMDGPU/gfx11_asm_vop3_from_vopcx.s
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3c_dpp16.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_dpp16_from_vopc.txt
rename from llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3c_dpp16.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_dpp16_from_vopc.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3cx_dpp16.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_dpp16_from_vopcx.txt
rename from llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3cx_dpp16.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_dpp16_from_vopcx.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3c_dpp8.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_dpp8_from_vopc.txt
rename from llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3c_dpp8.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_dpp8_from_vopc.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3cx_dpp8.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_dpp8_from_vopcx.txt
rename from llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3cx_dpp8.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_dpp8_from_vopcx.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3c.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_from_vopc.txt
rename from llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3c.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_from_vopc.txt
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3cx.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_from_vopcx.txt
rename from llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3cx.txt
rename to llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_from_vopcx.txt