From 57ebe685ffb0409fbd87fadf89a72a34e390f947 Mon Sep 17 00:00:00 2001
From: Kevin Dew <kevindew@me.com>
Date: Sat, 8 Aug 2020 21:02:54 +0100
Subject: [PATCH] Re-instate whitelist/blacklist/requirelist rules

The aliasing approach taken for these rule renaming presented user
experience problems [1]. To resolve these problems the preference is to
revert on the aliasing strategy and instead return to a deprecation
strategy. The first step towards this is re-instating these rules.

As per the preference of jeddy3 [2] these rules are re-instated using a copy
and paste strategy, with the expectation these will be removed in the
next major release. An approach that didn't involve copy and pasting was
previously introduced in [3] and could be looked at again if maintaining this
duplicate code proves problematic.

[1]: https://github.com/stylelint/stylelint/issues/4854#issuecomment-654332844
[2]: https://github.com/stylelint/stylelint/issues/4854#issuecomment-670935654
[3]: https://github.com/stylelint/stylelint/commit/e93e44c938d77021eec4893fc20327337a60d49f
---
 lib/__tests__/aliasedRules.test.js            | 41 ---------
 lib/__tests__/integration.test.js             | 13 ---
 lib/rules/at-rule-allowed-list/README.md      |  2 +-
 lib/rules/at-rule-blacklist/README.md         |  4 +-
 lib/rules/at-rule-blacklist/index.js          |  2 +-
 lib/rules/at-rule-disallowed-list/README.md   |  2 +-
 .../at-rule-property-required-list/README.md  |  2 +-
 .../at-rule-property-requirelist/README.md    |  4 +-
 .../at-rule-property-requirelist/index.js     |  2 +-
 lib/rules/at-rule-whitelist/README.md         |  4 +-
 lib/rules/at-rule-whitelist/index.js          |  2 +-
 lib/rules/comment-word-blacklist/README.md    |  4 +-
 lib/rules/comment-word-blacklist/index.js     |  2 +-
 .../comment-word-disallowed-list/README.md    |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 lib/rules/function-allowed-list/README.md     |  2 +-
 lib/rules/function-blacklist/README.md        |  4 +-
 lib/rules/function-blacklist/index.js         |  2 +-
 lib/rules/function-disallowed-list/README.md  |  2 +-
 .../README.md                                 |  2 +-
 .../function-url-scheme-blacklist/README.md   |  4 +-
 .../function-url-scheme-blacklist/index.js    |  2 +-
 .../README.md                                 |  2 +-
 .../function-url-scheme-whitelist/README.md   |  4 +-
 .../function-url-scheme-whitelist/index.js    |  2 +-
 lib/rules/function-whitelist/README.md        |  4 +-
 lib/rules/function-whitelist/index.js         |  2 +-
 lib/rules/index.js                            | 90 ++++++-------------
 .../media-feature-name-allowed-list/README.md |  2 +-
 .../media-feature-name-blacklist/README.md    |  4 +-
 .../media-feature-name-blacklist/index.js     |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 .../media-feature-name-whitelist/README.md    |  4 +-
 .../media-feature-name-whitelist/index.js     |  2 +-
 lib/rules/property-allowed-list/README.md     |  2 +-
 lib/rules/property-blacklist/README.md        |  4 +-
 lib/rules/property-blacklist/index.js         |  2 +-
 lib/rules/property-disallowed-list/README.md  |  2 +-
 lib/rules/property-whitelist/README.md        |  4 +-
 lib/rules/property-whitelist/index.js         |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 .../README.md                                 |  2 +-
 .../selector-combinator-blacklist/README.md   |  4 +-
 .../selector-combinator-blacklist/index.js    |  2 +-
 .../README.md                                 |  2 +-
 .../selector-combinator-whitelist/README.md   |  4 +-
 .../selector-combinator-whitelist/index.js    |  2 +-
 .../README.md                                 |  2 +-
 .../selector-pseudo-class-blacklist/README.md |  4 +-
 .../selector-pseudo-class-blacklist/index.js  |  2 +-
 .../README.md                                 |  2 +-
 .../selector-pseudo-class-whitelist/README.md |  4 +-
 .../selector-pseudo-class-whitelist/index.js  |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 .../README.md                                 |  2 +-
 .../README.md                                 |  4 +-
 .../index.js                                  |  2 +-
 lib/rules/unit-allowed-list/README.md         |  2 +-
 lib/rules/unit-blacklist/README.md            |  4 +-
 lib/rules/unit-blacklist/index.js             |  2 +-
 lib/rules/unit-disallowed-list/README.md      |  2 +-
 lib/rules/unit-whitelist/README.md            |  4 +-
 lib/rules/unit-whitelist/index.js             |  2 +-
 lib/utils/__tests__/checkAgainstRule.test.js  | 20 -----
 85 files changed, 108 insertions(+), 272 deletions(-)
 delete mode 100644 lib/__tests__/aliasedRules.test.js

diff --git a/lib/__tests__/aliasedRules.test.js b/lib/__tests__/aliasedRules.test.js
deleted file mode 100644
index 50a2eecaa4..0000000000
--- a/lib/__tests__/aliasedRules.test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-'use strict';
-
-const rules = require('../rules');
-
-const whitelistAndBlacklistRulePrefixes = [
-	'at-rule',
-	'declaration-property-unit',
-	'declaration-property-value',
-	'function',
-	'function-url-scheme',
-	'media-feature-name',
-	'property',
-	'selector-attribute-operator',
-	'selector-combinator',
-	'selector-pseudo-class',
-	'selector-pseudo-element',
-	'unit',
-];
-
-const whitelistRulePrefixes = whitelistAndBlacklistRulePrefixes.concat([
-	'media-feature-name-value',
-]);
-
-whitelistRulePrefixes.forEach((prefix) => {
-	it(`aliases ${prefix}-whitelist to ${prefix}-allowed-list`, () =>
-		expect(rules[`${prefix}-whitelist`].ruleName).toEqual(`${prefix}-allowed-list`));
-});
-
-const blacklistRulePrefixes = whitelistAndBlacklistRulePrefixes.concat(['comment-word']);
-
-blacklistRulePrefixes.forEach((prefix) => {
-	it(`aliases ${prefix}-blacklist to ${prefix}-disallowed-list`, () =>
-		expect(rules[`${prefix}-blacklist`].ruleName).toEqual(`${prefix}-disallowed-list`));
-});
-
-const requirelistRulePrefixes = ['at-rule-property'];
-
-requirelistRulePrefixes.forEach((prefix) => {
-	it(`aliases ${prefix}-requirelist to ${prefix}-required-list`, () =>
-		expect(rules[`${prefix}-requirelist`].ruleName).toEqual(`${prefix}-required-list`));
-});
diff --git a/lib/__tests__/integration.test.js b/lib/__tests__/integration.test.js
index df73623bf7..feddcbf36a 100644
--- a/lib/__tests__/integration.test.js
+++ b/lib/__tests__/integration.test.js
@@ -143,19 +143,6 @@ it('Scss integration test', () => {
 		});
 });
 
