diff --git a/src/gen-use-table.py b/src/gen-use-table.py
index 35d9abf1e..930300364 100755
--- a/src/gen-use-table.py
+++ b/src/gen-use-table.py
@@ -18,7 +18,7 @@ import sys
 if len (sys.argv) != 8:
 	sys.exit (__doc__)
 
-BLACKLISTED_BLOCKS = [
+DISABLED_BLOCKS = [
 	'Samaritan',
 	'Thai',
 	'Lao',
@@ -137,7 +137,7 @@ for i,d in enumerate (data):
 		if not u in combined:
 			combined[u] = list (defaults)
 		combined[u][i] = v
-combined = {k:v for k,v in combined.items() if v[4] not in BLACKLISTED_BLOCKS}
+combined = {k:v for k,v in combined.items() if v[4] not in DISABLED_BLOCKS}
 data = combined
 del combined
 
diff --git a/src/hb-config.hh b/src/hb-config.hh
index 111058c8e..ad800f0f7 100644
--- a/src/hb-config.hh
+++ b/src/hb-config.hh
@@ -120,7 +120,7 @@
 #define HB_NO_CMAP_LEGACY_SUBTABLES
 #define HB_NO_FALLBACK_SHAPE
 #define HB_NO_OT_KERN
-#define HB_NO_OT_LAYOUT_BLACKLIST
+#define HB_NO_OT_LAYOUT_BLOCKLIST
 #define HB_NO_OT_SHAPE_FALLBACK
 #endif
 
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 55a6587cd..0f6728ca8 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -144,7 +144,7 @@ bool
 OT::GDEF::is_blocklisted (hb_blob_t *blob,
 			  hb_face_t *face) const
 {
-#ifdef HB_NO_OT_LAYOUT_BLACKLIST
+#ifdef HB_NO_OT_LAYOUT_BLOCKLIST
   return false;
 #endif
   /* The ugly business of blocklisting individual fonts' tables happen here!
@@ -383,7 +383,7 @@ bool
 OT::GSUB::is_blocklisted (hb_blob_t *blob HB_UNUSED,
 			  hb_face_t *face) const
 {
-#ifdef HB_NO_OT_LAYOUT_BLACKLIST
+#ifdef HB_NO_OT_LAYOUT_BLOCKLIST
   return false;
 #endif
   return false;
@@ -393,7 +393,7 @@ bool
 OT::GPOS::is_blocklisted (hb_blob_t *blob HB_UNUSED,
 			  hb_face_t *face HB_UNUSED) const
 {
-#ifdef HB_NO_OT_LAYOUT_BLACKLIST
+#ifdef HB_NO_OT_LAYOUT_BLOCKLIST
   return false;
 #endif
   return false;