diff --git a/test/ELF/empty-ver.s b/test/ELF/empty-ver.s
index cfb6e81..feb1eb2 100644
--- a/test/ELF/empty-ver.s
+++ b/test/ELF/empty-ver.s
@@ -21,7 +21,7 @@
 // CHECK-NEXT:   0000: 00666F6F 00742E73 6F007665 7200      |.foo.t.so.ver.|
 // CHECK-NEXT: )
 
-// CHECK:      Version symbols [
+// CHECK:      VersionSymbols [
 // CHECK-NEXT:  Symbol {
 // CHECK-NEXT:    Version: 0
 // CHECK-NEXT:    Name:
diff --git a/test/ELF/empty-ver2.s b/test/ELF/empty-ver2.s
index 3c75a88..8692e04 100644
--- a/test/ELF/empty-ver2.s
+++ b/test/ELF/empty-ver2.s
@@ -5,7 +5,7 @@
 # RUN: ld.lld %t.o -o t.so -shared -version-script %p/Inputs/empty-ver.ver
 # RUN: llvm-readobj --version-info t.so | FileCheck %s
 
-# CHECK:      Version symbols [
+# CHECK:      VersionSymbols [
 # CHECK-NEXT:   Symbol {
 # CHECK-NEXT:     Version: 0
 # CHECK-NEXT:     Name:
diff --git a/test/ELF/linkerscript/version-script.s b/test/ELF/linkerscript/version-script.s
index bbfe5d6..5584e8a 100644
--- a/test/ELF/linkerscript/version-script.s
+++ b/test/ELF/linkerscript/version-script.s
@@ -11,7 +11,7 @@
 # RUN: llvm-readobj -V %t.so | FileCheck %s
 
 ## Check that we are able to version symbols defined in script.
-# CHECK:      Version symbols [
+# CHECK:      VersionSymbols [
 # CHECK-NEXT:   Symbol {
 # CHECK-NEXT:     Version: 0
 # CHECK-NEXT:     Name:
@@ -38,7 +38,7 @@
 # RUN: echo "und = 0x1; VERSION { V { global: und; local: *; }; }" > %t.script
 # RUN: ld.lld -T %t.script -shared --no-undefined-version %t.o -o %t.so
 # RUN: llvm-readobj -V %t.so | FileCheck %s --check-prefix=UNDEF
-# UNDEF:      Version symbols [
+# UNDEF:      VersionSymbols [
 # UNDEF-NEXT:   Symbol {
 # UNDEF-NEXT:     Version: 0
 # UNDEF-NEXT:     Name:
diff --git a/test/ELF/partition-synthetic-sections.s b/test/ELF/partition-synthetic-sections.s
index 6edfd6e..deb8778 100644
--- a/test/ELF/partition-synthetic-sections.s
+++ b/test/ELF/partition-synthetic-sections.s
@@ -88,7 +88,7 @@
 //                                0x490 + 0x3b70 = 0x4000
 // PART-INDEX-NEXT: 048c 26ffffff 703b0000 50410000
 
-// CHECK: {{.*}}EH_FRAME Header
+// CHECK: {{.*}}EHFrameHeader
 // CHECK: Address: 0x[[EH_FRAME_HDR_ADDR]]
 // CHECK: eh_frame_ptr: 0x[[EH_FRAME_ADDR]]
 // CHECK: initial_location: 0x[[TEXT_ADDR]]
diff --git a/test/ELF/verdef-defaultver.s b/test/ELF/verdef-defaultver.s
index 65c36dd..379d927 100644
--- a/test/ELF/verdef-defaultver.s
+++ b/test/ELF/verdef-defaultver.s
@@ -53,7 +53,7 @@
 # DSO-NEXT:      Section: .text
 # DSO-NEXT:    }
 # DSO-NEXT:  ]
-# DSO-NEXT:  Version symbols [
+# DSO-NEXT:  VersionSymbols [
 # DSO-NEXT:    Symbol {
 # DSO-NEXT:      Version: 0
 # DSO-NEXT:      Name:
