diff --git a/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStream.h b/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStream.h
index 204afa9b179b..4d7941ae4137 100644
--- a/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStream.h
+++ b/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStream.h
@@ -44,7 +44,7 @@ public:
 
   uint32_t getPdbDllVersion() const;
 
-  uint32_t getNumberOfSymbols() const;
+  uint32_t getSymRecordStreamIndex() const;
 
   PDB_Machine getMachineType() const;
 
diff --git a/llvm/lib/DebugInfo/PDB/Raw/DbiStream.cpp b/llvm/lib/DebugInfo/PDB/Raw/DbiStream.cpp
index 024e41ed9e59..7e1811daf09d 100644
--- a/llvm/lib/DebugInfo/PDB/Raw/DbiStream.cpp
+++ b/llvm/lib/DebugInfo/PDB/Raw/DbiStream.cpp
@@ -53,11 +53,11 @@ struct DbiStream::HeaderInfo {
   little32_t VersionSignature;
   ulittle32_t VersionHeader;
   ulittle32_t Age;                     // Should match InfoStream.
-  ulittle16_t GSSyms;                  // Number of global symbols
+  ulittle16_t GlobalSymbolStreamIndex; // Global symbol stream #
   ulittle16_t BuildNumber;             // See DbiBuildNo structure.
-  ulittle16_t PublicSymbolStreamIndex; // Number of public symbols
+  ulittle16_t PublicSymbolStreamIndex; // Public symbols stream #
   ulittle16_t PdbDllVersion;           // version of mspdbNNN.dll
-  ulittle16_t SymRecords;              // Number of symbols
+  ulittle16_t SymRecordStreamIndex;    // Symbol records stream #
   ulittle16_t PdbDllRbld;              // rbld number of mspdbNNN.dll
   little32_t ModiSubstreamSize;        // Size of module info stream
   little32_t SecContrSubstreamSize;    // Size of sec. contribution stream
@@ -210,7 +210,9 @@ uint16_t DbiStream::getBuildMinorVersion() const {
 
 uint32_t DbiStream::getPdbDllVersion() const { return Header->PdbDllVersion; }
 
-uint32_t DbiStream::getNumberOfSymbols() const { return Header->SymRecords; }
+uint32_t DbiStream::getSymRecordStreamIndex() const {
+  return Header->SymRecordStreamIndex;
+}
 
 PDB_Machine DbiStream::getMachineType() const {
   uint16_t Machine = Header->MachineType;
diff --git a/llvm/test/DebugInfo/PDB/pdbdump-headers.test b/llvm/test/DebugInfo/PDB/pdbdump-headers.test
index 1b11f7adcef0..d40d0edfb0fa 100644
--- a/llvm/test/DebugInfo/PDB/pdbdump-headers.test
+++ b/llvm/test/DebugInfo/PDB/pdbdump-headers.test
@@ -38,7 +38,7 @@
 ; EMPTY-NEXT:   Has CTypes: No
 ; EMPTY-NEXT:   Is Stripped: No
 ; EMPTY-NEXT:   Machine Type: x86
-; EMPTY-NEXT:   Number of Symbols: 8
+; EMPTY-NEXT:   Symbol Record Stream Index: 8
 ; EMPTY-NEXT:   Toolchain Version: 12.0
 ; EMPTY-NEXT:   mspdb120.dll version: 12.0.31101
 ; EMPTY-NEXT:   Modules [
@@ -415,7 +415,7 @@
 ; BIG-NEXT:   Has CTypes: No
 ; BIG-NEXT:   Is Stripped: No
 ; BIG-NEXT:   Machine Type: x86
-; BIG-NEXT:   Number of Symbols: 9
+; BIG-NEXT:   Symbol Record Stream Index: 9
 ; BIG-NEXT:   Toolchain Version: 14.0
 ; BIG-NEXT:   mspdb140.dll version: 14.0.23918
 ; BIG-NEXT:   Modules [
diff --git a/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp b/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp
index 960accfa779c..7348336278d8 100644
--- a/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp
+++ b/llvm/tools/llvm-pdbdump/llvm-pdbdump.cpp
@@ -312,7 +312,7 @@ static Error dumpDbiStream(ScopedPrinter &P, PDBFile &File) {
   P.printBoolean("Has CTypes", DS.hasCTypes());
   P.printBoolean("Is Stripped", DS.isStripped());
   P.printObject("Machine Type", DS.getMachineType());
-  P.printNumber("Number of Symbols", DS.getNumberOfSymbols());
+  P.printNumber("Symbol Record Stream Index", DS.getSymRecordStreamIndex());
 
   uint16_t Major = DS.getBuildMajorVersion();
   uint16_t Minor = DS.getBuildMinorVersion();