2 files changed, 11 insertions, 11 deletions

diff --git a/llvm/lib/Remarks/RemarkSerializer.cpp b/llvm/lib/Remarks/RemarkSerializer.cpp
index b1cfd098134..aa68b497ef2 100644
--- a/llvm/lib/Remarks/RemarkSerializer.cpp
+++ b/llvm/lib/Remarks/RemarkSerializer.cpp
@@ -16,21 +16,21 @@
 using namespace llvm;
 using namespace llvm::remarks;
 
-Expected<std::unique_ptr<Serializer>>
+Expected<std::unique_ptr<RemarkSerializer>>
 remarks::createRemarkSerializer(Format RemarksFormat, raw_ostream &OS) {
   switch (RemarksFormat) {
   case Format::Unknown:
     return createStringError(std::errc::invalid_argument,
                              "Unknown remark serializer format.");
   case Format::YAML:
-    return llvm::make_unique<YAMLSerializer>(OS);
+    return llvm::make_unique<YAMLRemarkSerializer>(OS);
   case Format::YAMLStrTab:
-    return llvm::make_unique<YAMLStrTabSerializer>(OS);
+    return llvm::make_unique<YAMLStrTabRemarkSerializer>(OS);
   }
   llvm_unreachable("Unknown remarks::Format enum");
 }
 
-Expected<std::unique_ptr<Serializer>>
+Expected<std::unique_ptr<RemarkSerializer>>
 remarks::createRemarkSerializer(Format RemarksFormat, raw_ostream &OS,
                                 remarks::StringTable StrTab) {
   switch (RemarksFormat) {
@@ -42,7 +42,7 @@ remarks::createRemarkSerializer(Format RemarksFormat, raw_ostream &OS,
                              "Unable to use a string table with the yaml "
                              "format. Use 'yaml-strtab' instead.");
   case Format::YAMLStrTab:
-    return llvm::make_unique<YAMLStrTabSerializer>(OS, std::move(StrTab));
+    return llvm::make_unique<YAMLStrTabRemarkSerializer>(OS, std::move(StrTab));
   }
   llvm_unreachable("Unknown remarks::Format enum");
 }
diff --git a/llvm/lib/Remarks/YAMLRemarkSerializer.cpp b/llvm/lib/Remarks/YAMLRemarkSerializer.cpp
index 1297fbc9843..c8a4ffe01d9 100644
--- a/llvm/lib/Remarks/YAMLRemarkSerializer.cpp
+++ b/llvm/lib/Remarks/YAMLRemarkSerializer.cpp
@@ -57,7 +57,7 @@ template <> struct MappingTraits<remarks::Remark *> {
       llvm_unreachable("Unknown remark type");
 
     if (Optional<StringTable> &StrTab =
-            reinterpret_cast<YAMLSerializer *>(io.getContext())->StrTab) {
+            reinterpret_cast<YAMLRemarkSerializer *>(io.getContext())->StrTab) {
       unsigned PassID = StrTab->add(Remark->PassName).first;
       unsigned NameID = StrTab->add(Remark->RemarkName).first;
       unsigned FunctionID = StrTab->add(Remark->FunctionName).first;
@@ -79,7 +79,7 @@ template <> struct MappingTraits<RemarkLocation> {
     unsigned Col = RL.SourceColumn;
 
     if (Optional<StringTable> &StrTab =
-            reinterpret_cast<YAMLSerializer *>(io.getContext())->StrTab) {
+            reinterpret_cast<YAMLRemarkSerializer *>(io.getContext())->StrTab) {
       unsigned FileID = StrTab->add(File).first;
       io.mapRequired("File", FileID);
     } else {
@@ -131,7 +131,7 @@ template <> struct MappingTraits<Argument> {
     assert(io.outputting() && "input not yet implemented");
 
     if (Optional<StringTable> &StrTab =
-            reinterpret_cast<YAMLSerializer *>(io.getContext())->StrTab) {
+            reinterpret_cast<YAMLRemarkSerializer *>(io.getContext())->StrTab) {
       auto ValueID = StrTab->add(A.Val).first;
       io.mapRequired(A.Key.data(), ValueID);
     } else if (StringRef(A.Val).count('\n') > 1) {
@@ -149,10 +149,10 @@ template <> struct MappingTraits<Argument> {
 
 LLVM_YAML_IS_SEQUENCE_VECTOR(Argument)
 
-YAMLSerializer::YAMLSerializer(raw_ostream &OS)
-    : Serializer(OS), YAMLOutput(OS, reinterpret_cast<void *>(this)) {}
+YAMLRemarkSerializer::YAMLRemarkSerializer(raw_ostream &OS)
+    : RemarkSerializer(OS), YAMLOutput(OS, reinterpret_cast<void *>(this)) {}
 
-void YAMLSerializer::emit(const Remark &Remark) {
+void YAMLRemarkSerializer::emit(const Remark &Remark) {
   // Again, YAMLTraits expect a non-const object for inputting, but we're not
   // using that here.
   auto R = const_cast<remarks::Remark *>(&Remark);