@@ -75,7 +75,7 @@
 # DSO-NEXT:      Name: c@@V2
 # DSO-NEXT:    }
 # DSO-NEXT:  ]
-# DSO-NEXT:  SHT_GNU_verdef {
+# DSO-NEXT:  VersionDefinitions [
 # DSO-NEXT:    Definition {
 # DSO-NEXT:      Version: 1
 # DSO-NEXT:      Flags: Base
@@ -97,7 +97,7 @@
 # DSO-NEXT:      Hash: 1426
 # DSO-NEXT:      Name: V2
 # DSO-NEXT:    }
-# DSO-NEXT:  }
+# DSO-NEXT:  ]
 
 ## Check that we can link against DSO produced.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
@@ -142,7 +142,7 @@
 # EXE-NEXT:      Section: Undefined
 # EXE-NEXT:    }
 # EXE-NEXT:  ]
-# EXE-NEXT:  Version symbols [
+# EXE-NEXT:  VersionSymbols [
 # EXE-NEXT:    Symbol {
 # EXE-NEXT:      Version: 0
 # EXE-NEXT:      Name:
@@ -160,9 +160,9 @@
 # EXE-NEXT:      Name: c@V2
 # EXE-NEXT:    }
 # EXE-NEXT:  ]
-# EXE-NEXT:  SHT_GNU_verdef {
-# EXE-NEXT:  }
-# EXE-NEXT:  SHT_GNU_verneed {
+# EXE-NEXT:  VersionDefinitions [
+# EXE-NEXT:  ]
+# EXE-NEXT:  VersionRequirements [
 # EXE-NEXT:    Dependency {
 # EXE-NEXT:      Version: 1
 # EXE-NEXT:      Count: 2
@@ -182,7 +182,7 @@
 # EXE-NEXT:        }
 # EXE-NEXT:      ]
 # EXE-NEXT:    }
-# EXE-NEXT:  }
+# EXE-NEXT:  ]
 
 .globl _start
 _start:
diff --git a/test/ELF/verdef-dependency.s b/test/ELF/verdef-dependency.s
index ce58fbb..2ff9dc8 100644
--- a/test/ELF/verdef-dependency.s
+++ b/test/ELF/verdef-dependency.s
@@ -6,7 +6,7 @@
 # RUN: ld.lld --version-script %t.script -shared -soname shared %t.o -o %t.so
 # RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
-# DSO:      SHT_GNU_verdef {
+# DSO:      VersionDefinitions [
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
 # DSO-NEXT:     Flags: Base
@@ -35,4 +35,4 @@
 # DSO-NEXT:     Hash: 98456672
 # DSO-NEXT:     Name: LIBSAMPLE_3.0
 # DSO-NEXT:   }
-# DSO-NEXT: }
+# DSO-NEXT: ]
diff --git a/test/ELF/verdef.s b/test/ELF/verdef.s
index c916a34..117b2b8 100644
--- a/test/ELF/verdef.s
+++ b/test/ELF/verdef.s
@@ -6,7 +6,7 @@
 # RUN: ld.lld --hash-style=sysv --version-script %t.script -shared -soname shared %t.o -o %t.so
 # RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck --check-prefix=DSO %s
 
-# DSO:       Version symbols [
+# DSO:       VersionSymbols [
 # DSO-NEXT:   Symbol {
 # DSO-NEXT:     Version: 0
 # DSO-NEXT:     Name:
@@ -24,7 +24,7 @@
 # DSO-NEXT:     Name: c@@LIBSAMPLE_3.0
 # DSO-NEXT:   }
 # DSO-NEXT: ]
-# DSO-NEXT: SHT_GNU_verdef {
+# DSO-NEXT: VersionDefinitions [
 # DSO-NEXT:   Definition {
 # DSO-NEXT:     Version: 1
 # DSO-NEXT:     Flags: Base
@@ -53,16 +53,16 @@
 # DSO-NEXT:     Hash: 98456672
 # DSO-NEXT:     Name: LIBSAMPLE_3.0
 # DSO-NEXT:   }
