Index: include/llvm/ObjectYAML/ELFYAML.h
===================================================================
--- include/llvm/ObjectYAML/ELFYAML.h
+++ include/llvm/ObjectYAML/ELFYAML.h
@@ -75,7 +75,7 @@
   llvm::yaml::Hex64 Entry;
 
   Optional<llvm::yaml::Hex16> SHEntSize;
-  Optional<llvm::yaml::Hex64> SHOffset;
+  Optional<llvm::yaml::Hex64> SHOff;
   Optional<llvm::yaml::Hex16> SHNum;
   Optional<llvm::yaml::Hex16> SHStrNdx;
 };
Index: lib/ObjectYAML/ELFEmitter.cpp
===================================================================
--- lib/ObjectYAML/ELFEmitter.cpp
+++ lib/ObjectYAML/ELFEmitter.cpp
@@ -234,11 +234,10 @@
       Doc.Header.SHEntSize ? (uint16_t)*Doc.Header.SHEntSize : sizeof(Elf_Shdr);
   // Immediately following the ELF header and program headers.
   // Align the start of the section header and write the ELF header.
-  uint64_t ShOffset;
-  CBA.getOSAndAlignedOffset(ShOffset, sizeof(typename ELFT::uint));
-  Header.e_shoff = Doc.Header.SHOffset
-                       ? typename ELFT::uint(*Doc.Header.SHOffset)
-                       : ShOffset;
+  uint64_t SHOff;
+  CBA.getOSAndAlignedOffset(SHOff, sizeof(typename ELFT::uint));
+  Header.e_shoff =
+      Doc.Header.SHOff ? typename ELFT::uint(*Doc.Header.SHOff) : SHOff;
   Header.e_shnum =
       Doc.Header.SHNum ? (uint16_t)*Doc.Header.SHNum : Doc.Sections.size();
   Header.e_shstrndx = Doc.Header.SHStrNdx ? (uint16_t)*Doc.Header.SHStrNdx
Index: lib/ObjectYAML/ELFYAML.cpp
===================================================================
--- lib/ObjectYAML/ELFYAML.cpp
+++ lib/ObjectYAML/ELFYAML.cpp
@@ -824,7 +824,7 @@
   IO.mapOptional("Entry", FileHdr.Entry, Hex64(0));
 
   IO.mapOptional("SHEntSize", FileHdr.SHEntSize);
-  IO.mapOptional("SHOffset", FileHdr.SHOffset);
+  IO.mapOptional("SHOff", FileHdr.SHOff);
   IO.mapOptional("SHNum", FileHdr.SHNum);
   IO.mapOptional("SHStrNdx", FileHdr.SHStrNdx);
 }
Index: test/tools/yaml2obj/elf-header-sh-fields.yaml
===================================================================
--- test/tools/yaml2obj/elf-header-sh-fields.yaml
+++ test/tools/yaml2obj/elf-header-sh-fields.yaml
@@ -35,7 +35,7 @@
   Type:      ET_REL
   Machine:   EM_X86_64
   SHEntSize: 64
-  SHOffset:  2
+  SHOff:     2
   SHNum:     3
   SHStrNdx:  4
 
@@ -56,6 +56,6 @@
   Type:      ET_REL
   Machine:   EM_X86_64
   SHEntSize: 1
-  SHOffset:  2
+  SHOff:     2
   SHNum:     3
   SHStrNdx:  4