Rename rules (#959)

sindresorhus · Dec 27, 2020 · 20c6341 · 20c6341
1 parent e1e4e94
commit 20c6341
Show file tree

Hide file tree

Showing 58 changed files with 139 additions and 81 deletions.
diff --git a/docs/deprecated-rules.md b/docs/deprecated-rules.md
@@ -1,9 +1,57 @@
 # Deprecated Rules
 
+## no-fn-reference-in-iterator
+
+This rule was renamed to [`no-array-callback-reference`](rules/no-array-callback-reference.md) to avoid using the abbreviation `fn` in the name.
+
+## no-array-instanceof
+
+This rule was renamed to [`no-instanceof-array`](rules/no-instanceof-array.md) to be more correct.
+
+## no-reduce
+
+This rule was renamed to [`no-array-reduce`](rules/no-array-reduce.md) to be more specific.
+
+## prefer-dataset
+
+This rule was renamed to [`prefer-dom-node-dataset`](rules/prefer-dom-node-dataset.md) to be more specific.
+
+## prefer-event-key
+
+This rule was renamed to [`prefer-keyboard-event-key`](rules/prefer-keyboard-event-key.md) to be more specific.
+
 ## prefer-exponentiation-operator
 
-This rule is deprecated in favor of the built-in ESLint [`prefer-exponentiation-operator`](https://eslint.org/docs/rules/prefer-exponentiation-operator) rule.
+This rule was deprecated in favor of the built-in ESLint [`prefer-exponentiation-operator`](https://eslint.org/docs/rules/prefer-exponentiation-operator) rule.
+
+## prefer-flat-map
+
+This rule was renamed to [`prefer-array-flat-map`](rules/prefer-array-flat-map.md) to be more specific.
+
+## prefer-node-append
+
+This rule was renamed to [`prefer-dom-node-append`](rules/prefer-dom-node-append.md) to be less ambiguous.
+
+## prefer-node-remove
+
+This rule was renamed to [`prefer-dom-node-remove`](rules/prefer-dom-node-remove.md) to be less ambiguous.
+
+## prefer-replace-all
+
+This rule was renamed to [`prefer-string-replace-all`](rules/prefer-string-replace-all.md) to be more specific.
+
+## prefer-starts-ends-with
+
+This rule was renamed to [`prefer-string-starts-ends-with`](rules/prefer-string-starts-ends-with.md) to be more specific.
+
+## prefer-text-content
+
+This rule was renamed to [`prefer-dom-node-text-content`](rules/prefer-dom-node-text-content.md) to be more specific.
+
+## prefer-trim-start-end
+
+This rule was renamed to [`prefer-string-trim-start-end`](rules/prefer-string-trim-start-end.md) to be more specific.
 
 ## regex-shorthand
 
-This rule was renamed to [`better-regex`](rules/better-regex.md).
+This rule was renamed to [`better-regex`](rules/better-regex.md) as it does more than just preferring the shorthand.
diff --git a/docs/rules/no-fn-reference-in-iterator.md → docs/rules/no-array-callback-reference.md b/docs/rules/no-fn-reference-in-iterator.md → docs/rules/no-array-callback-reference.md
diff --git a/docs/rules/no-reduce.md → docs/rules/no-array-reduce.md b/docs/rules/no-reduce.md → docs/rules/no-array-reduce.md
diff --git a/docs/rules/no-array-instanceof.md → docs/rules/no-instanceof-array.md b/docs/rules/no-array-instanceof.md → docs/rules/no-instanceof-array.md
diff --git a/docs/rules/prefer-flat-map.md → docs/rules/prefer-array-flat-map.md b/docs/rules/prefer-flat-map.md → docs/rules/prefer-array-flat-map.md
diff --git a/docs/rules/prefer-node-append.md → docs/rules/prefer-dom-node-append.md b/docs/rules/prefer-node-append.md → docs/rules/prefer-dom-node-append.md
diff --git a/docs/rules/prefer-dataset.md → docs/rules/prefer-dom-node-dataset.md b/docs/rules/prefer-dataset.md → docs/rules/prefer-dom-node-dataset.md
diff --git a/docs/rules/prefer-node-remove.md → docs/rules/prefer-dom-node-remove.md b/docs/rules/prefer-node-remove.md → docs/rules/prefer-dom-node-remove.md
diff --git a/docs/rules/prefer-text-content.md → docs/rules/prefer-dom-node-text-content.md b/docs/rules/prefer-text-content.md → docs/rules/prefer-dom-node-text-content.md
diff --git a/docs/rules/prefer-event-key.md → docs/rules/prefer-keyboard-event-key.md b/docs/rules/prefer-event-key.md → docs/rules/prefer-keyboard-event-key.md
diff --git a/docs/rules/prefer-replace-all.md → docs/rules/prefer-string-replace-all.md b/docs/rules/prefer-replace-all.md → docs/rules/prefer-string-replace-all.md
diff --git a/docs/rules/prefer-starts-ends-with.md → docs/rules/prefer-string-starts-ends-with.md b/docs/rules/prefer-starts-ends-with.md → docs/rules/prefer-string-starts-ends-with.md
diff --git a/docs/rules/prefer-trim-start-end.md → docs/rules/prefer-string-trim-start-end.md b/docs/rules/prefer-trim-start-end.md → docs/rules/prefer-string-trim-start-end.md
diff --git a/index.js b/index.js
@@ -5,7 +5,19 @@ const createDeprecatedRules = require('./rules/utils/create-deprecated-rules');
 
 const deprecatedRules = createDeprecatedRules({
 	// {ruleId: ReplacementRuleId | ReplacementRuleId[]}, if no replacement, use `{ruleId: []}`
+	'no-array-instanceof': 'unicorn/no-instanceof-array',
+	'no-fn-reference-in-iterator': 'unicorn/no-array-callback-reference',
+	'no-reduce': 'unicorn/no-array-reduce',
+	'prefer-event-key': 'unicorn/prefer-keyboard-event-key',
 	'prefer-exponentiation-operator': 'prefer-exponentiation-operator',
+	'prefer-dataset': 'unicorn/prefer-dom-node-dataset',
+	'prefer-flat-map': 'unicorn/prefer-array-flat-map',
+	'prefer-node-append': 'unicorn/prefer-dom-node-append',
+	'prefer-node-remove': 'unicorn/prefer-dom-node-remove',
+	'prefer-replace-all': 'unicorn/prefer-string-replace-all',
+	'prefer-starts-ends-with': 'unicorn/prefer-string-starts-ends-with',
+	'prefer-text-content': 'unicorn/prefer-dom-node-text-content',
+	'prefer-trim-start-end': 'unicorn/prefer-string-trim-start-end',
 	'regex-shorthand': 'unicorn/better-regex'
 });
 
@@ -41,11 +53,12 @@ module.exports = {
 				'unicorn/import-style': 'error',
 				'unicorn/new-for-builtins': 'error',
 				'unicorn/no-abusive-eslint-disable': 'error',
-				'unicorn/no-array-instanceof': 'error',
+				'unicorn/no-array-callback-reference': 'error',
+				'unicorn/no-array-reduce': 'error',
 				'unicorn/no-console-spaces': 'error',
-				'unicorn/no-fn-reference-in-iterator': 'error',
 				'unicorn/no-for-loop': 'error',
 				'unicorn/no-hex-escape': 'error',
+				'unicorn/no-instanceof-array': 'error',
 				'unicorn/no-keyword-prefix': 'off',
 				'unicorn/no-lonely-if': 'error',
 				'no-nested-ternary': 'off',
@@ -54,7 +67,6 @@ module.exports = {
 				'unicorn/no-null': 'error',
 				'unicorn/no-object-as-default-parameter': 'error',
 				'unicorn/no-process-exit': 'error',
-				'unicorn/no-reduce': 'error',
 				'unicorn/no-unreadable-array-destructuring': 'error',
 				'unicorn/no-unsafe-regex': 'off',
 				'unicorn/no-unused-properties': 'off',
@@ -65,32 +77,32 @@ module.exports = {
 				'unicorn/numeric-separators-style': 'off',
 				'unicorn/prefer-add-event-listener': 'error',
 				'unicorn/prefer-array-find': 'error',
+				// TODO: Enable this by default when targeting Node.js 12.
+				'unicorn/prefer-array-flat-map': 'off',
 				'unicorn/prefer-array-some': 'error',
-				'unicorn/prefer-dataset': 'error',
 				'unicorn/prefer-date-now': 'error',
 				'unicorn/prefer-default-parameters': 'error',
-				'unicorn/prefer-event-key': 'error',
-				// TODO: Enable this by default when targeting Node.js 12.
-				'unicorn/prefer-flat-map': 'off',
+				'unicorn/prefer-dom-node-append': 'error',
+				'unicorn/prefer-dom-node-dataset': 'error',
+				'unicorn/prefer-dom-node-remove': 'error',
+				'unicorn/prefer-dom-node-text-content': 'error',
 				'unicorn/prefer-includes': 'error',
+				'unicorn/prefer-keyboard-event-key': 'error',
 				'unicorn/prefer-math-trunc': 'error',
 				'unicorn/prefer-modern-dom-apis': 'error',
 				'unicorn/prefer-negative-index': 'error',
-				'unicorn/prefer-node-append': 'error',
-				'unicorn/prefer-node-remove': 'error',
 				'unicorn/prefer-number-properties': 'error',
 				'unicorn/prefer-optional-catch-binding': 'error',
 				'unicorn/prefer-query-selector': 'error',
 				'unicorn/prefer-reflect-apply': 'error',
-				// TODO: Enable this by default when targeting Node.js 16.
-				'unicorn/prefer-replace-all': 'off',
 				'unicorn/prefer-set-has': 'error',
 				'unicorn/prefer-spread': 'error',
-				'unicorn/prefer-starts-ends-with': 'error',
+				// TODO: Enable this by default when targeting Node.js 16.
+				'unicorn/prefer-string-replace-all': 'off',
 				'unicorn/prefer-string-slice': 'error',
+				'unicorn/prefer-string-starts-ends-with': 'error',
+				'unicorn/prefer-string-trim-start-end': 'error',
 				'unicorn/prefer-ternary': 'error',
-				'unicorn/prefer-text-content': 'error',
-				'unicorn/prefer-trim-start-end': 'error',
 				'unicorn/prefer-type-error': 'error',
 				'unicorn/prevent-abbreviations': 'error',
 				'unicorn/string-content': 'off',

diff --git a/readme.md b/readme.md
@@ -47,11 +47,12 @@ Configure it in `package.json`.
 			"unicorn/import-style": "error",
 			"unicorn/new-for-builtins": "error",
 			"unicorn/no-abusive-eslint-disable": "error",
-			"unicorn/no-array-instanceof": "error",
+			"unicorn/no-array-callback-reference": "error",
+			"unicorn/no-array-reduce": "error",
 			"unicorn/no-console-spaces": "error",
-			"unicorn/no-fn-reference-in-iterator": "error",
 			"unicorn/no-for-loop": "error",
 			"unicorn/no-hex-escape": "error",
+			"unicorn/no-instanceof-array": "error",
 			"unicorn/no-keyword-prefix": "off",
 			"unicorn/no-lonely-if": "error",
 			"no-nested-ternary": "off",
@@ -60,7 +61,6 @@ Configure it in `package.json`.
 			"unicorn/no-null": "error",
 			"unicorn/no-object-as-default-parameter": "error",
 			"unicorn/no-process-exit": "error",
-			"unicorn/no-reduce": "error",
 			"unicorn/no-unreadable-array-destructuring": "error",
 			"unicorn/no-unsafe-regex": "off",
 			"unicorn/no-unused-properties": "off",
@@ -70,30 +70,30 @@ Configure it in `package.json`.
 			"unicorn/numeric-separators-style": "off",
 			"unicorn/prefer-add-event-listener": "error",
 			"unicorn/prefer-array-find": "error",
+			"unicorn/prefer-array-flat-map": "error",
 			"unicorn/prefer-array-some": "error",
-			"unicorn/prefer-dataset": "error",
 			"unicorn/prefer-date-now": "error",
 			"unicorn/prefer-default-parameters": "error",
-			"unicorn/prefer-event-key": "error",
-			"unicorn/prefer-flat-map": "error",
+			"unicorn/prefer-dom-node-append": "error",
+			"unicorn/prefer-dom-node-dataset": "error",
+			"unicorn/prefer-dom-node-remove": "error",
+			"unicorn/prefer-dom-node-text-content": "error",
 			"unicorn/prefer-includes": "error",
+			"unicorn/prefer-keyboard-event-key": "error",
 			"unicorn/prefer-math-trunc": "error",
 			"unicorn/prefer-modern-dom-apis": "error",
 			"unicorn/prefer-negative-index": "error",
-			"unicorn/prefer-node-append": "error",
-			"unicorn/prefer-node-remove": "error",
 			"unicorn/prefer-number-properties": "error",
 			"unicorn/prefer-optional-catch-binding": "error",
 			"unicorn/prefer-query-selector": "error",
 			"unicorn/prefer-reflect-apply": "error",
-			"unicorn/prefer-replace-all": "off",
 			"unicorn/prefer-set-has": "error",
 			"unicorn/prefer-spread": "error",
-			"unicorn/prefer-starts-ends-with": "error",
+			"unicorn/prefer-string-replace-all": "off",
 			"unicorn/prefer-string-slice": "error",
+			"unicorn/prefer-string-starts-ends-with": "error",
+			"unicorn/prefer-string-trim-start-end": "error",
 			"unicorn/prefer-ternary": "off",
-			"unicorn/prefer-text-content": "error",
-			"unicorn/prefer-trim-start-end": "error",
 			"unicorn/prefer-type-error": "error",
 			"unicorn/prevent-abbreviations": "error",
 			"unicorn/string-content": "off",
@@ -119,19 +119,19 @@ Configure it in `package.json`.
 - [import-style](docs/rules/import-style.md) - Enforce specific import styles per module.
 - [new-for-builtins](docs/rules/new-for-builtins.md) - Enforce the use of `new` for all builtins, except `String`, `Number`, `Boolean`, `Symbol` and `BigInt`. *(partly fixable)*
 - [no-abusive-eslint-disable](docs/rules/no-abusive-eslint-disable.md) - Enforce specifying rules to disable in `eslint-disable` comments.
-- [no-array-instanceof](docs/rules/no-array-instanceof.md) - Require `Array.isArray()` instead of `instanceof Array`. *(fixable)*
+- [no-array-callback-reference](docs/rules/no-array-callback-reference.md) - Prevent passing a function reference directly to iterator methods.
+- [no-array-reduce](docs/rules/no-array-reduce.md) - Disallow `Array#reduce()` and `Array#reduceRight()`.
 - [no-console-spaces](docs/rules/no-console-spaces.md) - Do not use leading/trailing space between `console.log` parameters. *(fixable)*
-- [no-fn-reference-in-iterator](docs/rules/no-fn-reference-in-iterator.md) - Prevent passing a function reference directly to iterator methods.
 - [no-for-loop](docs/rules/no-for-loop.md) - Do not use a `for` loop that can be replaced with a `for-of` loop. *(partly fixable)*
 - [no-hex-escape](docs/rules/no-hex-escape.md) - Enforce the use of Unicode escapes instead of hexadecimal escapes. *(fixable)*
+- [no-instanceof-array](docs/rules/no-instanceof-array.md) - Require `Array.isArray()` instead of `instanceof Array`. *(fixable)*
 - [no-keyword-prefix](docs/rules/no-keyword-prefix.md) - Disallow identifiers starting with `new` or `class`.
 - [no-lonely-if](docs/rules/no-lonely-if.md) - Disallow `if` statements as the only statement in `if` blocks without `else`. *(fixable)*
 - [no-nested-ternary](docs/rules/no-nested-ternary.md) - Disallow nested ternary expressions. *(partly fixable)*
 - [no-new-buffer](docs/rules/no-new-buffer.md) - Enforce the use of `Buffer.from()` and `Buffer.alloc()` instead of the deprecated `new Buffer()`. *(fixable)*
 - [no-null](docs/rules/no-null.md) - Disallow the use of the `null` literal.
 - [no-object-as-default-parameter](docs/rules/no-object-as-default-parameter.md) - Disallow the use of objects as default parameters.
 - [no-process-exit](docs/rules/no-process-exit.md) - Disallow `process.exit()`.
-- [no-reduce](docs/rules/no-reduce.md) - Disallow `Array#reduce()` and `Array#reduceRight()`.
 - [no-unreadable-array-destructuring](docs/rules/no-unreadable-array-destructuring.md) - Disallow unreadable array destructuring.
 - [no-unsafe-regex](docs/rules/no-unsafe-regex.md) - Disallow unsafe regular expressions.
 - [no-unused-properties](docs/rules/no-unused-properties.md) - Disallow unused object properties.
@@ -141,30 +141,30 @@ Configure it in `package.json`.
 - [numeric-separators-style](docs/rules/numeric-separators-style.md) - Enforce the style of numeric separators by correctly grouping digits. *(fixable)*
 - [prefer-add-event-listener](docs/rules/prefer-add-event-listener.md) - Prefer `.addEventListener()` and `.removeEventListener()` over `on`-functions. *(partly fixable)*
 - [prefer-array-find](docs/rules/prefer-array-find.md) - Prefer `.find(…)` over the first element from `.filter(…)`. *(partly fixable)*
+- [prefer-array-flat-map](docs/rules/prefer-array-flat-map.md) - Prefer `.flatMap(…)` over `.map(…).flat()`. *(fixable)*
 - [prefer-array-some](docs/rules/prefer-array-some.md) - Prefer `.some(…)` over `.find(…)`.
-- [prefer-dataset](docs/rules/prefer-dataset.md) - Prefer using `.dataset` on DOM elements over `.setAttribute(…)`. *(fixable)*
 - [prefer-date-now](docs/rules/prefer-date-now.md) - Prefer `Date.now()` to get the number of milliseconds since the Unix Epoch. *(fixable)*
 - [prefer-default-parameters](docs/rules/prefer-default-parameters.md) - Prefer default parameters over reassignment. *(fixable)*
-- [prefer-event-key](docs/rules/prefer-event-key.md) - Prefer `KeyboardEvent#key` over `KeyboardEvent#keyCode`. *(partly fixable)*
-- [prefer-flat-map](docs/rules/prefer-flat-map.md) - Prefer `.flatMap(…)` over `.map(…).flat()`. *(fixable)*
+- [prefer-dom-node-append](docs/rules/prefer-dom-node-append.md) - Prefer `Node#append()` over `Node#appendChild()`. *(fixable)*
+- [prefer-dom-node-dataset](docs/rules/prefer-dom-node-dataset.md) - Prefer using `.dataset` on DOM elements over `.setAttribute(…)`. *(fixable)*
+- [prefer-dom-node-remove](docs/rules/prefer-dom-node-remove.md) - Prefer `childNode.remove()` over `parentNode.removeChild(childNode)`. *(fixable)*
+- [prefer-dom-node-text-content](docs/rules/prefer-dom-node-text-content.md) - Prefer `.textContent` over `.innerText`. *(fixable)*
 - [prefer-includes](docs/rules/prefer-includes.md) - Prefer `.includes()` over `.indexOf()` when checking for existence or non-existence. *(fixable)*
+- [prefer-keyboard-event-key](docs/rules/prefer-keyboard-event-key.md) - Prefer `KeyboardEvent#key` over `KeyboardEvent#keyCode`. *(partly fixable)*
 - [prefer-math-trunc](docs/rules/prefer-math-trunc.md) - Enforce the use of `Math.trunc` instead of bitwise operators. *(partly fixable)*
 - [prefer-modern-dom-apis](docs/rules/prefer-modern-dom-apis.md) - Prefer `.before()` over `.insertBefore()`, `.replaceWith()` over `.replaceChild()`, prefer one of `.before()`, `.after()`, `.append()` or `.prepend()` over `insertAdjacentText()` and `insertAdjacentElement()`. *(fixable)*
 - [prefer-negative-index](docs/rules/prefer-negative-index.md) - Prefer negative index over `.length - index` for `{String,Array,TypedArray}#slice()` and `Array#splice()`. *(fixable)*
-- [prefer-node-append](docs/rules/prefer-node-append.md) - Prefer `Node#append()` over `Node#appendChild()`. *(fixable)*
-- [prefer-node-remove](docs/rules/prefer-node-remove.md) - Prefer `childNode.remove()` over `parentNode.removeChild(childNode)`. *(fixable)*
 - [prefer-number-properties](docs/rules/prefer-number-properties.md) - Prefer `Number` static properties over global ones. *(fixable)*
 - [prefer-optional-catch-binding](docs/rules/prefer-optional-catch-binding.md) - Prefer omitting the `catch` binding parameter. *(fixable)*
 - [prefer-query-selector](docs/rules/prefer-query-selector.md) - Prefer `.querySelector()` over `.getElementById()`, `.querySelectorAll()` over `.getElementsByClassName()` and `.getElementsByTagName()`. *(partly fixable)*
 - [prefer-reflect-apply](docs/rules/prefer-reflect-apply.md) - Prefer `Reflect.apply()` over `Function#apply()`. *(fixable)*
-- [prefer-replace-all](docs/rules/prefer-replace-all.md) - Prefer `String#replaceAll()` over regex searches with the global flag. *(fixable)*
 - [prefer-set-has](docs/rules/prefer-set-has.md) - Prefer `Set#has()` over `Array#includes()` when checking for existence or non-existence. *(fixable)*
 - [prefer-spread](docs/rules/prefer-spread.md) - Prefer the spread operator over `Array.from()`. *(fixable)*
-- [prefer-starts-ends-with](docs/rules/prefer-starts-ends-with.md) - Prefer `String#startsWith()` & `String#endsWith()` over more complex alternatives. *(partly fixable)*
+- [prefer-string-replace-all](docs/rules/prefer-string-replace-all.md) - Prefer `String#replaceAll()` over regex searches with the global flag. *(fixable)*
 - [prefer-string-slice](docs/rules/prefer-string-slice.md) - Prefer `String#slice()` over `String#substr()` and `String#substring()`. *(partly fixable)*
+- [prefer-string-starts-ends-with](docs/rules/prefer-string-starts-ends-with.md) - Prefer `String#startsWith()` & `String#endsWith()` over more complex alternatives. *(partly fixable)*
+- [prefer-string-trim-start-end](docs/rules/prefer-string-trim-start-end.md) - Prefer `String#trimStart()` / `String#trimEnd()` over `String#trimLeft()` / `String#trimRight()`. *(fixable)*
 - [prefer-ternary](docs/rules/prefer-ternary.md) - Prefer ternary expressions over simple `if-else` statements. *(fixable)*
-- [prefer-text-content](docs/rules/prefer-text-content.md) - Prefer `.textContent` over `.innerText`. *(fixable)*
-- [prefer-trim-start-end](docs/rules/prefer-trim-start-end.md) - Prefer `String#trimStart()` / `String#trimEnd()` over `String#trimLeft()` / `String#trimRight()`. *(fixable)*
 - [prefer-type-error](docs/rules/prefer-type-error.md) - Enforce throwing `TypeError` in type checking conditions. *(fixable)*
 - [prevent-abbreviations](docs/rules/prevent-abbreviations.md) - Prevent abbreviations. *(partly fixable)*
 - [string-content](docs/rules/string-content.md) - Enforce better string content. *(fixable)*

diff --git a/rules/no-fn-reference-in-iterator.js → rules/no-array-callback-reference.js b/rules/no-fn-reference-in-iterator.js → rules/no-array-callback-reference.js
diff --git a/rules/no-reduce.js → rules/no-array-reduce.js b/rules/no-reduce.js → rules/no-array-reduce.js
diff --git a/rules/no-array-instanceof.js → rules/no-instanceof-array.js b/rules/no-array-instanceof.js → rules/no-instanceof-array.js
@@ -1,7 +1,7 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
-const MESSAGE_ID = 'no-array-instanceof';
+const MESSAGE_ID = 'no-instanceof-array';
 const messages = {
 	[MESSAGE_ID]: 'Use `Array.isArray()` instead of `instanceof Array`.'
 };

diff --git a/rules/prefer-flat-map.js → rules/prefer-array-flat-map.js b/rules/prefer-flat-map.js → rules/prefer-array-flat-map.js
diff --git a/rules/prefer-node-append.js → rules/prefer-dom-node-append.js b/rules/prefer-node-append.js → rules/prefer-dom-node-append.js
@@ -4,7 +4,7 @@ const isValueNotUsable = require('./utils/is-value-not-usable');
 const methodSelector = require('./utils/method-selector');
 const {notDomNodeSelector} = require('./utils/not-dom-node');
 
-const MESSAGE_ID = 'prefer-node-append';
+const MESSAGE_ID = 'prefer-dom-node-append';
 const messages = {
 	[MESSAGE_ID]: 'Prefer `Node#append()` over `Node#appendChild()`.'
 };

diff --git a/rules/prefer-dataset.js → rules/prefer-dom-node-dataset.js b/rules/prefer-dataset.js → rules/prefer-dom-node-dataset.js
@@ -4,7 +4,7 @@ const isValidVariableName = require('./utils/is-valid-variable-name');
 const quoteString = require('./utils/quote-string');
 const methodSelector = require('./utils/method-selector');
 
-const MESSAGE_ID = 'prefer-dataset';
+const MESSAGE_ID = 'prefer-dom-node-dataset';
 const messages = {
 	[MESSAGE_ID]: 'Prefer `.dataset` over `setAttribute(…)`.'
 };

diff --git a/rules/prefer-node-remove.js → rules/prefer-dom-node-remove.js b/rules/prefer-node-remove.js → rules/prefer-dom-node-remove.js
diff --git a/rules/prefer-text-content.js → rules/prefer-dom-node-text-content.js b/rules/prefer-text-content.js → rules/prefer-dom-node-text-content.js
@@ -1,7 +1,7 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
-const MESSAGE_ID = 'prefer-text-content';
+const MESSAGE_ID = 'prefer-dom-node-text-content';
 const messages = {
 	[MESSAGE_ID]: 'Prefer `.textContent` over `.innerText`.'
 };

diff --git a/rules/prefer-event-key.js → rules/prefer-keyboard-event-key.js b/rules/prefer-event-key.js → rules/prefer-keyboard-event-key.js
@@ -2,7 +2,7 @@
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const quoteString = require('./utils/quote-string');
 
-const MESSAGE_ID = 'prefer-event-key';
+const MESSAGE_ID = 'prefer-keyboard-event-key';
 const messages = {
 	[MESSAGE_ID]: 'Use `.key` instead of `.{{name}}`.'
 };

diff --git a/rules/prefer-replace-all.js → rules/prefer-string-replace-all.js b/rules/prefer-replace-all.js → rules/prefer-string-replace-all.js
@@ -3,7 +3,7 @@ const getDocumentationUrl = require('./utils/get-documentation-url');
 const quoteString = require('./utils/quote-string');
 const methodSelector = require('./utils/method-selector');
 
-const MESSAGE_ID = 'prefer-replace-all';
+const MESSAGE_ID = 'prefer-string-replace-all';
 const messages = {
 	[MESSAGE_ID]: 'Prefer `String#replaceAll()` over `String#replace()`.'
 };

diff --git a/rules/prefer-starts-ends-with.js → rules/prefer-string-starts-ends-with.js b/rules/prefer-starts-ends-with.js → rules/prefer-string-starts-ends-with.js
diff --git a/rules/prefer-trim-start-end.js → rules/prefer-string-trim-start-end.js b/rules/prefer-trim-start-end.js → rules/prefer-string-trim-start-end.js
diff --git a/test/no-fn-reference-in-iterator.js → test/no-array-callback-reference.js b/test/no-fn-reference-in-iterator.js → test/no-array-callback-reference.js
@@ -50,10 +50,9 @@ const invalidTestCase = (({code, method, name, suggestions}) => ({
 			suggestions: suggestions.map(output => suggestionOutput(output))
 		}
 	]
-
 }));
 
-ruleTester.run('no-fn-reference-in-iterator', rule, {
+ruleTester.run('no-array-callback-reference', rule, {
 	valid: [
 		...simpleMethods.map(method => `foo.${method}(element => fn(element))`),
 		...reduceLikeMethods.map(method => `foo.${method}((accumulator, element) => fn(element))`),