-# DSO-NEXT: }
-# DSO-NEXT: SHT_GNU_verneed {
-# DSO-NEXT: }
+# DSO-NEXT: ]
+# DSO-NEXT: VersionRequirements [
+# DSO-NEXT: ]
 
 ## Check that we can link agains DSO we produced.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/verdef.s -o %tmain.o
 # RUN: ld.lld --hash-style=sysv %tmain.o %t.so -o %tout
 # RUN: llvm-readobj -V %tout | FileCheck --check-prefix=MAIN %s
 
-# MAIN:      Version symbols [
+# MAIN:      VersionSymbols [
 # MAIN-NEXT:   Symbol {
 # MAIN-NEXT:     Version: 0
 # MAIN-NEXT:     Name:
@@ -80,8 +80,8 @@
 # MAIN-NEXT:     Name: c@LIBSAMPLE_3.0
 # MAIN-NEXT:   }
 # MAIN-NEXT: ]
-# MAIN-NEXT: SHT_GNU_verdef {
-# MAIN-NEXT: }
+# MAIN-NEXT: VersionDefinitions [
+# MAIN-NEXT: ]
 
 # RUN: echo "VERSION {" > %t.script
 # RUN: echo "LIBSAMPLE_1.0 { global: a; local: *; };" >> %t.script
diff --git a/test/ELF/verneed-as-needed-weak.s b/test/ELF/verneed-as-needed-weak.s
index df15bc7..215ec8e 100644
--- a/test/ELF/verneed-as-needed-weak.s
+++ b/test/ELF/verneed-as-needed-weak.s
@@ -7,8 +7,8 @@
 # RUN: ld.lld %t.o --as-needed %t.so -o %t
 # RUN: llvm-readobj -V %t | FileCheck %s
 
-# CHECK:       SHT_GNU_verneed {
-# CHECK-NEXT:  }
+# CHECK:       VersionRequirements [
+# CHECK-NEXT:  ]
 
 .weak f1
 
diff --git a/test/ELF/verneed.s b/test/ELF/verneed.s
index a95ce37..3a0935f 100644
--- a/test/ELF/verneed.s
+++ b/test/ELF/verneed.s
@@ -117,7 +117,7 @@
 # CHECK-NEXT: 0x000000006FFFFFFE VERNEED              [[VERNEED]]
 # CHECK-NEXT: 0x000000006FFFFFFF VERNEEDNUM           2
 
-# CHECK:      Version symbols [
+# CHECK:      VersionSymbols [
 # CHECK-NEXT:    Symbol {
 # CHECK-NEXT:      Version: 0
 # CHECK-NEXT:      Name:
@@ -135,9 +135,9 @@
 # CHECK-NEXT:      Name: g1@v1
 # CHECK-NEXT:    }
 # CHECK-NEXT:  ]
-# CHECK-NEXT:  SHT_GNU_verdef {
-# CHECK-NEXT:  }
-# CHECK-NEXT:  SHT_GNU_verneed {
+# CHECK-NEXT:  VersionDefinitions [
+# CHECK-NEXT:  ]
+# CHECK-NEXT:  VersionRequirements [
 # CHECK-NEXT:    Dependency {
 # CHECK-NEXT:      Version: 1
 # CHECK-NEXT:      Count: 2
@@ -170,7 +170,7 @@
 # CHECK-NEXT:        }
 # CHECK-NEXT:      ]
 # CHECK-NEXT:    }
-# CHECK-NEXT:  }
+# CHECK-NEXT:  ]
 
 .globl _start
 _start:
diff --git a/test/ELF/version-script-extern-undefined.s b/test/ELF/version-script-extern-undefined.s
index d577013..58b4d2e 100644
--- a/test/ELF/version-script-extern-undefined.s
+++ b/test/ELF/version-script-extern-undefined.s
@@ -5,7 +5,7 @@
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
 # RUN: llvm-readobj -V %t.so | FileCheck %s
 
