merge develop

dequelabs · Apr 15, 2020 · f59eb4c · f59eb4c
2 parents 9c92571 + 3b29f84
commit f59eb4c
Show file tree

Hide file tree

Showing 212 changed files with 123 additions and 110 deletions.
diff --git a/lib/checks/aria/abstractrole.js → lib/checks/aria/abstractrole-evaluate.js b/lib/checks/aria/abstractrole.js → lib/checks/aria/abstractrole-evaluate.js
diff --git a/lib/checks/aria/abstractrole.json b/lib/checks/aria/abstractrole.json
@@ -1,6 +1,6 @@
 {
 	"id": "abstractrole",
-	"evaluate": "abstractrole.js",
+	"evaluate": "abstractrole-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/aria/allowed-attr.js → ...checks/aria/aria-allowed-attr-evaluate.js b/lib/checks/aria/allowed-attr.js → ...checks/aria/aria-allowed-attr-evaluate.js
diff --git a/lib/checks/aria/allowed-attr.json → lib/checks/aria/aria-allowed-attr.json b/lib/checks/aria/allowed-attr.json → lib/checks/aria/aria-allowed-attr.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-allowed-attr",
-	"evaluate": "allowed-attr.js",
+	"evaluate": "aria-allowed-attr-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/aria/aria-allowed-role.js → ...checks/aria/aria-allowed-role-evaluate.js b/lib/checks/aria/aria-allowed-role.js → ...checks/aria/aria-allowed-role-evaluate.js
diff --git a/lib/checks/aria/aria-allowed-role.json b/lib/checks/aria/aria-allowed-role.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-allowed-role",
-	"evaluate": "aria-allowed-role.js",
+	"evaluate": "aria-allowed-role-evaluate.js",
 	"options": {
 		"allowImplicit": true,
 		"ignoredTags": []

diff --git a/lib/checks/aria/errormessage.js → ...checks/aria/aria-errormessage-evaluate.js b/lib/checks/aria/errormessage.js → ...checks/aria/aria-errormessage-evaluate.js
diff --git a/lib/checks/aria/errormessage.json → lib/checks/aria/aria-errormessage.json b/lib/checks/aria/errormessage.json → lib/checks/aria/aria-errormessage.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-errormessage",
-	"evaluate": "errormessage.js",
+	"evaluate": "aria-errormessage-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/aria/aria-hidden-body.js → lib/checks/aria/aria-hidden-body-evaluate.js b/lib/checks/aria/aria-hidden-body.js → lib/checks/aria/aria-hidden-body-evaluate.js
diff --git a/lib/checks/aria/aria-hidden-body.json b/lib/checks/aria/aria-hidden-body.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-hidden-body",
-	"evaluate": "aria-hidden-body.js",
+	"evaluate": "aria-hidden-body-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/aria/required-attr.js → ...hecks/aria/aria-required-attr-evaluate.js b/lib/checks/aria/required-attr.js → ...hecks/aria/aria-required-attr-evaluate.js
diff --git a/lib/checks/aria/required-attr.json → lib/checks/aria/aria-required-attr.json b/lib/checks/aria/required-attr.json → lib/checks/aria/aria-required-attr.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-required-attr",
-	"evaluate": "required-attr.js",
+	"evaluate": "aria-required-attr-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/aria/required-children.js → ...s/aria/aria-required-children-evaluate.js b/lib/checks/aria/required-children.js → ...s/aria/aria-required-children-evaluate.js
diff --git a/lib/checks/aria/required-children.json → lib/checks/aria/aria-required-children.json b/lib/checks/aria/required-children.json → lib/checks/aria/aria-required-children.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-required-children",
-	"evaluate": "required-children.js",
+	"evaluate": "aria-required-children-evaluate.js",
 	"options": {
 		"reviewEmpty": [
 			"doc-bibliography",

diff --git a/lib/checks/aria/required-parent.js → ...cks/aria/aria-required-parent-evaluate.js b/lib/checks/aria/required-parent.js → ...cks/aria/aria-required-parent-evaluate.js
diff --git a/lib/checks/aria/required-parent.json → lib/checks/aria/aria-required-parent.json b/lib/checks/aria/required-parent.json → lib/checks/aria/aria-required-parent.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-required-parent",
-	"evaluate": "required-parent.js",
+	"evaluate": "aria-required-parent-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/aria/aria-roledescription.js → ...cks/aria/aria-roledescription-evaluate.js b/lib/checks/aria/aria-roledescription.js → ...cks/aria/aria-roledescription-evaluate.js
diff --git a/lib/checks/aria/aria-roledescription.json b/lib/checks/aria/aria-roledescription.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-roledescription",
-	"evaluate": "aria-roledescription.js",
+	"evaluate": "aria-roledescription-evaluate.js",
 	"options": {
 		"supportedRoles": [
 			"button",

diff --git a/lib/checks/aria/unsupportedattr.js → ...ks/aria/aria-unsupported-attr-evaluate.js b/lib/checks/aria/unsupportedattr.js → ...ks/aria/aria-unsupported-attr-evaluate.js
diff --git a/lib/checks/aria/unsupportedattr.json → lib/checks/aria/aria-unsupported-attr.json b/lib/checks/aria/unsupportedattr.json → lib/checks/aria/aria-unsupported-attr.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-unsupported-attr",
-	"evaluate": "unsupportedattr.js",
+	"evaluate": "aria-unsupported-attr-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/aria/valid-attr.js → lib/checks/aria/aria-valid-attr-evaluate.js b/lib/checks/aria/valid-attr.js → lib/checks/aria/aria-valid-attr-evaluate.js
diff --git a/lib/checks/aria/valid-attr-value.js → ...ks/aria/aria-valid-attr-value-evaluate.js b/lib/checks/aria/valid-attr-value.js → ...ks/aria/aria-valid-attr-value-evaluate.js
diff --git a/lib/checks/aria/valid-attr-value.json → lib/checks/aria/aria-valid-attr-value.json b/lib/checks/aria/valid-attr-value.json → lib/checks/aria/aria-valid-attr-value.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-valid-attr-value",
-	"evaluate": "valid-attr-value.js",
+	"evaluate": "aria-valid-attr-value-evaluate.js",
 	"options": [],
 	"metadata": {
 		"impact": "critical",

diff --git a/lib/checks/aria/valid-attr.json → lib/checks/aria/aria-valid-attr.json b/lib/checks/aria/valid-attr.json → lib/checks/aria/aria-valid-attr.json
@@ -1,6 +1,6 @@
 {
 	"id": "aria-valid-attr",
-	"evaluate": "valid-attr.js",
+	"evaluate": "aria-valid-attr-evaluate.js",
 	"options": [],
 	"metadata": {
 		"impact": "critical",

diff --git a/lib/checks/aria/fallbackrole.js → lib/checks/aria/fallbackrole-evaluate.js b/lib/checks/aria/fallbackrole.js → lib/checks/aria/fallbackrole-evaluate.js
diff --git a/lib/checks/aria/fallbackrole.json b/lib/checks/aria/fallbackrole.json
@@ -1,6 +1,6 @@
 {
 	"id": "fallbackrole",
-	"evaluate": "fallbackrole.js",
+	"evaluate": "fallbackrole-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/aria/has-widget-role.js → lib/checks/aria/has-widget-role-evaluate.js b/lib/checks/aria/has-widget-role.js → lib/checks/aria/has-widget-role-evaluate.js
diff --git a/lib/checks/aria/has-widget-role.json b/lib/checks/aria/has-widget-role.json
@@ -1,6 +1,6 @@
 {
 	"id": "has-widget-role",
-	"evaluate": "has-widget-role.js",
+	"evaluate": "has-widget-role-evaluate.js",
 	"options": [],
 	"metadata": {
 		"impact": "minor",

diff --git a/lib/checks/aria/implicit-role-fallback.js → ...s/aria/implicit-role-fallback-evaluate.js b/lib/checks/aria/implicit-role-fallback.js → ...s/aria/implicit-role-fallback-evaluate.js
diff --git a/lib/checks/aria/implicit-role-fallback.json b/lib/checks/aria/implicit-role-fallback.json
@@ -1,6 +1,6 @@
 {
 	"id": "implicit-role-fallback",
-	"evaluate": "implicit-role-fallback.js",
+	"evaluate": "implicit-role-fallback-evaluate.js",
 	"deprecated": true,
 	"metadata": {
 		"impact": "moderate",

diff --git a/lib/checks/aria/invalidrole.js → lib/checks/aria/invalidrole-evaluate.js b/lib/checks/aria/invalidrole.js → lib/checks/aria/invalidrole-evaluate.js
diff --git a/lib/checks/aria/invalidrole.json b/lib/checks/aria/invalidrole.json
@@ -1,6 +1,6 @@
 {
 	"id": "invalidrole",
-	"evaluate": "invalidrole.js",
+	"evaluate": "invalidrole-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/...checks/aria/no-implicit-explicit-label.js → ...ia/no-implicit-explicit-label-evaluate.js b/...checks/aria/no-implicit-explicit-label.js → ...ia/no-implicit-explicit-label-evaluate.js
diff --git a/lib/checks/aria/no-implicit-explicit-label.json b/lib/checks/aria/no-implicit-explicit-label.json
@@ -1,6 +1,6 @@
 {
 	"id": "no-implicit-explicit-label",
-	"evaluate": "no-implicit-explicit-label.js",
+	"evaluate": "no-implicit-explicit-label-evaluate.js",
 	"metadata": {
 		"impact": "moderate",
 		"messages": {

diff --git a/lib/checks/aria/unsupportedrole.js → lib/checks/aria/unsupportedrole-evaluate.js b/lib/checks/aria/unsupportedrole.js → lib/checks/aria/unsupportedrole-evaluate.js
diff --git a/lib/checks/aria/unsupportedrole.json b/lib/checks/aria/unsupportedrole.json
@@ -1,6 +1,6 @@
 {
 	"id": "unsupportedrole",
-	"evaluate": "unsupportedrole.js",
+	"evaluate": "unsupportedrole-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/...checks/aria/valid-scrollable-semantics.js → ...ia/valid-scrollable-semantics-evaluate.js b/...checks/aria/valid-scrollable-semantics.js → ...ia/valid-scrollable-semantics-evaluate.js
diff --git a/lib/checks/aria/valid-scrollable-semantics.json b/lib/checks/aria/valid-scrollable-semantics.json
@@ -1,6 +1,6 @@
 {
 	"id": "valid-scrollable-semantics",
-	"evaluate": "valid-scrollable-semantics.js",
+	"evaluate": "valid-scrollable-semantics-evaluate.js",
 	"options": [],
 	"metadata": {
 		"impact": "minor",

diff --git a/lib/checks/color/color-contrast.js → lib/checks/color/color-contrast-evaluate.js b/lib/checks/color/color-contrast.js → lib/checks/color/color-contrast-evaluate.js
diff --git a/lib/checks/color/color-contrast.json b/lib/checks/color/color-contrast.json
@@ -1,6 +1,6 @@
 {
 	"id": "color-contrast",
-	"evaluate": "color-contrast.js",
+	"evaluate": "color-contrast-evaluate.js",
 	"options": {
 		"noScroll": false,
 		"ignoreUnicode": true,

diff --git a/lib/checks/color/link-in-text-block.js → ...ecks/color/link-in-text-block-evaluate.js b/lib/checks/color/link-in-text-block.js → ...ecks/color/link-in-text-block-evaluate.js
diff --git a/lib/checks/color/link-in-text-block.json b/lib/checks/color/link-in-text-block.json
@@ -1,6 +1,6 @@
 {
 	"id": "link-in-text-block",
-	"evaluate": "link-in-text-block.js",
+	"evaluate": "link-in-text-block-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/forms/autocomplete-appropriate.js → ...orms/autocomplete-appropriate-evaluate.js b/lib/checks/forms/autocomplete-appropriate.js → ...orms/autocomplete-appropriate-evaluate.js
diff --git a/lib/checks/forms/autocomplete-appropriate.json b/lib/checks/forms/autocomplete-appropriate.json
@@ -1,6 +1,6 @@
 {
 	"id": "autocomplete-appropriate",
-	"evaluate": "autocomplete-appropriate.js",
+	"evaluate": "autocomplete-appropriate-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/forms/autocomplete-valid.js → ...ecks/forms/autocomplete-valid-evaluate.js b/lib/checks/forms/autocomplete-valid.js → ...ecks/forms/autocomplete-valid-evaluate.js
diff --git a/lib/checks/forms/autocomplete-valid.json b/lib/checks/forms/autocomplete-valid.json
@@ -1,6 +1,6 @@
 {
 	"id": "autocomplete-valid",
-	"evaluate": "autocomplete-valid.js",
+	"evaluate": "autocomplete-valid-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/forms/fieldset.js → lib/checks/forms/fieldset-evaluate.js b/lib/checks/forms/fieldset.js → lib/checks/forms/fieldset-evaluate.js
diff --git a/lib/checks/forms/fieldset.json b/lib/checks/forms/fieldset.json
@@ -1,6 +1,6 @@
 {
 	"id": "fieldset",
-	"evaluate": "fieldset.js",
+	"evaluate": "fieldset-evaluate.js",
 	"after": "fieldset-after.js",
 	"deprecated": true,
 	"metadata": {

diff --git a/lib/checks/forms/group-labelledby.js → ...checks/forms/group-labelledby-evaluate.js b/lib/checks/forms/group-labelledby.js → ...checks/forms/group-labelledby-evaluate.js
diff --git a/lib/checks/forms/group-labelledby.json b/lib/checks/forms/group-labelledby.json
@@ -1,6 +1,6 @@
 {
 	"id": "group-labelledby",
-	"evaluate": "group-labelledby.js",
+	"evaluate": "group-labelledby-evaluate.js",
 	"after": "group-labelledby-after.js",
 	"deprecated": true,
 	"metadata": {

diff --git a/lib/checks/keyboard/accesskeys.js → lib/checks/keyboard/accesskeys-evaluate.js b/lib/checks/keyboard/accesskeys.js → lib/checks/keyboard/accesskeys-evaluate.js
diff --git a/lib/checks/keyboard/accesskeys.json b/lib/checks/keyboard/accesskeys.json
@@ -1,6 +1,6 @@
 {
 	"id": "accesskeys",
-	"evaluate": "accesskeys.js",
+	"evaluate": "accesskeys-evaluate.js",
 	"after": "accesskeys-after.js",
 	"metadata": {
 		"impact": "serious",

diff --git a/lib/checks/keyboard/focusable-content.js → ...ks/keyboard/focusable-content-evaluate.js b/lib/checks/keyboard/focusable-content.js → ...ks/keyboard/focusable-content-evaluate.js
diff --git a/lib/checks/keyboard/focusable-content.json b/lib/checks/keyboard/focusable-content.json
@@ -1,6 +1,6 @@
 {
 	"id": "focusable-content",
-	"evaluate": "focusable-content.js",
+	"evaluate": "focusable-content-evaluate.js",
 	"metadata": {
 		"impact": "moderate",
 		"messages": {

diff --git a/lib/checks/keyboard/focusable-disabled.js → ...s/keyboard/focusable-disabled-evaluate.js b/lib/checks/keyboard/focusable-disabled.js → ...s/keyboard/focusable-disabled-evaluate.js
diff --git a/lib/checks/keyboard/focusable-disabled.json b/lib/checks/keyboard/focusable-disabled.json
@@ -1,6 +1,6 @@
 {
 	"id": "focusable-disabled",
-	"evaluate": "focusable-disabled.js",
+	"evaluate": "focusable-disabled-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/keyboard/focusable-element.js → ...ks/keyboard/focusable-element-evaluate.js b/lib/checks/keyboard/focusable-element.js → ...ks/keyboard/focusable-element-evaluate.js
diff --git a/lib/checks/keyboard/focusable-element.json b/lib/checks/keyboard/focusable-element.json
@@ -1,6 +1,6 @@
 {
 	"id": "focusable-element",
-	"evaluate": "focusable-element.js",
+	"evaluate": "focusable-element-evaluate.js",
 	"metadata": {
 		"impact": "moderate",
 		"messages": {

diff --git a/lib/checks/keyboard/focusable-modal-open.js → ...keyboard/focusable-modal-open-evaluate.js b/lib/checks/keyboard/focusable-modal-open.js → ...keyboard/focusable-modal-open-evaluate.js
diff --git a/lib/checks/keyboard/focusable-modal-open.json b/lib/checks/keyboard/focusable-modal-open.json
@@ -1,6 +1,6 @@
 {
 	"id": "focusable-modal-open",
-	"evaluate": "focusable-modal-open.js",
+	"evaluate": "focusable-modal-open-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/keyboard/focusable-no-name.js → ...ks/keyboard/focusable-no-name-evaluate.js b/lib/checks/keyboard/focusable-no-name.js → ...ks/keyboard/focusable-no-name-evaluate.js
diff --git a/lib/checks/keyboard/focusable-no-name.json b/lib/checks/keyboard/focusable-no-name.json
@@ -1,6 +1,6 @@
 {
 	"id": "focusable-no-name",
-	"evaluate": "focusable-no-name.js",
+	"evaluate": "focusable-no-name-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/...checks/keyboard/focusable-not-tabbable.js → ...yboard/focusable-not-tabbable-evaluate.js b/...checks/keyboard/focusable-not-tabbable.js → ...yboard/focusable-not-tabbable-evaluate.js
diff --git a/lib/checks/keyboard/focusable-not-tabbable.json b/lib/checks/keyboard/focusable-not-tabbable.json
@@ -1,6 +1,6 @@
 {
 	"id": "focusable-not-tabbable",
-	"evaluate": "focusable-not-tabbable.js",
+	"evaluate": "focusable-not-tabbable-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/keyboard/landmark-is-top-level.js → ...eyboard/landmark-is-top-level-evaluate.js b/lib/checks/keyboard/landmark-is-top-level.js → ...eyboard/landmark-is-top-level-evaluate.js
diff --git a/lib/checks/keyboard/landmark-is-top-level.json b/lib/checks/keyboard/landmark-is-top-level.json
@@ -1,6 +1,6 @@
 {
 	"id": "landmark-is-top-level",
-	"evaluate": "landmark-is-top-level.js",
+	"evaluate": "landmark-is-top-level-evaluate.js",
 	"metadata": {
 		"impact": "moderate",
 		"messages": {

diff --git a/lib/checks/keyboard/page-has-elm.js → lib/checks/keyboard/page-has-elm-evaluate.js b/lib/checks/keyboard/page-has-elm.js → lib/checks/keyboard/page-has-elm-evaluate.js
diff --git a/lib/checks/keyboard/page-has-heading-one.json b/lib/checks/keyboard/page-has-heading-one.json
@@ -1,6 +1,6 @@
 {
 	"id": "page-has-heading-one",
-	"evaluate": "page-has-elm.js",
+	"evaluate": "page-has-elm-evaluate.js",
 	"after": "page-has-elm-after.js",
 	"options": {
 		"selector": "h1:not([role]), [role=\"heading\"][aria-level=\"1\"]"

diff --git a/lib/checks/keyboard/page-has-main.json b/lib/checks/keyboard/page-has-main.json
@@ -1,6 +1,6 @@
 {
 	"id": "page-has-main",
-	"evaluate": "page-has-elm.js",
+	"evaluate": "page-has-elm-evaluate.js",
 	"after": "page-has-elm-after.js",
 	"options": {
 		"selector": "main:not([role]), [role='main']"

diff --git a/lib/checks/keyboard/page-no-duplicate-banner.json b/lib/checks/keyboard/page-no-duplicate-banner.json
@@ -1,6 +1,6 @@
 {
 	"id": "page-no-duplicate-banner",
-	"evaluate": "page-no-duplicate.js",
+	"evaluate": "page-no-duplicate-evaluate.js",
 	"after": "page-no-duplicate-after.js",
 	"options": {
 		"selector": "header:not([role]), [role=banner]",

diff --git a/lib/checks/keyboard/page-no-duplicate-contentinfo.json b/lib/checks/keyboard/page-no-duplicate-contentinfo.json
@@ -1,6 +1,6 @@
 {
 	"id": "page-no-duplicate-contentinfo",
-	"evaluate": "page-no-duplicate.js",
+	"evaluate": "page-no-duplicate-evaluate.js",
 	"after": "page-no-duplicate-after.js",
 	"options": {
 		"selector": "footer:not([role]), [role=contentinfo]",

diff --git a/lib/checks/keyboard/page-no-duplicate.js → ...ks/keyboard/page-no-duplicate-evaluate.js b/lib/checks/keyboard/page-no-duplicate.js → ...ks/keyboard/page-no-duplicate-evaluate.js
diff --git a/lib/checks/keyboard/page-no-duplicate-main.json b/lib/checks/keyboard/page-no-duplicate-main.json
@@ -1,6 +1,6 @@
 {
 	"id": "page-no-duplicate-main",
-	"evaluate": "page-no-duplicate.js",
+	"evaluate": "page-no-duplicate-evaluate.js",
 	"after": "page-no-duplicate-after.js",
 	"options": {
 		"selector": "main:not([role]), [role='main']"

diff --git a/lib/checks/keyboard/tabindex.js → lib/checks/keyboard/tabindex-evaluate.js b/lib/checks/keyboard/tabindex.js → lib/checks/keyboard/tabindex-evaluate.js
diff --git a/lib/checks/keyboard/tabindex.json b/lib/checks/keyboard/tabindex.json
@@ -1,6 +1,6 @@
 {
 	"id": "tabindex",
-	"evaluate": "tabindex.js",
+	"evaluate": "tabindex-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/label/alt-space-value.js → lib/checks/label/alt-space-value-evaluate.js b/lib/checks/label/alt-space-value.js → lib/checks/label/alt-space-value-evaluate.js
diff --git a/lib/checks/label/alt-space-value.json b/lib/checks/label/alt-space-value.json
@@ -1,6 +1,6 @@
 {
 	"id": "alt-space-value",
-	"evaluate": "alt-space-value.js",
+	"evaluate": "alt-space-value-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/label/duplicate-img-label.js → ...cks/label/duplicate-img-label-evaluate.js b/lib/checks/label/duplicate-img-label.js → ...cks/label/duplicate-img-label-evaluate.js
diff --git a/lib/checks/label/duplicate-img-label.json b/lib/checks/label/duplicate-img-label.json
@@ -1,6 +1,6 @@
 {
 	"id": "duplicate-img-label",
-	"evaluate": "duplicate-img-label.js",
+	"evaluate": "duplicate-img-label-evaluate.js",
 	"metadata": {
 		"impact": "minor",
 		"messages": {

diff --git a/lib/checks/label/explicit.js → lib/checks/label/explicit-evaluate.js b/lib/checks/label/explicit.js → lib/checks/label/explicit-evaluate.js
diff --git a/lib/checks/label/explicit.json b/lib/checks/label/explicit.json
@@ -1,6 +1,6 @@
 {
 	"id": "explicit-label",
-	"evaluate": "explicit.js",
+	"evaluate": "explicit-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/label/help-same-as-label.js → ...ecks/label/help-same-as-label-evaluate.js b/lib/checks/label/help-same-as-label.js → ...ecks/label/help-same-as-label-evaluate.js
diff --git a/lib/checks/label/help-same-as-label.json b/lib/checks/label/help-same-as-label.json
@@ -1,6 +1,6 @@
 {
 	"id": "help-same-as-label",
-	"evaluate": "help-same-as-label.js",
+	"evaluate": "help-same-as-label-evaluate.js",
 	"enabled": false,
 	"metadata": {
 		"impact": "minor",

diff --git a/lib/checks/label/hidden-explicit-label.js → ...s/label/hidden-explicit-label-evaluate.js b/lib/checks/label/hidden-explicit-label.js → ...s/label/hidden-explicit-label-evaluate.js
diff --git a/lib/checks/label/hidden-explicit-label.json b/lib/checks/label/hidden-explicit-label.json
@@ -1,6 +1,6 @@
 {
 	"id": "hidden-explicit-label",
-	"evaluate": "hidden-explicit-label.js",
+	"evaluate": "hidden-explicit-label-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/lib/checks/label/implicit.js → lib/checks/label/implicit-evaluate.js b/lib/checks/label/implicit.js → lib/checks/label/implicit-evaluate.js
diff --git a/lib/checks/label/implicit.json b/lib/checks/label/implicit.json
@@ -1,6 +1,6 @@
 {
 	"id": "implicit-label",
-	"evaluate": "implicit.js",
+	"evaluate": "implicit-evaluate.js",
 	"metadata": {
 		"impact": "critical",
 		"messages": {

diff --git a/...ecks/label/label-content-name-mismatch.js → ...l/label-content-name-mismatch-evaluate.js b/...ecks/label/label-content-name-mismatch.js → ...l/label-content-name-mismatch-evaluate.js
diff --git a/lib/checks/label/label-content-name-mismatch.json b/lib/checks/label/label-content-name-mismatch.json
@@ -1,6 +1,6 @@
 {
 	"id": "label-content-name-mismatch",
-	"evaluate": "label-content-name-mismatch.js",
+	"evaluate": "label-content-name-mismatch-evaluate.js",
 	"options": {
 		"pixelThreshold": 0.1,
 		"occuranceThreshold": 3

diff --git a/lib/checks/label/multiple-label.js → lib/checks/label/multiple-label-evaluate.js b/lib/checks/label/multiple-label.js → lib/checks/label/multiple-label-evaluate.js
diff --git a/lib/checks/label/multiple-label.json b/lib/checks/label/multiple-label.json
@@ -1,6 +1,6 @@
 {
 	"id": "multiple-label",
-	"evaluate": "multiple-label.js",
+	"evaluate": "multiple-label-evaluate.js",
 	"metadata": {
 		"impact": "moderate",
 		"messages": {

diff --git a/lib/checks/label/title-only.js → lib/checks/label/title-only-evaluate.js b/lib/checks/label/title-only.js → lib/checks/label/title-only-evaluate.js
diff --git a/lib/checks/label/title-only.json b/lib/checks/label/title-only.json
@@ -1,6 +1,6 @@
 {
 	"id": "title-only",
-	"evaluate": "title-only.js",
+	"evaluate": "title-only-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/landmarks/landmark-is-unique.js → .../landmarks/landmark-is-unique-evaluate.js b/lib/checks/landmarks/landmark-is-unique.js → .../landmarks/landmark-is-unique-evaluate.js
diff --git a/lib/checks/landmarks/landmark-is-unique.json b/lib/checks/landmarks/landmark-is-unique.json
@@ -1,6 +1,6 @@
 {
 	"id": "landmark-is-unique",
-	"evaluate": "landmark-is-unique.js",
+	"evaluate": "landmark-is-unique-evaluate.js",
 	"after": "landmark-is-unique-after.js",
 	"metadata": {
 		"impact": "moderate",

diff --git a/lib/checks/language/has-lang.js → lib/checks/language/has-lang-evaluate.js b/lib/checks/language/has-lang.js → lib/checks/language/has-lang-evaluate.js
diff --git a/lib/checks/language/has-lang.json b/lib/checks/language/has-lang.json
@@ -1,6 +1,6 @@
 {
 	"id": "has-lang",
-	"evaluate": "has-lang.js",
+	"evaluate": "has-lang-evaluate.js",
 	"metadata": {
 		"impact": "serious",
 		"messages": {

diff --git a/lib/checks/language/valid-lang.js → lib/checks/language/valid-lang-evaluate.js b/lib/checks/language/valid-lang.js → lib/checks/language/valid-lang-evaluate.js