2 files changed, 10 insertions, 10 deletions
diff --git a/llvm/lib/ObjectYAML/ELFEmitter.cpp b/llvm/lib/ObjectYAML/ELFEmitter.cpp
index 1c7297bf5f09..f70f9e560140 100644
--- a/llvm/lib/ObjectYAML/ELFEmitter.cpp
+++ b/llvm/lib/ObjectYAML/ELFEmitter.cpp
@@ -252,7 +252,7 @@ template <class ELFT> class ELFState {
                            const ELFYAML::NoBitsSection &Section,
                            ContiguousBlobAccumulator &CBA);
   void writeSectionContent(Elf_Shdr &SHeader,
-                           const ELFYAML::CustomRawContentSection &Section,
+                           const ELFYAML::CustomSection &Section,
                            ContiguousBlobAccumulator &CBA);
   void writeSectionContent(Elf_Shdr &SHeader,
                            const ELFYAML::RawContentSection &Section,
@@ -862,7 +862,7 @@ void ELFState<ELFT>::initSectionHeaders(std::vector<Elf_Shdr> &SHeaders,
     if (!isa<ELFYAML::NoBitsSection>(Sec) && (Sec->Content || Sec->Size))
       SHeader.sh_size = writeContent(CBA, Sec->Content, Sec->Size);
 
-    if (auto S = dyn_cast<ELFYAML::CustomRawContentSection>(Sec)) {
+    if (auto S = dyn_cast<ELFYAML::CustomSection>(Sec)) {
       writeSectionContent(SHeader, *S, CBA);
     } else if (auto S = dyn_cast<ELFYAML::RawContentSection>(Sec)) {
       writeSectionContent(SHeader, *S, CBA);
@@ -1270,9 +1270,9 @@ void ELFState<ELFT>::writeSectionContent(
 }
 
 template <class ELFT>
-void ELFState<ELFT>::writeSectionContent(
-    Elf_Shdr &SHeader, const ELFYAML::CustomRawContentSection &Section,
-    ContiguousBlobAccumulator &CBA) {
+void ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
+                                         const ELFYAML::CustomSection &Section,
+                                         ContiguousBlobAccumulator &CBA) {
   if (Section.Info)
     SHeader.sh_info = *Section.Info;
 
diff --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp
index 83ee88e57d66..3f73637929ca 100644
--- a/llvm/lib/ObjectYAML/ELFYAML.cpp
+++ b/llvm/lib/ObjectYAML/ELFYAML.cpp
@@ -32,8 +32,8 @@ ELFYAML::Chunk::~Chunk() = default;
 ELFYAML::Opt::~Opt() = default;
 const char ELFYAML::Opt::ID = 'E';
 
-std::unique_ptr<ELFYAML::CustomRawContentSection>
-ELFYAML::Opt::makeCustomRawContentSection(StringRef Name) const {
+std::unique_ptr<ELFYAML::CustomSection>
+ELFYAML::Opt::makeCustomSection(StringRef Name) const {
   return nullptr;
 }
 
@@ -1599,11 +1599,11 @@ static bool isInteger(StringRef Val) {
 void MappingTraits<std::unique_ptr<ELFYAML::Chunk>>::mapping(
     IO &IO, std::unique_ptr<ELFYAML::Chunk> &Section) {
   if (!IO.outputting()) {
-    /// Prepare CustomRawContentSection by Name for ELFEmitter.
+    /// Prepare CustomSection by Name for ELFEmitter.
     if (auto *Opt = dyn_cast<ELFYAML::Opt>(IO.Opt)) {
       StringRef Name;
       IO.mapOptional("Name", Name);
-      if (auto S = Opt->makeCustomRawContentSection(Name)) {
+      if (auto S = Opt->makeCustomSection(Name)) {
         commonSectionMapping(IO, *S);
         S->sectionMapping(IO);
         Section = std::move(S);
@@ -1761,7 +1761,7 @@ void MappingTraits<std::unique_ptr<ELFYAML::Chunk>>::mapping(
         Section = std::make_unique<ELFYAML::RawContentSection>();
     }
 
-    if (auto S = dyn_cast<ELFYAML::CustomRawContentSection>(Section.get())) {
+    if (auto S = dyn_cast<ELFYAML::CustomSection>(Section.get())) {
       commonSectionMapping(IO, *S);
       S->sectionMapping(IO);
     } else if (auto S = dyn_cast<ELFYAML::RawContentSection>(Section.get()))