diff --git a/packages/react-dom/src/client/ReactDOMComponent.js b/packages/react-dom/src/client/ReactDOMComponent.js
index 4ee57d32bc..4fded23f31 100644
--- a/packages/react-dom/src/client/ReactDOMComponent.js
+++ b/packages/react-dom/src/client/ReactDOMComponent.js
@@ -302,7 +302,9 @@ function setInitialDOMProperties(
       // Noop
     } else if (propKey === AUTOFOCUS) {
       // We polyfill it separately on the client during commit.
-      // We blacklist it here rather than in the property list because we emit it in SSR.
+      // We could have excluded it in the property list instead of
+      // adding a special case here, but then it wouldn't be emitted
+      // on server rendering (but we *do* want to emit it in SSR).
     } else if (registrationNameModules.hasOwnProperty(propKey)) {
       if (nextProp != null) {
         if (__DEV__ && typeof nextProp !== 'function') {
diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js
index 9045b5b66d..dbe8ea3bda 100644
--- a/packages/react-dom/src/events/BeforeInputEventPlugin.js
+++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js
@@ -314,7 +314,7 @@ function getNativeBeforeInputChars(topLevelType: TopLevelType, nativeEvent) {
 
       // If it's a spacebar character, assume that we have already handled
       // it at the keypress level and bail immediately. Android Chrome
-      // doesn't give us keycodes, so we need to blacklist it.
+      // doesn't give us keycodes, so we need to ignore it.
       if (chars === SPACEBAR_CHAR && hasSpaceKeypress) {
         return null;
       }
diff --git a/scripts/jest/config.build.js b/scripts/jest/config.build.js
index bada59a627..64e3c9ebf4 100644
--- a/scripts/jest/config.build.js
+++ b/scripts/jest/config.build.js
@@ -32,7 +32,7 @@ packages.forEach(name => {
 module.exports = Object.assign({}, baseConfig, {
   // Redirect imports to the compiled bundles
   moduleNameMapper,
-  // Don't run bundle tests on blacklisted -test.internal.* files
+  // Don't run bundle tests on -test.internal.* files
   testPathIgnorePatterns: ['/node_modules/', '-test.internal.js$'],
   // Exclude the build output from transforms
   transformIgnorePatterns: ['/node_modules/', '<rootDir>/build/'],
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index c6b9946f18..7fb8e8616a 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -250,9 +250,9 @@ function isProfilingBundleType(bundleType) {
   }
 }
 
-function blacklistFBJS() {
+function forbidFBJSImports() {
   return {
-    name: 'blacklistFBJS',
+    name: 'forbidFBJSImports',
     resolveId(importee, importer) {
       if (/^fbjs\//.test(importee)) {
         throw new Error(
@@ -304,7 +304,7 @@ function getPlugins(
     // Shim any modules that need forking in this environment.
     useForks(forks),
     // Ensure we don't try to bundle any fbjs modules.
-    blacklistFBJS(),
+    forbidFBJSImports(),
     // Use Node resolution mechanism.
     resolve({
       skip: externals,
diff --git a/scripts/rollup/forks.js b/scripts/rollup/forks.js
index e1ace58fa2..e559929789 100644
--- a/scripts/rollup/forks.js
+++ b/scripts/rollup/forks.js
@@ -162,7 +162,7 @@ const forks = Object.freeze({
     }
   },
 
-  // This logic is forked on www to blacklist warnings.
+  // This logic is forked on www to ignore some warnings.
   'shared/lowPriorityWarning': (bundleType, entry) => {
     switch (bundleType) {
       case FB_WWW_DEV:
@@ -174,7 +174,7 @@ const forks = Object.freeze({
     }
   },
 
-  // This logic is forked on www to blacklist warnings.
+  // This logic is forked on www to ignore some warnings.
   'shared/warningWithoutStack': (bundleType, entry) => {
     switch (bundleType) {
       case FB_WWW_DEV: