diff --git a/llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll b/llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll
--- a/llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll
+++ b/llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll
@@ -9,7 +9,7 @@
 ; Globals:
 @global = global i32 0, align 4
 @dyn_init_global = global i32 0, align 4
-@blacklisted_global = global i32 0, align 4
+@blocked_global = global i32 0, align 4
 @_ZZ4funcvE10static_var = internal global i32 0, align 4
 @.str = private unnamed_addr constant [14 x i8] c"Hello, world!\00", align 1
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_asan_globals.cpp, i8* null }]
@@ -66,7 +66,7 @@
 
 !0 = !{i32* @global, !6, !"global", i1 false, i1 false}
 !1 = !{i32* @dyn_init_global, !7, !"dyn_init_global", i1 true, i1 false}
-!2 = !{i32* @blacklisted_global, null, null, i1 false, i1 true}
+!2 = !{i32* @blocked_global, null, null, i1 false, i1 true}
 !3 = !{i32* @_ZZ4funcvE10static_var, !8, !"static_var", i1 false, i1 false}
 !4 = !{[14 x i8]* @.str, !9, !"<string literal>", i1 false, i1 false}
 
diff --git a/llvm/test/Instrumentation/AddressSanitizer/global_metadata_array.ll b/llvm/test/Instrumentation/AddressSanitizer/global_metadata_array.ll
--- a/llvm/test/Instrumentation/AddressSanitizer/global_metadata_array.ll
+++ b/llvm/test/Instrumentation/AddressSanitizer/global_metadata_array.ll
@@ -8,7 +8,7 @@
 ; Globals:
 @global = global i32 0, align 4
 @dyn_init_global = global i32 0, align 4
-@blacklisted_global = global i32 0, align 4
+@blocked_global = global i32 0, align 4
 @_ZZ4funcvE10static_var = internal global i32 0, align 4
 @.str = private unnamed_addr constant [14 x i8] c"Hello, world!\00", align 1
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_asan_globals.cpp, i8* null }]
@@ -59,7 +59,7 @@
 
 !0 = !{i32* @global, !6, !"global", i1 false, i1 false}
 !1 = !{i32* @dyn_init_global, !7, !"dyn_init_global", i1 true, i1 false}
-!2 = !{i32* @blacklisted_global, null, null, i1 false, i1 true}
+!2 = !{i32* @blocked_global, null, null, i1 false, i1 true}
 !3 = !{i32* @_ZZ4funcvE10static_var, !8, !"static_var", i1 false, i1 false}
 !4 = !{[14 x i8]* @.str, !9, !"<string literal>", i1 false, i1 false}
 
diff --git a/llvm/test/Instrumentation/AddressSanitizer/global_with_comdat.ll b/llvm/test/Instrumentation/AddressSanitizer/global_with_comdat.ll
--- a/llvm/test/Instrumentation/AddressSanitizer/global_with_comdat.ll
+++ b/llvm/test/Instrumentation/AddressSanitizer/global_with_comdat.ll
@@ -14,7 +14,7 @@
 ; Globals:
 @global = global i32 0, align 4
 @dyn_init_global = global i32 0, align 4
-@blacklisted_global = global i32 0, align 4
+@blocked_global = global i32 0, align 4
 @_ZZ4funcvE10static_var = internal global i32 0, align 4
 @.str = private unnamed_addr constant [14 x i8] c"Hello, world!\00", align 1
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_asan_globals.cpp, i8* null }]
@@ -86,7 +86,7 @@
 
 !0 = !{i32* @global, !6, !"global", i1 false, i1 false}
 !1 = !{i32* @dyn_init_global, !7, !"dyn_init_global", i1 true, i1 false}
-!2 = !{i32* @blacklisted_global, null, null, i1 false, i1 true}
+!2 = !{i32* @blocked_global, null, null, i1 false, i1 true}
 !3 = !{i32* @_ZZ4funcvE10static_var, !8, !"static_var", i1 false, i1 false}
 !4 = !{[14 x i8]* @.str, !9, !"<string literal>", i1 false, i1 false}
 
diff --git a/llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll b/llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll
--- a/llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll
+++ b/llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll
@@ -823,7 +823,7 @@
 ; CHECK: ret i32
 
 
-; Test PHINode instrumentation in blacklisted functions
+; Test PHINode instrumentation in ignorelisted functions
 
 define i32 @NoSanitizeMemoryPHI(i32 %x) {
 entry: