diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s b/llvm/test/tools/llvm-cfi-verify/X86/ignorelist-expected-unprotected.s
rename from llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s
rename to llvm/test/tools/llvm-cfi-verify/X86/ignorelist-expected-unprotected.s
--- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s
+++ b/llvm/test/tools/llvm-cfi-verify/X86/ignorelist-expected-unprotected.s
@@ -1,11 +1,11 @@
 # RUN: llvm-mc %S/Inputs/unprotected-lineinfo.s -filetype obj \
 # RUN:         -triple x86_64-linux-elf -o %t.o
-# RUN: echo "src:*tiny*" > %t.blacklist.txt
-# RUN: llvm-cfi-verify %t.o %t.blacklist.txt | FileCheck %s
+# RUN: echo "src:*tiny*" > %t.ignorelist.txt
+# RUN: llvm-cfi-verify %t.o %t.ignorelist.txt | FileCheck %s
 
 # CHECK-LABEL: {{^Instruction: .* \(FAIL_BAD_CONDITIONAL_BRANCH\)}}
 # CHECK-NEXT: tiny.cc:11
-# CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}}
+# CHECK-NEXT: {{^Ignorelist Match:.*ignorelist\.txt:1$}}
 # CHECK-NEXT: ====> Expected Unprotected
 
 # CHECK: Expected Protected: 0 (0.00%)
@@ -13,5 +13,5 @@
 # CHECK: Expected Unprotected: 1 (100.00%)
 # CHECK: Unexpected Unprotected (BAD): 0 (0.00%)
 
-# Source: (blacklist.txt):
+# Source: (ignorelist.txt):
 #   src:*tiny*
diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s b/llvm/test/tools/llvm-cfi-verify/X86/ignorelist-match-fun.s
rename from llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s
rename to llvm/test/tools/llvm-cfi-verify/X86/ignorelist-match-fun.s
--- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s
+++ b/llvm/test/tools/llvm-cfi-verify/X86/ignorelist-match-fun.s
@@ -1,11 +1,11 @@
 # RUN: llvm-mc %S/Inputs/unprotected-fullinfo.s -filetype obj \
 # RUN:         -triple x86_64-linux-elf -o %t.o
-# RUN: echo "fun:*main*" > %t.blacklist.txt
-# RUN: llvm-cfi-verify %t.o %t.blacklist.txt | FileCheck %s
+# RUN: echo "fun:*main*" > %t.ignorelist.txt
+# RUN: llvm-cfi-verify %t.o %t.ignorelist.txt | FileCheck %s
 
 # CHECK-LABEL: {{^Instruction: .* \(FAIL_BAD_CONDITIONAL_BRANCH\)}}
 # CHECK-NEXT: tiny.cc:11
-# CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}}
+# CHECK-NEXT: {{^Ignorelist Match:.*ignorelist\.txt:1$}}
 # CHECK-NEXT: ====> Expected Unprotected
 
 # CHECK: Expected Protected: 0 (0.00%)
@@ -13,5 +13,5 @@
 # CHECK: Expected Unprotected: 1 (100.00%)
 # CHECK: Unexpected Unprotected (BAD): 0 (0.00%)
 
-# Source: (blacklist.txt):
+# Source: (ignorelist.txt):
 #   fun:*main*
diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s b/llvm/test/tools/llvm-cfi-verify/X86/ignorelist-unexpected-protected.s
rename from llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s
rename to llvm/test/tools/llvm-cfi-verify/X86/ignorelist-unexpected-protected.s
--- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s
+++ b/llvm/test/tools/llvm-cfi-verify/X86/ignorelist-unexpected-protected.s
@@ -1,11 +1,11 @@
 # RUN: llvm-mc %S/Inputs/protected-lineinfo.s -filetype obj \
 # RUN:         -triple x86_64-linux-elf -o %t.o
-# RUN: echo "src:*tiny*" > %t.blacklist.txt
-# RUN: llvm-cfi-verify %t.o %t.blacklist.txt | FileCheck %s
+# RUN: echo "src:*tiny*" > %t.ignorelist.txt
+# RUN: llvm-cfi-verify %t.o %t.ignorelist.txt | FileCheck %s
 
 # CHECK-LABEL: {{^Instruction: .* \(PROTECTED\)}}
 # CHECK-NEXT: tiny.cc:11
-# CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}}
+# CHECK-NEXT: {{^Ignorelist Match:.*ignorelist\.txt:1$}}
 # CHECK-NEXT: ====> Unexpected Protected
 
 # CHECK: Expected Protected: 0 (0.00%)
@@ -13,5 +13,5 @@
 # CHECK: Expected Unprotected: 0 (0.00%)
 # CHECK: Unexpected Unprotected (BAD): 0 (0.00%)
 
-# Source: (blacklist.txt):
+# Source: (ignorelist.txt):
 #   src:*tiny*
diff --git a/llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp b/llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp
--- a/llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp
+++ b/llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp
@@ -36,10 +36,10 @@
 
 cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input file>"),
                                    cl::Required, cl::cat(CFIVerifyCategory));
-cl::opt<std::string> BlacklistFilename(cl::Positional,
-                                       cl::desc("[blacklist file]"),
-                                       cl::init("-"),
-                                       cl::cat(CFIVerifyCategory));
+cl::opt<std::string> IgnorelistFilename(cl::Positional,
+                                        cl::desc("[ignorelist file]"),
+                                        cl::init("-"),
+                                        cl::cat(CFIVerifyCategory));
 cl::opt<bool> PrintGraphs(
     "print-graphs",
     cl::desc("Print graphs around indirect CF instructions in DOT format."),
@@ -103,7 +103,7 @@
 static void printInstructionStatus(unsigned BlameLine, bool CFIProtected,
                                    const DILineInfo &LineInfo) {
   if (BlameLine) {
-    outs() << "Blacklist Match: " << BlacklistFilename << ":" << BlameLine
+    outs() << "Ignorelist Match: " << IgnorelistFilename << ":" << BlameLine
            << "\n";
     if (CFIProtected)
       outs() << "====> Unexpected Protected\n";
@@ -240,9 +240,9 @@
   if (!SpecialCaseList)
     return;
 
-  outs() << "\nBlacklist Results:\n";
+  outs() << "\nIgnorelist Results:\n";
   for (const auto &KV : BlameCounter) {
-    outs() << "  " << BlacklistFilename << ":" << KV.first << " affects "
+    outs() << "  " << IgnorelistFilename << ":" << KV.first << " affects "
            << KV.second << " indirect CF instructions.\n";
   }
 }
@@ -265,12 +265,12 @@
     PrintBlameContext.setValue(PrintBlameContextAll);
 
   std::unique_ptr<SpecialCaseList> SpecialCaseList;
-  if (BlacklistFilename != "-") {
+  if (IgnorelistFilename != "-") {
     std::string Error;
-    SpecialCaseList = SpecialCaseList::create({BlacklistFilename},
+    SpecialCaseList = SpecialCaseList::create({IgnorelistFilename},
                                               *vfs::getRealFileSystem(), Error);
     if (!SpecialCaseList) {
-      errs() << "Failed to get blacklist: " << Error << "\n";
+      errs() << "Failed to get ignorelist: " << Error << "\n";
       exit(EXIT_FAILURE);
     }
   }