-# CHECK:      Version symbols [
+# CHECK:      VersionSymbols [
 # CHECK-NEXT:   Symbol {
 # CHECK-NEXT:     Version: 0
 # CHECK-NEXT:     Name:
diff --git a/test/ELF/version-script-extern-wildcards.s b/test/ELF/version-script-extern-wildcards.s
index 0fac5c0..1b4a03b 100644
--- a/test/ELF/version-script-extern-wildcards.s
+++ b/test/ELF/version-script-extern-wildcards.s
@@ -6,7 +6,7 @@
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
 # RUN: llvm-readobj -V --dyn-syms %t.so | FileCheck %s
 
-# CHECK:  Version symbols [
+# CHECK:  VersionSymbols [
 # CHECK:    Name: _Z3bari
 # CHECK:    Name: _Z3fooi@@FOO
 # CHECK:    Name: _Z3zedi@@BAR
diff --git a/test/ELF/version-script-extern.s b/test/ELF/version-script-extern.s
index 57edfa8..f636f2c 100644
--- a/test/ELF/version-script-extern.s
+++ b/test/ELF/version-script-extern.s
@@ -66,7 +66,7 @@
 # DSO-NEXT:      Section: .text (0x6)
 # DSO-NEXT:    }
 # DSO-NEXT:  ]
-# DSO-NEXT:  Version symbols [
+# DSO-NEXT:  VersionSymbols [
 # DSO-NEXT:    Symbol {
 # DSO-NEXT:      Version: 0
 # DSO-NEXT:      Name:
diff --git a/test/ELF/version-script-extern2.s b/test/ELF/version-script-extern2.s
index 19eb141..1620297 100644
--- a/test/ELF/version-script-extern2.s
+++ b/test/ELF/version-script-extern2.s
@@ -5,7 +5,7 @@
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
 # RUN: llvm-readobj -V %t.so | FileCheck %s
 
-# CHECK:      Version symbols [
+# CHECK:      VersionSymbols [
 # CHECK-NEXT:   Symbol {
 # CHECK-NEXT:     Version: 0
 # CHECK-NEXT:     Name:
diff --git a/test/ELF/version-script-locals-extern.s b/test/ELF/version-script-locals-extern.s
index f40b76c..ba37e7e 100644
--- a/test/ELF/version-script-locals-extern.s
+++ b/test/ELF/version-script-locals-extern.s
@@ -4,7 +4,7 @@
 # RUN: echo "FOO { local: extern \"C++\" { \"abb(int)\"; }; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
 # RUN: llvm-readobj -V %t.so | FileCheck %s --check-prefix=ABB
-# ABB:      Version symbols [
+# ABB:      VersionSymbols [
 # ABB-NEXT:   Symbol {
 # ABB-NEXT:     Version: 0
 # ABB-NEXT:     Name:
@@ -23,7 +23,7 @@
 # RUN: echo "FOO { local: extern \"C++\" { abc*; }; };" > %t.script
 # RUN: ld.lld --version-script %t.script -shared %t.o -o %t.so
 # RUN: llvm-readobj -V %t.so | FileCheck %s --check-prefix=ABC
-# ABC:      Version symbols [
+# ABC:      VersionSymbols [
 # ABC-NEXT:   Symbol {
 # ABC-NEXT:     Version: 0
 # ABC-NEXT:     Name:
diff --git a/test/ELF/version-script-symver2.s b/test/ELF/version-script-symver2.s
index 173b7c8..34b2efb 100644
--- a/test/ELF/version-script-symver2.s
+++ b/test/ELF/version-script-symver2.s
@@ -4,7 +4,7 @@
 # RUN: ld.lld -shared %t.o --version-script %t.map -o %t.so --fatal-warnings
 # RUN: llvm-readobj -V %t.so | FileCheck %s
 
-# CHECK:      Version symbols [
+# CHECK:      VersionSymbols [
 # CHECK-NEXT:   Symbol {
 # CHECK-NEXT:     Version: 0
 # CHECK-NEXT:     Name: