diff --git a/llvm/utils/gn/secondary/llvm/lib/OptRemarks/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/OptRemarks/BUILD.gn
deleted file mode 100644
index cd80b85ae15a..000000000000
--- a/llvm/utils/gn/secondary/llvm/lib/OptRemarks/BUILD.gn
+++ /dev/null
@@ -1,10 +0,0 @@
-static_library("OptRemarks") {
-  output_name = "LLVMOptRemarks"
-  deps = [
-    "//llvm/lib/Support",
-  ]
-
-  sources = [
-    "OptRemarksParser.cpp",
-  ]
-}
diff --git a/llvm/utils/gn/secondary/llvm/lib/Remarks/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Remarks/BUILD.gn
new file mode 100644
index 000000000000..2c4f3374f0e3
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/lib/Remarks/BUILD.gn
@@ -0,0 +1,10 @@
+static_library("Remarks") {
+  output_name = "LLVMRemarks"
+  deps = [
+    "//llvm/lib/Support",
+  ]
+
+  sources = [
+    "RemarkParser.cpp",
+  ]
+}
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
index 70b2e1be872f..ea21b5c8ee92 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
@@ -3,7 +3,7 @@ executable("llvm-opt-report") {
     "//llvm/lib/Demangle",
     "//llvm/lib/IR",
     "//llvm/lib/Object",
-    "//llvm/lib/OptRemarks",
+    "//llvm/lib/Remarks",
     "//llvm/lib/Support",
   ]
   sources = [
diff --git a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
index b46d4027db1d..9344cbbd1a2d 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -25,10 +25,10 @@ group("unittests") {
     "MI:MITests",
     "Object:ObjectTests",
     "ObjectYAML:ObjectYAMLTests",
-    "OptRemarks:OptRemarksTests",
     "Option:OptionTests",
     "Passes:PluginsTests",
     "ProfileData:ProfileDataTests",
+    "Remarks:RemarksTests",
     "Support:SupportTests",
     "Support/DynamicLibrary:DynamicLibraryTests",
     "TextAPI:TextAPITests",
diff --git a/llvm/utils/gn/secondary/llvm/unittests/OptRemarks/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
similarity index 53%
rename from llvm/utils/gn/secondary/llvm/unittests/OptRemarks/BUILD.gn
rename to llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
index 785e78b0e77b..a4c6cb546740 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/OptRemarks/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Remarks/BUILD.gn
@@ -1,11 +1,11 @@
 import("//llvm/utils/unittest/unittest.gni")
 
-unittest("OptRemarksTests") {
+unittest("RemarksTests") {
   deps = [
-    "//llvm/lib/OptRemarks",
+    "//llvm/lib/Remarks",
     "//llvm/lib/Support",
   ]
   sources = [
-    "OptRemarksParsingTest.cpp",
+    "RemarksParsingTest.cpp",
   ]
 }