diff --git a/llvm/lib/Support/RISCVAttributes.cpp b/llvm/lib/Support/RISCVAttributes.cpp
--- a/llvm/lib/Support/RISCVAttributes.cpp
+++ b/llvm/lib/Support/RISCVAttributes.cpp
@@ -12,12 +12,12 @@
 using namespace llvm::RISCVAttrs;
 
 static const TagNameItem tagData[] = {
-    {STACK_ALIGN, "Tag_stack_align"},
-    {ARCH, "Tag_arch"},
-    {UNALIGNED_ACCESS, "Tag_unaligned_access"},
-    {PRIV_SPEC, "Tag_priv_spec"},
-    {PRIV_SPEC_MINOR, "Tag_priv_spec_minor"},
-    {PRIV_SPEC_REVISION, "Tag_priv_spec_revision"},
+    {STACK_ALIGN, "Tag_RISCV_stack_align"},
+    {ARCH, "Tag_RISCV_arch"},
+    {UNALIGNED_ACCESS, "Tag_RISCV_unaligned_access"},
+    {PRIV_SPEC, "Tag_RISCV_priv_spec"},
+    {PRIV_SPEC_MINOR, "Tag_RISCV_priv_spec_minor"},
+    {PRIV_SPEC_REVISION, "Tag_RISCV_priv_spec_revision"},
 };
 
 const TagNameMap llvm::RISCVAttrs::RISCVAttributeTags(tagData,