-it('rule aliasing integration test', () => {
-	return postcss()
-		.use(stylelint({ rules: { 'unit-blacklist': ['px'] } }))
-		.process('a { top: 10px; }', { from: undefined })
-		.then((result) => {
-			const error = result.messages[0];
-
-			expect(error).toBeTruthy();
-			expect(error.rule).toBe('unit-disallowed-list');
-			expect(error.text).toBe('Unexpected unit "px" (unit-disallowed-list)');
-		});
-});
-
 describe('integration test null option', () => {
 	let results;
 
diff --git a/lib/rules/at-rule-allowed-list/README.md b/lib/rules/at-rule-allowed-list/README.md
index 8755baf322..74fe4d3f6e 100644
--- a/lib/rules/at-rule-allowed-list/README.md
+++ b/lib/rules/at-rule-allowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of allowed at-rules.
  * At-rules like this */
 ```
 
-This rule was previously called, and is aliased as, `at-rule-whitelist`.
+This rule was previously called `at-rule-whitelist`.
 
 ## Options
 
diff --git a/lib/rules/at-rule-blacklist/README.md b/lib/rules/at-rule-blacklist/README.md
index 0baefb6134..ddbd9093dd 100644
--- a/lib/rules/at-rule-blacklist/README.md
+++ b/lib/rules/at-rule-blacklist/README.md
@@ -1,4 +1,4 @@
-# at-rule-disallowed-list
+# at-rule-blacklist
 
 Specify a list of disallowed at-rules.
 
@@ -9,8 +9,6 @@ Specify a list of disallowed at-rules.
  * At-rules like this */
 ```
 
-This rule was previously called, and is aliased as, `at-rule-blacklist`.
-
 ## Options
 
 `array|string`: `["array", "of", "unprefixed", "at-rules"]|"at-rule"`
diff --git a/lib/rules/at-rule-blacklist/index.js b/lib/rules/at-rule-blacklist/index.js
index f593ecdb29..94260622b6 100644
--- a/lib/rules/at-rule-blacklist/index.js
+++ b/lib/rules/at-rule-blacklist/index.js
@@ -9,7 +9,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'at-rule-disallowed-list';
+const ruleName = 'at-rule-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (name) => `Unexpected at-rule "${name}"`,
diff --git a/lib/rules/at-rule-disallowed-list/README.md b/lib/rules/at-rule-disallowed-list/README.md
index 0baefb6134..3163f609c2 100644
--- a/lib/rules/at-rule-disallowed-list/README.md
+++ b/lib/rules/at-rule-disallowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of disallowed at-rules.
  * At-rules like this */
 ```
 
-This rule was previously called, and is aliased as, `at-rule-blacklist`.
+This rule was previously called `at-rule-blacklist`.
 
 ## Options
 
diff --git a/lib/rules/at-rule-property-required-list/README.md b/lib/rules/at-rule-property-required-list/README.md
index 002bf1b02c..a6989fad78 100644
--- a/lib/rules/at-rule-property-required-list/README.md
+++ b/lib/rules/at-rule-property-required-list/README.md
@@ -9,7 +9,7 @@ Specify a list of required properties for an at-rule.
  *  At-rule and required property names */
 ```
 
-This rule was previously called, and is aliased as, `at-rule-requirelist`.
+This rule was previously called `at-rule-requirelist`.
 
 ## Options
 
diff --git a/lib/rules/at-rule-property-requirelist/README.md b/lib/rules/at-rule-property-requirelist/README.md
index 002bf1b02c..5095d5a4aa 100644
--- a/lib/rules/at-rule-property-requirelist/README.md
+++ b/lib/rules/at-rule-property-requirelist/README.md
@@ -1,4 +1,4 @@
-# at-rule-property-required-list
+# at-rule-property-requirelist
 
 Specify a list of required properties for an at-rule.
 
@@ -9,8 +9,6 @@ Specify a list of required properties for an at-rule.
  *  At-rule and required property names */
 ```
 
-This rule was previously called, and is aliased as, `at-rule-requirelist`.
-
 ## Options
 
 `object`: `{ "at-rule-name": ["array", "of", "properties"] }`
diff --git a/lib/rules/at-rule-property-requirelist/index.js b/lib/rules/at-rule-property-requirelist/index.js
index e6f0fbe04b..27f9a1bb5e 100644
--- a/lib/rules/at-rule-property-requirelist/index.js
+++ b/lib/rules/at-rule-property-requirelist/index.js
@@ -8,7 +8,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'at-rule-property-required-list';
+const ruleName = 'at-rule-property-requirelist';
 
 const messages = ruleMessages(ruleName, {
 	expected: (property, atRule) => `Expected property "${property}" for at-rule "${atRule}"`,
diff --git a/lib/rules/at-rule-whitelist/README.md b/lib/rules/at-rule-whitelist/README.md
index 8755baf322..bcda7d7375 100644
--- a/lib/rules/at-rule-whitelist/README.md
+++ b/lib/rules/at-rule-whitelist/README.md
@@ -1,4 +1,4 @@
-# at-rule-allowed-list
+# at-rule-whitelist
 
 Specify a list of allowed at-rules.
 
@@ -9,8 +9,6 @@ Specify a list of allowed at-rules.
  * At-rules like this */
 ```
 
-This rule was previously called, and is aliased as, `at-rule-whitelist`.
-
 ## Options
 
 `array|string`: `["array", "of", "unprefixed", "at-rules"]|"at-rule"`
diff --git a/lib/rules/at-rule-whitelist/index.js b/lib/rules/at-rule-whitelist/index.js
index 65f950d34c..07fe77de6d 100644
--- a/lib/rules/at-rule-whitelist/index.js
+++ b/lib/rules/at-rule-whitelist/index.js
@@ -9,7 +9,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'at-rule-allowed-list';
+const ruleName = 'at-rule-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (name) => `Unexpected at-rule "${name}"`,
diff --git a/lib/rules/comment-word-blacklist/README.md b/lib/rules/comment-word-blacklist/README.md
index 5578dc894a..e662d3800d 100644
--- a/lib/rules/comment-word-blacklist/README.md
+++ b/lib/rules/comment-word-blacklist/README.md
@@ -1,4 +1,4 @@
-# comment-word-disallowed-list
+# comment-word-blacklist
 
 Specify a list of disallowed words within comments.
 
@@ -9,8 +9,6 @@ Specify a list of disallowed words within comments.
  * These three words */
 ```
 
-This rule was previously called, and is aliased as, `comment-word-blacklist`.
-
 **Caveat:** Comments within _selector and value lists_ are currently ignored.
 
 ## Options
diff --git a/lib/rules/comment-word-blacklist/index.js b/lib/rules/comment-word-blacklist/index.js
index fab060c50a..fa05710599 100644
--- a/lib/rules/comment-word-blacklist/index.js
+++ b/lib/rules/comment-word-blacklist/index.js
@@ -9,7 +9,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'comment-word-disallowed-list';
+const ruleName = 'comment-word-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (pattern) => `Unexpected word matching pattern "${pattern}"`,
diff --git a/lib/rules/comment-word-disallowed-list/README.md b/lib/rules/comment-word-disallowed-list/README.md
index 5578dc894a..e873e96588 100644
--- a/lib/rules/comment-word-disallowed-list/README.md
+++ b/lib/rules/comment-word-disallowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of disallowed words within comments.
  * These three words */
 ```
 
-This rule was previously called, and is aliased as, `comment-word-blacklist`.
+This rule was previously called `comment-word-blacklist`.
 
 **Caveat:** Comments within _selector and value lists_ are currently ignored.
 
diff --git a/lib/rules/declaration-property-unit-allowed-list/README.md b/lib/rules/declaration-property-unit-allowed-list/README.md
index 8ff7d6d235..a033aba18f 100644
--- a/lib/rules/declaration-property-unit-allowed-list/README.md
+++ b/lib/rules/declaration-property-unit-allowed-list/README.md
@@ -9,7 +9,7 @@ a { width: 100px; }
  * These properties and these units */
 ```
 
-This rule was previously called, and is aliased as, `declaration-property-unit-whitelist`.
+This rule was previously called `declaration-property-unit-whitelist`.
 
 ## Options
 
diff --git a/lib/rules/declaration-property-unit-blacklist/README.md b/lib/rules/declaration-property-unit-blacklist/README.md
index 50d0cc81f0..1f017091ed 100644
--- a/lib/rules/declaration-property-unit-blacklist/README.md
+++ b/lib/rules/declaration-property-unit-blacklist/README.md
@@ -1,4 +1,4 @@
-# declaration-property-unit-disallowed-list
+# declaration-property-unit-blacklist
 
 Specify a list of disallowed property and unit pairs within declarations.
 
@@ -9,8 +9,6 @@ a { width: 100px; }
  * These properties and these units */
 ```
 
-This rule was previously called, and is aliased as, `declaration-property-unit-blacklist`.
-
 ## Options
 
 `object`: `{ "unprefixed-property-name": ["array", "of", "units"] }`
diff --git a/lib/rules/declaration-property-unit-blacklist/index.js b/lib/rules/declaration-property-unit-blacklist/index.js
index e4924d7be5..24a31502f4 100644
--- a/lib/rules/declaration-property-unit-blacklist/index.js
+++ b/lib/rules/declaration-property-unit-blacklist/index.js
@@ -12,7 +12,7 @@ const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 const valueParser = require('postcss-value-parser');
 
-const ruleName = 'declaration-property-unit-disallowed-list';
+const ruleName = 'declaration-property-unit-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (property, unit) => `Unexpected unit "${unit}" for property "${property}"`,
diff --git a/lib/rules/declaration-property-unit-disallowed-list/README.md b/lib/rules/declaration-property-unit-disallowed-list/README.md
index 50d0cc81f0..6468a9facb 100644
--- a/lib/rules/declaration-property-unit-disallowed-list/README.md
+++ b/lib/rules/declaration-property-unit-disallowed-list/README.md
@@ -9,7 +9,7 @@ a { width: 100px; }
  * These properties and these units */
 ```
 
-This rule was previously called, and is aliased as, `declaration-property-unit-blacklist`.
+This rule was previously called `declaration-property-unit-blacklist`.
 
 ## Options
 
diff --git a/lib/rules/declaration-property-unit-whitelist/README.md b/lib/rules/declaration-property-unit-whitelist/README.md
index 8ff7d6d235..96c74920b1 100644
--- a/lib/rules/declaration-property-unit-whitelist/README.md
+++ b/lib/rules/declaration-property-unit-whitelist/README.md
@@ -1,4 +1,4 @@
-# declaration-property-unit-allowed-list
+# declaration-property-unit-whitelist
 
 Specify a list of allowed property and unit pairs within declarations.
 
@@ -9,8 +9,6 @@ a { width: 100px; }
  * These properties and these units */
 ```
 
-This rule was previously called, and is aliased as, `declaration-property-unit-whitelist`.
-
 ## Options
 
 `object`: `{ "unprefixed-property-name": ["array", "of", "units"] }`
diff --git a/lib/rules/declaration-property-unit-whitelist/index.js b/lib/rules/declaration-property-unit-whitelist/index.js
index f57ad17b66..873d6c2e63 100644
--- a/lib/rules/declaration-property-unit-whitelist/index.js
+++ b/lib/rules/declaration-property-unit-whitelist/index.js
@@ -12,7 +12,7 @@ const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 const valueParser = require('postcss-value-parser');
 
-const ruleName = 'declaration-property-unit-allowed-list';
+const ruleName = 'declaration-property-unit-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (property, unit) => `Unexpected unit "${unit}" for property "${property}"`,
diff --git a/lib/rules/declaration-property-value-allowed-list/README.md b/lib/rules/declaration-property-value-allowed-list/README.md
index 32ff898097..235b2d0172 100644
--- a/lib/rules/declaration-property-value-allowed-list/README.md
+++ b/lib/rules/declaration-property-value-allowed-list/README.md
@@ -9,7 +9,7 @@ a { text-transform: uppercase; }
  * These properties and these values */
 ```
 
-This rule was previously called, and is aliased as, `declaration-property-value-whitelist`.
+This rule was previously called `declaration-property-value-whitelist`.
 
 ## Options
 
diff --git a/lib/rules/declaration-property-value-blacklist/README.md b/lib/rules/declaration-property-value-blacklist/README.md
index ea583a2f9f..bb9c11d6d2 100644
--- a/lib/rules/declaration-property-value-blacklist/README.md
+++ b/lib/rules/declaration-property-value-blacklist/README.md
@@ -1,4 +1,4 @@
-# declaration-property-value-disallowed-list
+# declaration-property-value-blacklist
 
 Specify a list of disallowed property and value pairs within declarations.
 
@@ -9,8 +9,6 @@ a { text-transform: uppercase; }
  * These properties and these values */
 ```
 
-This rule was previously called, and is aliased as, `declaration-property-value-blacklist`.
-
 ## Options
 
 `object`: `{ "unprefixed-property-name": ["array", "of", "values"], "unprefixed-property-name": ["/regex/", "non-regex", /regex/] }`
diff --git a/lib/rules/declaration-property-value-blacklist/index.js b/lib/rules/declaration-property-value-blacklist/index.js
index 21f3b7f0c9..b044064d78 100644
--- a/lib/rules/declaration-property-value-blacklist/index.js
+++ b/lib/rules/declaration-property-value-blacklist/index.js
@@ -9,7 +9,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'declaration-property-value-disallowed-list';
+const ruleName = 'declaration-property-value-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (property, value) => `Unexpected value "${value}" for property "${property}"`,
diff --git a/lib/rules/declaration-property-value-disallowed-list/README.md b/lib/rules/declaration-property-value-disallowed-list/README.md
index ea583a2f9f..e22764879c 100644
--- a/lib/rules/declaration-property-value-disallowed-list/README.md
+++ b/lib/rules/declaration-property-value-disallowed-list/README.md
@@ -9,7 +9,7 @@ a { text-transform: uppercase; }
  * These properties and these values */
 ```
 
-This rule was previously called, and is aliased as, `declaration-property-value-blacklist`.
+This rule was previously called `declaration-property-value-blacklist`.
 
 ## Options
 
diff --git a/lib/rules/declaration-property-value-whitelist/README.md b/lib/rules/declaration-property-value-whitelist/README.md
index 32ff898097..83165b5bb0 100644
--- a/lib/rules/declaration-property-value-whitelist/README.md
+++ b/lib/rules/declaration-property-value-whitelist/README.md
@@ -1,4 +1,4 @@
-# declaration-property-value-allowed-list
+# declaration-property-value-whitelist
 
 Specify a list of allowed property and value pairs within declarations.
 
@@ -9,8 +9,6 @@ a { text-transform: uppercase; }
  * These properties and these values */
 ```
 
-This rule was previously called, and is aliased as, `declaration-property-value-whitelist`.
-
 ## Options
 
 `object`: `{ "unprefixed-property-name": ["array", "of", "values"], "unprefixed-property-name": ["/regex/", "non-regex"] }`
diff --git a/lib/rules/declaration-property-value-whitelist/index.js b/lib/rules/declaration-property-value-whitelist/index.js
index 227bad0f83..dbac8a326a 100644
--- a/lib/rules/declaration-property-value-whitelist/index.js
+++ b/lib/rules/declaration-property-value-whitelist/index.js
@@ -9,7 +9,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'declaration-property-value-allowed-list';
+const ruleName = 'declaration-property-value-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (property, value) => `Unexpected value "${value}" for property "${property}"`,
diff --git a/lib/rules/function-allowed-list/README.md b/lib/rules/function-allowed-list/README.md
index e8229a835a..19e4764f2b 100644
--- a/lib/rules/function-allowed-list/README.md
+++ b/lib/rules/function-allowed-list/README.md
@@ -9,7 +9,7 @@ a { transform: scale(1); }
  * This function */
 ```
 
-This rule was previously called, and is aliased as, `function-whitelist`.
+This rule was previously called `function-whitelist`.
 
 ## Options
 
diff --git a/lib/rules/function-blacklist/README.md b/lib/rules/function-blacklist/README.md
index 8f622db3ae..99bed31821 100644
--- a/lib/rules/function-blacklist/README.md
+++ b/lib/rules/function-blacklist/README.md
@@ -1,4 +1,4 @@
-# function-disallowed-list
+# function-blacklist
 
 Specify a list of disallowed functions.
 
@@ -9,8 +9,6 @@ a { transform: scale(1); }
  * This function */
 ```
 
-This rule was previously called, and is aliased as, `function-blacklist`.
-
 ## Options
 
 `array|string`: `["array", "of", "unprefixed", /functions/ or "regex"]|"function"|"/regex/"`
diff --git a/lib/rules/function-blacklist/index.js b/lib/rules/function-blacklist/index.js
index 5f30bb862a..e99e2bd8b0 100644
--- a/lib/rules/function-blacklist/index.js
+++ b/lib/rules/function-blacklist/index.js
@@ -12,7 +12,7 @@ const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 const valueParser = require('postcss-value-parser');
 
-const ruleName = 'function-disallowed-list';
+const ruleName = 'function-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (name) => `Unexpected function "${name}"`,
diff --git a/lib/rules/function-disallowed-list/README.md b/lib/rules/function-disallowed-list/README.md
index 8f622db3ae..527827339a 100644
--- a/lib/rules/function-disallowed-list/README.md
+++ b/lib/rules/function-disallowed-list/README.md
@@ -9,7 +9,7 @@ a { transform: scale(1); }
  * This function */
 ```
 
-This rule was previously called, and is aliased as, `function-blacklist`.
+This rule was previously called `function-blacklist`.
 
 ## Options
 
diff --git a/lib/rules/function-url-scheme-allowed-list/README.md b/lib/rules/function-url-scheme-allowed-list/README.md
index 8a2d49154c..682a152bfa 100644
--- a/lib/rules/function-url-scheme-allowed-list/README.md
+++ b/lib/rules/function-url-scheme-allowed-list/README.md
@@ -9,7 +9,7 @@ a { background-image: url('http://www.example.com/file.jpg'); }
  *           This URL scheme */
 ```
 
-This rule was previously called, and is aliased as, `function-url-scheme-whitelist`.
+This rule was previously called `function-url-scheme-whitelist`.
 
 A [URL scheme](https://url.spec.whatwg.org/#syntax-url-scheme) consists of alphanumeric, `+`, `-`, and `.` characters. It can appear at the start of a URL and is followed by `:`.
 
diff --git a/lib/rules/function-url-scheme-blacklist/README.md b/lib/rules/function-url-scheme-blacklist/README.md
index a6dadce430..60bd91af59 100644
--- a/lib/rules/function-url-scheme-blacklist/README.md
+++ b/lib/rules/function-url-scheme-blacklist/README.md
@@ -1,4 +1,4 @@
-# function-url-scheme-disallowed-list
+# function-url-scheme-blacklist
 
 Specify a list of disallowed URL schemes.
 
@@ -9,8 +9,6 @@ a { background-image: url('http://www.example.com/file.jpg'); }
  *           This URL scheme */
 ```
 
-This rule was previously called, and is aliased as, `function-url-scheme-blacklist`.
-
 A [URL scheme](https://url.spec.whatwg.org/#syntax-url-scheme) consists of alphanumeric, `+`, `-`, and `.` characters. It can appear at the start of a URL and is followed by `:`.
 
 This rule ignores:
diff --git a/lib/rules/function-url-scheme-blacklist/index.js b/lib/rules/function-url-scheme-blacklist/index.js
index 18f7af4c23..5028a1454a 100644
--- a/lib/rules/function-url-scheme-blacklist/index.js
+++ b/lib/rules/function-url-scheme-blacklist/index.js
@@ -11,7 +11,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'function-url-scheme-disallowed-list';
+const ruleName = 'function-url-scheme-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (scheme) => `Unexpected URL scheme "${scheme}:"`,
diff --git a/lib/rules/function-url-scheme-disallowed-list/README.md b/lib/rules/function-url-scheme-disallowed-list/README.md
index a6dadce430..8c56b4ea8c 100644
--- a/lib/rules/function-url-scheme-disallowed-list/README.md
+++ b/lib/rules/function-url-scheme-disallowed-list/README.md
@@ -9,7 +9,7 @@ a { background-image: url('http://www.example.com/file.jpg'); }
  *           This URL scheme */
 ```
 
-This rule was previously called, and is aliased as, `function-url-scheme-blacklist`.
+This rule was previously called `function-url-scheme-blacklist`.
 
 A [URL scheme](https://url.spec.whatwg.org/#syntax-url-scheme) consists of alphanumeric, `+`, `-`, and `.` characters. It can appear at the start of a URL and is followed by `:`.
 
diff --git a/lib/rules/function-url-scheme-whitelist/README.md b/lib/rules/function-url-scheme-whitelist/README.md
index 8a2d49154c..9f47527c8e 100644
--- a/lib/rules/function-url-scheme-whitelist/README.md
+++ b/lib/rules/function-url-scheme-whitelist/README.md
@@ -1,4 +1,4 @@
-# function-url-scheme-allowed-list
+# function-url-scheme-whitelist
 
 Specify a list of allowed URL schemes.
 
@@ -9,8 +9,6 @@ a { background-image: url('http://www.example.com/file.jpg'); }
  *           This URL scheme */
 ```
 
-This rule was previously called, and is aliased as, `function-url-scheme-whitelist`.
-
 A [URL scheme](https://url.spec.whatwg.org/#syntax-url-scheme) consists of alphanumeric, `+`, `-`, and `.` characters. It can appear at the start of a URL and is followed by `:`.
 
 This rule ignores:
diff --git a/lib/rules/function-url-scheme-whitelist/index.js b/lib/rules/function-url-scheme-whitelist/index.js
index 224cba8baa..eb0b48c885 100644
--- a/lib/rules/function-url-scheme-whitelist/index.js
+++ b/lib/rules/function-url-scheme-whitelist/index.js
@@ -11,7 +11,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'function-url-scheme-allowed-list';
+const ruleName = 'function-url-scheme-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (scheme) => `Unexpected URL scheme "${scheme}:"`,
diff --git a/lib/rules/function-whitelist/README.md b/lib/rules/function-whitelist/README.md
index e8229a835a..92e80e164f 100644
--- a/lib/rules/function-whitelist/README.md
+++ b/lib/rules/function-whitelist/README.md
@@ -1,4 +1,4 @@
-# function-allowed-list
+# function-whitelist
 
 Specify a list of allowed functions.
 
@@ -9,8 +9,6 @@ a { transform: scale(1); }
  * This function */
 ```
 
-This rule was previously called, and is aliased as, `function-whitelist`.
-
 ## Options
 
 `array|string`: `["array", "of", "unprefixed", /functions/ or "regex"]|"function"|"/regex/"`
diff --git a/lib/rules/function-whitelist/index.js b/lib/rules/function-whitelist/index.js
index d162557a56..da52b50558 100644
--- a/lib/rules/function-whitelist/index.js
+++ b/lib/rules/function-whitelist/index.js
@@ -12,7 +12,7 @@ const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 const valueParser = require('postcss-value-parser');
 
-const ruleName = 'function-allowed-list';
+const ruleName = 'function-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (name) => `Unexpected function "${name}"`,
diff --git a/lib/rules/index.js b/lib/rules/index.js
index 4846a04021..5cefab7773 100644
--- a/lib/rules/index.js
+++ b/lib/rules/index.js
@@ -8,8 +8,7 @@ const importLazy = require('import-lazy');
 const rules = {
 	'alpha-value-notation': importLazy(() => require('./alpha-value-notation'))(),
 	'at-rule-allowed-list': importLazy(() => require('./at-rule-allowed-list'))(),
-	// Renamed to at-rule-disallowed-list
-	'at-rule-blacklist': importLazy(() => require('./at-rule-disallowed-list'))(),
+	'at-rule-blacklist': importLazy(() => require('./at-rule-blacklist'))(),
 	'at-rule-disallowed-list': importLazy(() => require('./at-rule-disallowed-list'))(),
 	'at-rule-empty-line-before': importLazy(() => require('./at-rule-empty-line-before'))(),
 	'at-rule-name-case': importLazy(() => require('./at-rule-name-case'))(),
@@ -19,13 +18,11 @@ const rules = {
 	'at-rule-no-unknown': importLazy(() => require('./at-rule-no-unknown'))(),
 	'at-rule-no-vendor-prefix': importLazy(() => require('./at-rule-no-vendor-prefix'))(),
 	'at-rule-property-required-list': importLazy(() => require('./at-rule-property-required-list'))(),
-	// Renamed to at-rule-required-list
-	'at-rule-property-requirelist': importLazy(() => require('./at-rule-property-required-list'))(),
+	'at-rule-property-requirelist': importLazy(() => require('./at-rule-property-requirelist'))(),
 	'at-rule-semicolon-newline-after': importLazy(() =>
 		require('./at-rule-semicolon-newline-after'),
 	)(),
-	// Renamed to at-rule-allowed-list
-	'at-rule-whitelist': importLazy(() => require('./at-rule-allowed-list'))(),
+	'at-rule-whitelist': importLazy(() => require('./at-rule-whitelist'))(),
 	'block-closing-brace-empty-line-before': importLazy(() =>
 		require('./block-closing-brace-empty-line-before'),
 	)(),
@@ -63,8 +60,7 @@ const rules = {
 	'comment-empty-line-before': importLazy(() => require('./comment-empty-line-before'))(),
 	'comment-no-empty': importLazy(() => require('./comment-no-empty'))(),
 	'comment-whitespace-inside': importLazy(() => require('./comment-whitespace-inside'))(),
-	// Renamed to comment-word-disallowed-list
-	'comment-word-blacklist': importLazy(() => require('./comment-word-disallowed-list'))(),
+	'comment-word-blacklist': importLazy(() => require('./comment-word-blacklist'))(),
 	'comment-word-disallowed-list': importLazy(() => require('./comment-word-disallowed-list'))(),
 	'custom-media-pattern': importLazy(() => require('./custom-media-pattern'))(),
 	'custom-property-empty-line-before': importLazy(() =>
@@ -110,30 +106,26 @@ const rules = {
 	'declaration-property-unit-allowed-list': importLazy(() =>
 		require('./declaration-property-unit-allowed-list'),
 	)(),
-	// Renamed to declaration-property-unit-disallowed-list
 	'declaration-property-unit-blacklist': importLazy(() =>
-		require('./declaration-property-unit-disallowed-list'),
+		require('./declaration-property-unit-blacklist'),
 	)(),
 	'declaration-property-unit-disallowed-list': importLazy(() =>
 		require('./declaration-property-unit-disallowed-list'),
 	)(),
-	// Renamed to declaration-property-unit-allowed-list
 	'declaration-property-unit-whitelist': importLazy(() =>
-		require('./declaration-property-unit-allowed-list'),
+		require('./declaration-property-unit-whitelist'),
 	)(),
 	'declaration-property-value-allowed-list': importLazy(() =>
 		require('./declaration-property-value-allowed-list'),
 	)(),
-	// Renamed to declaration-property-value-disallowed-list
 	'declaration-property-value-blacklist': importLazy(() =>
-		require('./declaration-property-value-disallowed-list'),
+		require('./declaration-property-value-blacklist'),
 	)(),
 	'declaration-property-value-disallowed-list': importLazy(() =>
 		require('./declaration-property-value-disallowed-list'),
 	)(),
-	// Renamed to declaration-property-value-allowed-list
 	'declaration-property-value-whitelist': importLazy(() =>
-		require('./declaration-property-value-allowed-list'),
+		require('./declaration-property-value-whitelist'),
 	)(),
 	'font-family-no-missing-generic-family-keyword': importLazy(() =>
 		require('./font-family-no-missing-generic-family-keyword'),
@@ -142,8 +134,7 @@ const rules = {
 	'font-family-no-duplicate-names': importLazy(() => require('./font-family-no-duplicate-names'))(),
 	'font-weight-notation': importLazy(() => require('./font-weight-notation'))(),
 	'function-allowed-list': importLazy(() => require('./function-allowed-list'))(),
-	// Renamed to function-disallowed-list
-	'function-blacklist': importLazy(() => require('./function-disallowed-list'))(),
+	'function-blacklist': importLazy(() => require('./function-blacklist'))(),
 	'function-calc-no-invalid': importLazy(() => require('./function-calc-no-invalid'))(),
 	'function-calc-no-unspaced-operator': importLazy(() =>
 		require('./function-calc-no-unspaced-operator'),
@@ -171,20 +162,13 @@ const rules = {
 	'function-url-scheme-allowed-list': importLazy(() =>
 		require('./function-url-scheme-allowed-list'),
 	)(),
-	// Renamed to function-url-scheme-disallowed-list
-	'function-url-scheme-blacklist': importLazy(() =>
-		require('./function-url-scheme-disallowed-list'),
-	)(),
+	'function-url-scheme-blacklist': importLazy(() => require('./function-url-scheme-blacklist'))(),
 	'function-url-scheme-disallowed-list': importLazy(() =>
 		require('./function-url-scheme-disallowed-list'),
 	)(),
-	// Renamed to function-url-scheme-allowed-list
-	'function-url-scheme-whitelist': importLazy(() =>
-		require('./function-url-scheme-allowed-list'),
-	)(),
+	'function-url-scheme-whitelist': importLazy(() => require('./function-url-scheme-whitelist'))(),
 	'function-whitespace-after': importLazy(() => require('./function-whitespace-after'))(),
-	// Renamed to function-allowed-list
-	'function-whitelist': importLazy(() => require('./function-allowed-list'))(),
+	'function-whitelist': importLazy(() => require('./function-whitelist'))(),
 	'hue-degree-notation': importLazy(() => require('./hue-degree-notation'))(),
 	'keyframe-declaration-no-important': importLazy(() =>
 		require('./keyframe-declaration-no-important'),
@@ -204,10 +188,7 @@ const rules = {
 	'media-feature-name-allowed-list': importLazy(() =>
 		require('./media-feature-name-allowed-list'),
 	)(),
-	// Renamed to media-feature-name-disallowed-list
-	'media-feature-name-blacklist': importLazy(() =>
-		require('./media-feature-name-disallowed-list'),
-	)(),
+	'media-feature-name-blacklist': importLazy(() => require('./media-feature-name-blacklist'))(),
 	'media-feature-name-case': importLazy(() => require('./media-feature-name-case'))(),
 	'media-feature-name-disallowed-list': importLazy(() =>
 		require('./media-feature-name-disallowed-list'),
@@ -220,10 +201,9 @@ const rules = {
 		require('./media-feature-name-value-allowed-list'),
 	)(),
 	'media-feature-name-value-whitelist': importLazy(() =>
-		require('./media-feature-name-value-allowed-list'),
+		require('./media-feature-name-value-whitelist'),
 	)(),
-	// Renamed to media-feature-name-allowed-list
-	'media-feature-name-whitelist': importLazy(() => require('./media-feature-name-allowed-list'))(),
+	'media-feature-name-whitelist': importLazy(() => require('./media-feature-name-whitelist'))(),
 	'media-feature-parentheses-space-inside': importLazy(() =>
 		require('./media-feature-parentheses-space-inside'),
 	)(),
@@ -263,14 +243,12 @@ const rules = {
 	'number-max-precision': importLazy(() => require('./number-max-precision'))(),
 	'number-no-trailing-zeros': importLazy(() => require('./number-no-trailing-zeros'))(),
 	'property-allowed-list': importLazy(() => require('./property-allowed-list'))(),
-	// Renamed to property-disallowed-list
-	'property-blacklist': importLazy(() => require('./property-disallowed-list'))(),
+	'property-blacklist': importLazy(() => require('./property-blacklist'))(),
 	'property-case': importLazy(() => require('./property-case'))(),
 	'property-disallowed-list': importLazy(() => require('./property-disallowed-list'))(),
 	'property-no-unknown': importLazy(() => require('./property-no-unknown'))(),
 	'property-no-vendor-prefix': importLazy(() => require('./property-no-vendor-prefix'))(),
-	// Renamed to property-allowed-list
-	'property-whitelist': importLazy(() => require('./property-allowed-list'))(),
+	'property-whitelist': importLazy(() => require('./property-whitelist'))(),
 	'rule-empty-line-before': importLazy(() => require('./rule-empty-line-before'))(),
 	'selector-attribute-brackets-space-inside': importLazy(() =>
 		require('./selector-attribute-brackets-space-inside'),
@@ -278,9 +256,8 @@ const rules = {
 	'selector-attribute-operator-allowed-list': importLazy(() =>
 		require('./selector-attribute-operator-allowed-list'),
 	)(),
-	// Renamed to selector-attribute-operator-disallowed-list
 	'selector-attribute-operator-blacklist': importLazy(() =>
-		require('./selector-attribute-operator-disallowed-list'),
+		require('./selector-attribute-operator-blacklist'),
 	)(),
 	'selector-attribute-operator-disallowed-list': importLazy(() =>
 		require('./selector-attribute-operator-disallowed-list'),
@@ -291,19 +268,15 @@ const rules = {
 	'selector-attribute-operator-space-before': importLazy(() =>
 		require('./selector-attribute-operator-space-before'),
 	)(),
-	// Renamed to selector-attribute-operator-allowed-list
 	'selector-attribute-operator-whitelist': importLazy(() =>
-		require('./selector-attribute-operator-allowed-list'),
+		require('./selector-attribute-operator-whitelist'),
 	)(),
 	'selector-attribute-quotes': importLazy(() => require('./selector-attribute-quotes'))(),
 	'selector-class-pattern': importLazy(() => require('./selector-class-pattern'))(),
 	'selector-combinator-allowed-list': importLazy(() =>
 		require('./selector-combinator-allowed-list'),
 	)(),
-	// Renamed to selector-combinator-disallowed-list
-	'selector-combinator-blacklist': importLazy(() =>
-		require('./selector-combinator-disallowed-list'),
-	)(),
+	'selector-combinator-blacklist': importLazy(() => require('./selector-combinator-blacklist'))(),
 	'selector-combinator-disallowed-list': importLazy(() =>
 		require('./selector-combinator-disallowed-list'),
 	)(),
@@ -313,10 +286,7 @@ const rules = {
 	'selector-combinator-space-before': importLazy(() =>
 		require('./selector-combinator-space-before'),
 	)(),
-	// Renamed to selector-combinator-allowed-list
-	'selector-combinator-whitelist': importLazy(() =>
-		require('./selector-combinator-allowed-list'),
-	)(),
+	'selector-combinator-whitelist': importLazy(() => require('./selector-combinator-whitelist'))(),
 	'selector-descendant-combinator-no-non-space': importLazy(() =>
 		require('./selector-descendant-combinator-no-non-space'),
 	)(),
@@ -351,9 +321,8 @@ const rules = {
 	'selector-pseudo-class-allowed-list': importLazy(() =>
 		require('./selector-pseudo-class-allowed-list'),
 	)(),
-	// Renamed to selector-pseudo-class-disallowed-list
 	'selector-pseudo-class-blacklist': importLazy(() =>
-		require('./selector-pseudo-class-disallowed-list'),
+		require('./selector-pseudo-class-blacklist'),
 	)(),
 	'selector-pseudo-class-case': importLazy(() => require('./selector-pseudo-class-case'))(),
 	'selector-pseudo-class-disallowed-list': importLazy(() =>
@@ -365,16 +334,14 @@ const rules = {
 	'selector-pseudo-class-parentheses-space-inside': importLazy(() =>
 		require('./selector-pseudo-class-parentheses-space-inside'),
 	)(),
-	// Renamed to selector-pseudo-class-allowed-list
 	'selector-pseudo-class-whitelist': importLazy(() =>
-		require('./selector-pseudo-class-allowed-list'),
+		require('./selector-pseudo-class-whitelist'),
 	)(),
 	'selector-pseudo-element-allowed-list': importLazy(() =>
 		require('./selector-pseudo-element-allowed-list'),
 	)(),
-	// Renamed to selector-pseudo-element-disallowed-list
 	'selector-pseudo-element-blacklist': importLazy(() =>
-		require('./selector-pseudo-element-disallowed-list'),
+		require('./selector-pseudo-element-blacklist'),
 	)(),
 	'selector-pseudo-element-case': importLazy(() => require('./selector-pseudo-element-case'))(),
 	'selector-pseudo-element-colon-notation': importLazy(() =>
@@ -386,9 +353,8 @@ const rules = {
 	'selector-pseudo-element-no-unknown': importLazy(() =>
 		require('./selector-pseudo-element-no-unknown'),
 	)(),
-	// Renamed to selector-pseudo-element-allowed-list
 	'selector-pseudo-element-whitelist': importLazy(() =>
-		require('./selector-pseudo-element-allowed-list'),
+		require('./selector-pseudo-element-whitelist'),
 	)(),
 	'selector-type-case': importLazy(() => require('./selector-type-case'))(),
 	'selector-type-no-unknown': importLazy(() => require('./selector-type-no-unknown'))(),
@@ -400,13 +366,11 @@ const rules = {
 	'time-min-milliseconds': importLazy(() => require('./time-min-milliseconds'))(),
 	'unicode-bom': importLazy(() => require('./unicode-bom'))(),
 	'unit-allowed-list': importLazy(() => require('./unit-allowed-list'))(),
-	// Renamed to unit-disallowed-list
-	'unit-blacklist': importLazy(() => require('./unit-disallowed-list'))(),
+	'unit-blacklist': importLazy(() => require('./unit-blacklist'))(),
 	'unit-case': importLazy(() => require('./unit-case'))(),
 	'unit-disallowed-list': importLazy(() => require('./unit-disallowed-list'))(),
 	'unit-no-unknown': importLazy(() => require('./unit-no-unknown'))(),
-	// Renamed to unit-allowed-list
-	'unit-whitelist': importLazy(() => require('./unit-allowed-list'))(),
+	'unit-whitelist': importLazy(() => require('./unit-whitelist'))(),
 	'value-keyword-case': importLazy(() => require('./value-keyword-case'))(),
 	'value-list-comma-newline-after': importLazy(() => require('./value-list-comma-newline-after'))(),
 	'value-list-comma-newline-before': importLazy(() =>
diff --git a/lib/rules/media-feature-name-allowed-list/README.md b/lib/rules/media-feature-name-allowed-list/README.md
index 4c5c28abcf..a9cb46db04 100644
--- a/lib/rules/media-feature-name-allowed-list/README.md
+++ b/lib/rules/media-feature-name-allowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of allowed media feature names.
  * This media feature name */
 ```
 
-This rule was previously called, and is aliased as, `media-feature-name-whitelist`.
+This rule was previously called `media-feature-name-whitelist`.
 
 ## Options
 
diff --git a/lib/rules/media-feature-name-blacklist/README.md b/lib/rules/media-feature-name-blacklist/README.md
index aa4b012208..194ce8a664 100644
--- a/lib/rules/media-feature-name-blacklist/README.md
+++ b/lib/rules/media-feature-name-blacklist/README.md
@@ -1,4 +1,4 @@
-# media-feature-name-disallowed-list
+# media-feature-name-blacklist
 
 Specify a list of disallowed media feature names.
 
@@ -9,8 +9,6 @@ Specify a list of disallowed media feature names.
  * This media feature name */
 ```
 
-This rule was previously called, and is aliased as, `media-feature-name-blacklist`.
-
 ## Options
 
 `array|string|regex`: `["array", "of", "unprefixed", /media-features/ or "regex"]|"media-feature"|/regex/`
diff --git a/lib/rules/media-feature-name-blacklist/index.js b/lib/rules/media-feature-name-blacklist/index.js
index cf05074f7b..1b30b68afa 100644
--- a/lib/rules/media-feature-name-blacklist/index.js
+++ b/lib/rules/media-feature-name-blacklist/index.js
@@ -14,7 +14,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'media-feature-name-disallowed-list';
+const ruleName = 'media-feature-name-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (name) => `Unexpected media feature name "${name}"`,
diff --git a/lib/rules/media-feature-name-disallowed-list/README.md b/lib/rules/media-feature-name-disallowed-list/README.md
index aa4b012208..64ff586155 100644
--- a/lib/rules/media-feature-name-disallowed-list/README.md
+++ b/lib/rules/media-feature-name-disallowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of disallowed media feature names.
  * This media feature name */
 ```
 
-This rule was previously called, and is aliased as, `media-feature-name-blacklist`.
+This rule was previously called `media-feature-name-blacklist`.
 
 ## Options
 
diff --git a/lib/rules/media-feature-name-value-allowed-list/README.md b/lib/rules/media-feature-name-value-allowed-list/README.md
index 0e45c430d8..4b4d19300a 100644
--- a/lib/rules/media-feature-name-value-allowed-list/README.md
+++ b/lib/rules/media-feature-name-value-allowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of allowed media feature name and value pairs.
  *    These features and values */
 ```
 
-This rule was previously called, and is aliased as, `media-feature-name-value-whitelist`.
+This rule was previously called `media-feature-name-value-whitelist`.
 
 ## Options
 
diff --git a/lib/rules/media-feature-name-value-whitelist/README.md b/lib/rules/media-feature-name-value-whitelist/README.md
index 0e45c430d8..4d35659583 100644
--- a/lib/rules/media-feature-name-value-whitelist/README.md
+++ b/lib/rules/media-feature-name-value-whitelist/README.md
@@ -1,4 +1,4 @@
-# media-feature-name-value-allowed-list
+# media-feature-name-value-whitelist
 
 Specify a list of allowed media feature name and value pairs.
 
@@ -9,8 +9,6 @@ Specify a list of allowed media feature name and value pairs.
  *    These features and values */
 ```
 
-This rule was previously called, and is aliased as, `media-feature-name-value-whitelist`.
-
 ## Options
 
 ```js
diff --git a/lib/rules/media-feature-name-value-whitelist/index.js b/lib/rules/media-feature-name-value-whitelist/index.js
index 60272c91af..a3e9313ade 100644
--- a/lib/rules/media-feature-name-value-whitelist/index.js
+++ b/lib/rules/media-feature-name-value-whitelist/index.js
@@ -13,7 +13,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'media-feature-name-value-allowed-list';
+const ruleName = 'media-feature-name-value-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (name, value) => `Unexpected value "${value}" for name "${name}"`,
diff --git a/lib/rules/media-feature-name-whitelist/README.md b/lib/rules/media-feature-name-whitelist/README.md
index 4c5c28abcf..e906ccc4ae 100644
--- a/lib/rules/media-feature-name-whitelist/README.md
+++ b/lib/rules/media-feature-name-whitelist/README.md
@@ -1,4 +1,4 @@
-# media-feature-name-allowed-list
+# media-feature-name-whitelist
 
 Specify a list of allowed media feature names.
 
@@ -9,8 +9,6 @@ Specify a list of allowed media feature names.
  * This media feature name */
 ```
 
-This rule was previously called, and is aliased as, `media-feature-name-whitelist`.
-
 ## Options
 
 `array|string|regex`: `["array", "of", "unprefixed", /media-features/ or "regex"]|"media-feature"|/regex/`
diff --git a/lib/rules/media-feature-name-whitelist/index.js b/lib/rules/media-feature-name-whitelist/index.js
index 66da909ff2..a575a4c0b4 100644
--- a/lib/rules/media-feature-name-whitelist/index.js
+++ b/lib/rules/media-feature-name-whitelist/index.js
@@ -14,7 +14,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'media-feature-name-allowed-list';
+const ruleName = 'media-feature-name-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (name) => `Unexpected media feature name "${name}"`,
diff --git a/lib/rules/property-allowed-list/README.md b/lib/rules/property-allowed-list/README.md
index 4383c3164c..c4e02f4714 100644
--- a/lib/rules/property-allowed-list/README.md
+++ b/lib/rules/property-allowed-list/README.md
@@ -9,7 +9,7 @@ a { display: block; }
  * This property */
 ```
 
-This rule was previously called, and is aliased as, `property-whitelist`.
+This rule was previously called `property-whitelist`.
 
 This rule ignores variables (`$sass`, `@less`, `--custom-property`).
 
diff --git a/lib/rules/property-blacklist/README.md b/lib/rules/property-blacklist/README.md
index 012981f710..6566bfb9ad 100644
--- a/lib/rules/property-blacklist/README.md
+++ b/lib/rules/property-blacklist/README.md
@@ -1,4 +1,4 @@
-# property-disallowed-list
+# property-blacklist
 
 Specify a list of disallowed properties.
 
@@ -9,8 +9,6 @@ a { text-rendering: optimizeLegibility; }
  * This property */
 ```
 
-This rule was previously called, and is aliased as, `property-blacklist`.
-
 ## Options
 
 `array|string`: `["array", "of", "unprefixed", /properties/ or "regex"]|"property"|"/regex/"`|/regex/
diff --git a/lib/rules/property-blacklist/index.js b/lib/rules/property-blacklist/index.js
index 21aff9a130..41e019c8de 100644
--- a/lib/rules/property-blacklist/index.js
+++ b/lib/rules/property-blacklist/index.js
@@ -11,7 +11,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'property-disallowed-list';
+const ruleName = 'property-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (property) => `Unexpected property "${property}"`,
diff --git a/lib/rules/property-disallowed-list/README.md b/lib/rules/property-disallowed-list/README.md
index 012981f710..d2cdb59953 100644
--- a/lib/rules/property-disallowed-list/README.md
+++ b/lib/rules/property-disallowed-list/README.md
@@ -9,7 +9,7 @@ a { text-rendering: optimizeLegibility; }
  * This property */
 ```
 
-This rule was previously called, and is aliased as, `property-blacklist`.
+This rule was previously called `property-blacklist`.
 
 ## Options
 
diff --git a/lib/rules/property-whitelist/README.md b/lib/rules/property-whitelist/README.md
index 4383c3164c..7ee6ea9ec3 100644
--- a/lib/rules/property-whitelist/README.md
+++ b/lib/rules/property-whitelist/README.md
@@ -1,4 +1,4 @@
-# property-allowed-list
+# property-whitelist
 
 Specify a list of allowed properties.
 
@@ -9,8 +9,6 @@ a { display: block; }
  * This property */
 ```
 
-This rule was previously called, and is aliased as, `property-whitelist`.
-
 This rule ignores variables (`$sass`, `@less`, `--custom-property`).
 
 ## Options
diff --git a/lib/rules/property-whitelist/index.js b/lib/rules/property-whitelist/index.js
index 28f9df5be8..55ae83e6da 100644
--- a/lib/rules/property-whitelist/index.js
+++ b/lib/rules/property-whitelist/index.js
@@ -11,7 +11,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'property-allowed-list';
+const ruleName = 'property-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (property) => `Unexpected property "${property}"`,
diff --git a/lib/rules/selector-attribute-operator-allowed-list/README.md b/lib/rules/selector-attribute-operator-allowed-list/README.md
index 6cdbae223b..ba7a163fa7 100644
--- a/lib/rules/selector-attribute-operator-allowed-list/README.md
+++ b/lib/rules/selector-attribute-operator-allowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of allowed attribute operators.
  * This operator */
 ```
 
-This rule was previously called, and is aliased as, `selector-attribute-operator-whitelist`.
+This rule was previously called `selector-attribute-operator-whitelist`.
 
 ## Options
 
diff --git a/lib/rules/selector-attribute-operator-blacklist/README.md b/lib/rules/selector-attribute-operator-blacklist/README.md
index 97b51a25d3..6ea009cac5 100644
--- a/lib/rules/selector-attribute-operator-blacklist/README.md
+++ b/lib/rules/selector-attribute-operator-blacklist/README.md
@@ -1,4 +1,4 @@
-# selector-attribute-operator-disallowed-list
+# selector-attribute-operator-blacklist
 
 Specify a list of disallowed attribute operators.
 
@@ -9,8 +9,6 @@ Specify a list of disallowed attribute operators.
  * This operator */
 ```
 
-This rule was previously called, and is aliased as, `selector-attribute-operator-blacklist`.
-
 ## Options
 
 `array|string`: `["array", "of", "operators"]|"operator"`
diff --git a/lib/rules/selector-attribute-operator-blacklist/index.js b/lib/rules/selector-attribute-operator-blacklist/index.js
index a48ae4a28d..e8cea734c8 100644
--- a/lib/rules/selector-attribute-operator-blacklist/index.js
+++ b/lib/rules/selector-attribute-operator-blacklist/index.js
@@ -9,7 +9,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'selector-attribute-operator-disallowed-list';
+const ruleName = 'selector-attribute-operator-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (operator) => `Unexpected operator "${operator}"`,
diff --git a/lib/rules/selector-attribute-operator-disallowed-list/README.md b/lib/rules/selector-attribute-operator-disallowed-list/README.md
index 97b51a25d3..bda6a3586a 100644
--- a/lib/rules/selector-attribute-operator-disallowed-list/README.md
+++ b/lib/rules/selector-attribute-operator-disallowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of disallowed attribute operators.
  * This operator */
 ```
 
-This rule was previously called, and is aliased as, `selector-attribute-operator-blacklist`.
+This rule was previously called `selector-attribute-operator-blacklist`.
 
 ## Options
 
diff --git a/lib/rules/selector-attribute-operator-whitelist/README.md b/lib/rules/selector-attribute-operator-whitelist/README.md
index 6cdbae223b..84184ec69a 100644
--- a/lib/rules/selector-attribute-operator-whitelist/README.md
+++ b/lib/rules/selector-attribute-operator-whitelist/README.md
@@ -1,4 +1,4 @@
-# selector-attribute-operator-allowed-list
+# selector-attribute-operator-whitelist
 
 Specify a list of allowed attribute operators.
 
@@ -9,8 +9,6 @@ Specify a list of allowed attribute operators.
  * This operator */
 ```
 
-This rule was previously called, and is aliased as, `selector-attribute-operator-whitelist`.
-
 ## Options
 
 `array|string`: `["array", "of", "operators"]|"operator"`
diff --git a/lib/rules/selector-attribute-operator-whitelist/index.js b/lib/rules/selector-attribute-operator-whitelist/index.js
index ae31e7ec8d..d8c4839739 100644
--- a/lib/rules/selector-attribute-operator-whitelist/index.js
+++ b/lib/rules/selector-attribute-operator-whitelist/index.js
@@ -9,7 +9,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'selector-attribute-operator-allowed-list';
+const ruleName = 'selector-attribute-operator-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (operator) => `Unexpected operator "${operator}"`,
diff --git a/lib/rules/selector-combinator-allowed-list/README.md b/lib/rules/selector-combinator-allowed-list/README.md
index 9181f40b93..dba3fd8bb3 100644
--- a/lib/rules/selector-combinator-allowed-list/README.md
+++ b/lib/rules/selector-combinator-allowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of allowed combinators.
  * This combinator */
 ```
 
-This rule was previously called, and is aliased as, `selector-combinator-whitelist`.
+This rule was previously called `selector-combinator-whitelist`.
 
 This rule normalizes the whitespace descendant combinator to be a single space.
 
diff --git a/lib/rules/selector-combinator-blacklist/README.md b/lib/rules/selector-combinator-blacklist/README.md
index 98685b9867..2510835c5a 100644
--- a/lib/rules/selector-combinator-blacklist/README.md
+++ b/lib/rules/selector-combinator-blacklist/README.md
@@ -1,4 +1,4 @@
-# selector-combinator-disallowed-list
+# selector-combinator-blacklist
 
 Specify a list of disallowed combinators.
 
@@ -9,8 +9,6 @@ Specify a list of disallowed combinators.
  * This combinator */
 ```
 
-This rule was previously called, and is aliased as, `selector-combinator-blacklist`.
-
 This rule normalizes the whitespace descendant combinator to be a single space.
 
 This rule ignores [reference combinators](https://www.w3.org/TR/selectors4/#idref-combinators) e.g. `/for/`.
diff --git a/lib/rules/selector-combinator-blacklist/index.js b/lib/rules/selector-combinator-blacklist/index.js
index c06631c3dc..cb6f258d8d 100644
--- a/lib/rules/selector-combinator-blacklist/index.js
+++ b/lib/rules/selector-combinator-blacklist/index.js
@@ -10,7 +10,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'selector-combinator-disallowed-list';
+const ruleName = 'selector-combinator-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (combinator) => `Unexpected combinator "${combinator}"`,
diff --git a/lib/rules/selector-combinator-disallowed-list/README.md b/lib/rules/selector-combinator-disallowed-list/README.md
index 98685b9867..ade4fe1d06 100644
--- a/lib/rules/selector-combinator-disallowed-list/README.md
+++ b/lib/rules/selector-combinator-disallowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of disallowed combinators.
  * This combinator */
 ```
 
-This rule was previously called, and is aliased as, `selector-combinator-blacklist`.
+This rule was previously called `selector-combinator-blacklist`.
 
 This rule normalizes the whitespace descendant combinator to be a single space.
 
diff --git a/lib/rules/selector-combinator-whitelist/README.md b/lib/rules/selector-combinator-whitelist/README.md
index 9181f40b93..4c1e805c2c 100644
--- a/lib/rules/selector-combinator-whitelist/README.md
+++ b/lib/rules/selector-combinator-whitelist/README.md
@@ -1,4 +1,4 @@
-# selector-combinator-allowed-list
+# selector-combinator-whitelist
 
 Specify a list of allowed combinators.
 
@@ -9,8 +9,6 @@ Specify a list of allowed combinators.
  * This combinator */
 ```
 
-This rule was previously called, and is aliased as, `selector-combinator-whitelist`.
-
 This rule normalizes the whitespace descendant combinator to be a single space.
 
 This rule ignores [reference combinators](https://www.w3.org/TR/selectors4/#idref-combinators) e.g. `/for/`.
diff --git a/lib/rules/selector-combinator-whitelist/index.js b/lib/rules/selector-combinator-whitelist/index.js
index 3b7f6b75a1..57bdb42998 100644
--- a/lib/rules/selector-combinator-whitelist/index.js
+++ b/lib/rules/selector-combinator-whitelist/index.js
@@ -10,7 +10,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'selector-combinator-allowed-list';
+const ruleName = 'selector-combinator-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (combinator) => `Unexpected combinator "${combinator}"`,
diff --git a/lib/rules/selector-pseudo-class-allowed-list/README.md b/lib/rules/selector-pseudo-class-allowed-list/README.md
index b22b2711fa..92e7984282 100644
--- a/lib/rules/selector-pseudo-class-allowed-list/README.md
+++ b/lib/rules/selector-pseudo-class-allowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of allowed pseudo-class selectors.
  * This pseudo-class selector */
 ```
 
-This rule was previously called, and is aliased as, `selector-pseudo-class-whitelist`.
+This rule was previously called `selector-pseudo-class-whitelist`.
 
 This rule ignores selectors that use variable interpolation e.g. `:#{$variable} {}`.
 
diff --git a/lib/rules/selector-pseudo-class-blacklist/README.md b/lib/rules/selector-pseudo-class-blacklist/README.md
index bb21ebf65a..3fb23301ae 100644
--- a/lib/rules/selector-pseudo-class-blacklist/README.md
+++ b/lib/rules/selector-pseudo-class-blacklist/README.md
@@ -1,4 +1,4 @@
-# selector-pseudo-class-disallowed-list
+# selector-pseudo-class-blacklist
 
 Specify a list of disallowed pseudo-class selectors.
 
@@ -9,8 +9,6 @@ Specify a list of disallowed pseudo-class selectors.
  * This pseudo-class selector */
 ```
 
-This rule was previously called, and is aliased as, `selector-pseudo-class-blacklist`.
-
 This rule ignores selectors that use variable interpolation e.g. `:#{$variable} {}`.
 
 ## Options
diff --git a/lib/rules/selector-pseudo-class-blacklist/index.js b/lib/rules/selector-pseudo-class-blacklist/index.js
index ff36ae15ce..733e379b67 100644
--- a/lib/rules/selector-pseudo-class-blacklist/index.js
+++ b/lib/rules/selector-pseudo-class-blacklist/index.js
@@ -11,7 +11,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'selector-pseudo-class-disallowed-list';
+const ruleName = 'selector-pseudo-class-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (selector) => `Unexpected pseudo-class "${selector}"`,
diff --git a/lib/rules/selector-pseudo-class-disallowed-list/README.md b/lib/rules/selector-pseudo-class-disallowed-list/README.md
index bb21ebf65a..d9a6e61fdd 100644
--- a/lib/rules/selector-pseudo-class-disallowed-list/README.md
+++ b/lib/rules/selector-pseudo-class-disallowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of disallowed pseudo-class selectors.
  * This pseudo-class selector */
 ```
 
-This rule was previously called, and is aliased as, `selector-pseudo-class-blacklist`.
+This rule was previously called `selector-pseudo-class-blacklist`.
 
 This rule ignores selectors that use variable interpolation e.g. `:#{$variable} {}`.
 
diff --git a/lib/rules/selector-pseudo-class-whitelist/README.md b/lib/rules/selector-pseudo-class-whitelist/README.md
index b22b2711fa..35be1c33c3 100644
--- a/lib/rules/selector-pseudo-class-whitelist/README.md
+++ b/lib/rules/selector-pseudo-class-whitelist/README.md
@@ -1,4 +1,4 @@
-# selector-pseudo-class-allowed-list
+# selector-pseudo-class-whitelist
 
 Specify a list of allowed pseudo-class selectors.
 
@@ -9,8 +9,6 @@ Specify a list of allowed pseudo-class selectors.
  * This pseudo-class selector */
 ```
 
-This rule was previously called, and is aliased as, `selector-pseudo-class-whitelist`.
-
 This rule ignores selectors that use variable interpolation e.g. `:#{$variable} {}`.
 
 ## Options
diff --git a/lib/rules/selector-pseudo-class-whitelist/index.js b/lib/rules/selector-pseudo-class-whitelist/index.js
index 55f3da6f6b..0c0c58c67d 100644
--- a/lib/rules/selector-pseudo-class-whitelist/index.js
+++ b/lib/rules/selector-pseudo-class-whitelist/index.js
@@ -11,7 +11,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'selector-pseudo-class-allowed-list';
+const ruleName = 'selector-pseudo-class-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (selector) => `Unexpected pseudo-class "${selector}"`,
diff --git a/lib/rules/selector-pseudo-element-allowed-list/README.md b/lib/rules/selector-pseudo-element-allowed-list/README.md
index 2ed1068195..ef0ffda16d 100644
--- a/lib/rules/selector-pseudo-element-allowed-list/README.md
+++ b/lib/rules/selector-pseudo-element-allowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of allowed pseudo-element selectors.
  * This pseudo-element selector */
 ```
 
-This rule was previously called, and is aliased as, `selector-pseudo-element-whitelist`.
+This rule was previously called `selector-pseudo-element-whitelist`.
 
 This rule ignores:
 
diff --git a/lib/rules/selector-pseudo-element-blacklist/README.md b/lib/rules/selector-pseudo-element-blacklist/README.md
index 0db5b8df2c..d57e742fc2 100644
--- a/lib/rules/selector-pseudo-element-blacklist/README.md
+++ b/lib/rules/selector-pseudo-element-blacklist/README.md
@@ -1,4 +1,4 @@
-# selector-pseudo-element-disallowed-list
+# selector-pseudo-element-blacklist
 
 Specify a list of disallowed pseudo-element selectors.
 
@@ -9,8 +9,6 @@ Specify a list of disallowed pseudo-element selectors.
  * This pseudo-element selector */
 ```
 
-This rule was previously called, and is aliased as, `selector-pseudo-element-blacklist`.
-
 This rule ignores:
 
 - CSS2 pseudo-elements i.e. those prefixed with a single colon
diff --git a/lib/rules/selector-pseudo-element-blacklist/index.js b/lib/rules/selector-pseudo-element-blacklist/index.js
index 0c9552b39b..437920b27b 100644
--- a/lib/rules/selector-pseudo-element-blacklist/index.js
+++ b/lib/rules/selector-pseudo-element-blacklist/index.js
@@ -11,7 +11,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'selector-pseudo-element-disallowed-list';
+const ruleName = 'selector-pseudo-element-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (selector) => `Unexpected pseudo-element "${selector}"`,
diff --git a/lib/rules/selector-pseudo-element-disallowed-list/README.md b/lib/rules/selector-pseudo-element-disallowed-list/README.md
index 0db5b8df2c..327bce0b2c 100644
--- a/lib/rules/selector-pseudo-element-disallowed-list/README.md
+++ b/lib/rules/selector-pseudo-element-disallowed-list/README.md
@@ -9,7 +9,7 @@ Specify a list of disallowed pseudo-element selectors.
  * This pseudo-element selector */
 ```
 
-This rule was previously called, and is aliased as, `selector-pseudo-element-blacklist`.
+This rule was previously called `selector-pseudo-element-blacklist`.
 
 This rule ignores:
 
diff --git a/lib/rules/selector-pseudo-element-whitelist/README.md b/lib/rules/selector-pseudo-element-whitelist/README.md
index 2ed1068195..64d54f839f 100644
--- a/lib/rules/selector-pseudo-element-whitelist/README.md
+++ b/lib/rules/selector-pseudo-element-whitelist/README.md
@@ -1,4 +1,4 @@
-# selector-pseudo-element-allowed-list
+# selector-pseudo-element-whitelist
 
 Specify a list of allowed pseudo-element selectors.
 
@@ -9,8 +9,6 @@ Specify a list of allowed pseudo-element selectors.
  * This pseudo-element selector */
 ```
 
-This rule was previously called, and is aliased as, `selector-pseudo-element-whitelist`.
-
 This rule ignores:
 
 - CSS2 pseudo-elements i.e. those prefixed with a single colon
diff --git a/lib/rules/selector-pseudo-element-whitelist/index.js b/lib/rules/selector-pseudo-element-whitelist/index.js
index 3c39bf2e9d..a313e8c1da 100644
--- a/lib/rules/selector-pseudo-element-whitelist/index.js
+++ b/lib/rules/selector-pseudo-element-whitelist/index.js
@@ -11,7 +11,7 @@ const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
 
-const ruleName = 'selector-pseudo-element-allowed-list';
+const ruleName = 'selector-pseudo-element-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (selector) => `Unexpected pseudo-element "${selector}"`,
diff --git a/lib/rules/unit-allowed-list/README.md b/lib/rules/unit-allowed-list/README.md
index 2c34eda820..ce8d0f5483 100644
--- a/lib/rules/unit-allowed-list/README.md
+++ b/lib/rules/unit-allowed-list/README.md
@@ -9,7 +9,7 @@ a { width: 100px; }
  *  These units */
 ```
 
-This rule was previously called, and is aliased as, `unit-whitelist`.
+This rule was previously called `unit-whitelist`.
 
 ## Options
 
diff --git a/lib/rules/unit-blacklist/README.md b/lib/rules/unit-blacklist/README.md
index 2f20017030..ce6c453fcd 100644
--- a/lib/rules/unit-blacklist/README.md
+++ b/lib/rules/unit-blacklist/README.md
@@ -1,4 +1,4 @@
-# unit-disallowed-list
+# unit-blacklist
 
 Specify a list of disallowed units.
 
@@ -9,8 +9,6 @@ a { width: 100px; }
  *  These units */
 ```
 
-This rule was previously called, and is aliased as, `unit-blacklist`.
-
 ## Options
 
 `array|string`: `["array", "of", "units"]|"unit"`
diff --git a/lib/rules/unit-blacklist/index.js b/lib/rules/unit-blacklist/index.js
index d1f574a5d4..67d464adce 100644
--- a/lib/rules/unit-blacklist/index.js
+++ b/lib/rules/unit-blacklist/index.js
@@ -14,7 +14,7 @@ const validateObjectWithArrayProps = require('../../utils/validateObjectWithArra
 const validateOptions = require('../../utils/validateOptions');
 const valueParser = require('postcss-value-parser');
 
-const ruleName = 'unit-disallowed-list';
+const ruleName = 'unit-blacklist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (unit) => `Unexpected unit "${unit}"`,
diff --git a/lib/rules/unit-disallowed-list/README.md b/lib/rules/unit-disallowed-list/README.md
index 2f20017030..ebacd6bd17 100644
--- a/lib/rules/unit-disallowed-list/README.md
+++ b/lib/rules/unit-disallowed-list/README.md
@@ -9,7 +9,7 @@ a { width: 100px; }
  *  These units */
 ```
 
-This rule was previously called, and is aliased as, `unit-blacklist`.
+This rule was previously called `unit-blacklist`.
 
 ## Options
 
diff --git a/lib/rules/unit-whitelist/README.md b/lib/rules/unit-whitelist/README.md
index 2c34eda820..d87382ba97 100644
--- a/lib/rules/unit-whitelist/README.md
+++ b/lib/rules/unit-whitelist/README.md
@@ -1,4 +1,4 @@
-# unit-allowed-list
+# unit-whitelist
 
 Specify a list of allowed units.
 
@@ -9,8 +9,6 @@ a { width: 100px; }
  *  These units */
 ```
 
-This rule was previously called, and is aliased as, `unit-whitelist`.
-
 ## Options
 
 `array|string`: `["array", "of", "units"]|"unit"`
diff --git a/lib/rules/unit-whitelist/index.js b/lib/rules/unit-whitelist/index.js
index f544fe5ca6..ff6b1bf71e 100644
--- a/lib/rules/unit-whitelist/index.js
+++ b/lib/rules/unit-whitelist/index.js
@@ -13,7 +13,7 @@ const validateObjectWithArrayProps = require('../../utils/validateObjectWithArra
 const validateOptions = require('../../utils/validateOptions');
 const valueParser = require('postcss-value-parser');
 
-const ruleName = 'unit-allowed-list';
+const ruleName = 'unit-whitelist';
 
 const messages = ruleMessages(ruleName, {
 	rejected: (unit) => `Unexpected unit "${unit}"`,
diff --git a/lib/utils/__tests__/checkAgainstRule.test.js b/lib/utils/__tests__/checkAgainstRule.test.js
index df353eb45f..13a2ee22a6 100644
--- a/lib/utils/__tests__/checkAgainstRule.test.js
+++ b/lib/utils/__tests__/checkAgainstRule.test.js
@@ -60,24 +60,4 @@ describe('checkAgainstRule', () => {
 		expect(warnings[0].line).toBe(3);
 		expect(warnings[0].column).toBe(1);
 	});
-
-	it('warns against a renamed rule when an aliased rule is used', () => {
-		const root = postcss.parse('a { top: 10px; }');
-
-		const warnings = [];
-
-		checkAgainstRule(
-			{
-				ruleName: 'unit-whitelist',
-				ruleSettings: ['em'],
-				root,
-			},
-			(warning) => warnings.push(warning),
-		);
-
-		expect(warnings).toHaveLength(1);
-		expect(warnings[0].rule).toBe('unit-allowed-list');
-		expect(warnings[0].line).toBe(1);
-		expect(warnings[0].column).toBe(10);
-	});
 });