Issue #2161: unify test input file names

45 files changed, 160 insertions, 160 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
index aefd5a9f0..117a84d86 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java
@@ -81,7 +81,7 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
             "79: " + msg,
             "82: " + msg,
         };
-        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharacters.java"), expected);
     }
 
     @Test
@@ -114,7 +114,7 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
             "79: " + msg,
             "82: " + msg,
         };
-        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharacters.java"), expected);
     }
 
     @Test
@@ -142,7 +142,7 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
             "79: " + msg,
             "82: " + msg,
         };
-        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharacters.java"), expected);
     }
 
     @Test
@@ -161,7 +161,7 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
             "33: " + msg,
             "42: " + msg,
         };
-        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharacters.java"), expected);
     }
 
     @Test
@@ -183,7 +183,7 @@ public class AvoidEscapedUnicodeCharactersCheckTest extends BaseCheckTestSupport
             "34: " + msg,
             "42: " + msg,
         };
-        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharactersCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidEscapedUnicodeCharacters.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
index b0827ad18..5390be926 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheckTest.java
@@ -233,7 +233,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
             "15:11: Return from catch is not allowed.",
         };
 
-        verify(checkConfig, getPath("InputReturnFromCatchCheck.java"), expected);
+        verify(checkConfig, getPath("InputReturnFromCatch.java"), expected);
     }
 
     @Test
@@ -250,7 +250,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
             "15:11: Return from finally is not allowed.",
         };
 
-        verify(checkConfig, getPath("InputReturnFromFinallyCheck.java"), expected);
+        verify(checkConfig, getPath("InputReturnFromFinally.java"), expected);
     }
 
     @Test
@@ -264,7 +264,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
 
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputReturnFromFinallyCheck.java"), expected);
+        verify(checkConfig, getPath("InputReturnFromFinally.java"), expected);
     }
 
     @Test
@@ -284,7 +284,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
             "23:51: this cannot be null.",
         };
 
-        verify(checkConfig, getPath("InputReturnFromFinallyCheck.java"), expected);
+        verify(checkConfig, getPath("InputReturnFromFinally.java"), expected);
     }
 
     @Test
@@ -303,7 +303,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
             "23:51: " + getCheckMessage(MSG_KEY_SUM_MAX, 2, 1, "NOT_EQUAL"),
         };
 
-        verify(checkConfig, getPath("InputReturnFromFinallyCheck.java"), expected);
+        verify(checkConfig, getPath("InputReturnFromFinally.java"), expected);
     }
 
     @Test
@@ -324,7 +324,7 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
             "24:77: " + getCheckMessage(MSG_KEY_SUM_MIN, 1, 3, "EQUAL"),
         };
 
-        verify(checkConfig, getPath("InputReturnFromFinallyCheck.java"), expected);
+        verify(checkConfig, getPath("InputReturnFromFinally.java"), expected);
     }
 
     @Test
@@ -346,6 +346,6 @@ public class DescendantTokenCheckTest extends BaseCheckTestSupport {
             "24:77: custom message",
         };
 
-        verify(checkConfig, getPath("InputReturnFromFinallyCheck.java"), expected);
+        verify(checkConfig, getPath("InputReturnFromFinally.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
index a9a5fe49a..78573c554 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
@@ -87,21 +87,21 @@ public class OuterTypeFilenameCheckTest extends BaseCheckTestSupport {
     public void testNestedClass() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(OuterTypeFilenameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputOuterTypeFilenameCheck1.java"), expected);
+        verify(checkConfig, getPath("InputOuterTypeFilename1.java"), expected);
     }
 
     @Test
     public void testFinePublic() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(OuterTypeFilenameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputOuterTypeFilenameCheck2.java"), expected);
+        verify(checkConfig, getPath("InputOuterTypeFilename2.java"), expected);
     }
 
     @Test
     public void testFineDefault() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(OuterTypeFilenameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputOuterTypeFilenameCheck3.java"), expected);
+        verify(checkConfig, getPath("InputOuterTypeFilename3.java"), expected);
     }
 
     @Test
@@ -110,7 +110,7 @@ public class OuterTypeFilenameCheckTest extends BaseCheckTestSupport {
         final String[] expected = {
             "4: " + getCheckMessage("type.file.mismatch"),
         };
-        verify(checkConfig, getPath("InputOuterTypeFilenameCheck5.java"), expected);
+        verify(checkConfig, getPath("InputOuterTypeFilename5.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java
index d9fa88143..ce4ee82af 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java
@@ -84,7 +84,7 @@ public class UniquePropertiesCheckTest extends BaseFileSetCheckTestSupport {
             "28: " + getCheckMessage(MSG_KEY, "Support Link ", 2),
             "34: " + getCheckMessage(MSG_KEY, "failed", 2),
         };
-        verify(checkConfig, getPath("InputUniquePropertiesCheck.properties"), expected);
+        verify(checkConfig, getPath("InputUniqueProperties.properties"), expected);
     }
 
     /**
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java
index d472f92a5..ff88ed45f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheckTest.java
@@ -109,7 +109,7 @@ public class AnnotationLocationCheckTest extends BaseCheckTestSupport {
     public void testWithoutAnnotations() throws Exception {
         DefaultConfiguration checkConfig = createCheckConfig(AnnotationLocationCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputAnnotationLocationCheckTest1.java"), expected);
+        verify(checkConfig, getPath("InputAnnotationLocation1.java"), expected);
     }
 
     @Test
@@ -145,7 +145,7 @@ public class AnnotationLocationCheckTest extends BaseCheckTestSupport {
             "3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation12"),
             "3: " + getCheckMessage(MSG_KEY_ANNOTATION_LOCATION_ALONE, "MyAnnotation13"),
             };
-        verify(checkConfig, getPath("InputAnnotationLocationCheckTest2.java"), expected);
+        verify(checkConfig, getPath("InputAnnotationLocation2.java"), expected);
     }
 
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleTest.java
index 6ab7d3fa3..96761fba2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleTest.java
@@ -282,7 +282,7 @@ public class AnnotationUseStyleTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("trailingArrayComma", "ignore");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputAnnotationUseStyleCheckTest.java"), expected);
+        verify(checkConfig, getPath("InputAnnotationUseStyle.java"), expected);
 
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedTest.java
index dda7fabba..81a973ace 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedTest.java
@@ -154,7 +154,7 @@ public class MissingDeprecatedTest extends BaseCheckTestSupport {
             "12: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
         };
 
-        verify(checkConfig, getPath("InputMissingDeprecatedCheckTest1.java"), expected);
+        verify(checkConfig, getPath("InputMissingDeprecated1.java"), expected);
     }
 
     @Test
@@ -167,6 +167,6 @@ public class MissingDeprecatedTest extends BaseCheckTestSupport {
             "11: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
         };
 
-        verify(checkConfig, getPath("InputMissingDeprecatedCheckTest2.java"), expected);
+        verify(checkConfig, getPath("InputMissingDeprecated2.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationTest.java
index 5b5571e79..6a8c2fc27 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/PackageAnnotationTest.java
@@ -69,7 +69,7 @@ public class PackageAnnotationTest extends BaseCheckTestSupport {
 
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputPackageAnnotationCheckTest.java"), expected);
+        verify(checkConfig, getPath("InputPackageAnnotation.java"), expected);
     }
 
     @Test
@@ -80,6 +80,6 @@ public class PackageAnnotationTest extends BaseCheckTestSupport {
             "0: Package annotations must be in the package-info.java info.",
         };
 
-        verify(checkConfig, getNonCompilablePath("InputPackageAnnotationCheckTest2.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputPackageAnnotation2.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java
index 9bf03019e..412218751 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheckTest.java
@@ -57,7 +57,7 @@ public class EmptyCatchBlockCheckTest extends BaseCheckTestSupport {
             "35: Empty catch block.",
             "42: Empty catch block.",
         };
-        verify(checkConfig, getPath("InputEmptyCatchBlockCheck.java"), expected);
+        verify(checkConfig, getPath("InputEmptyCatchBlock.java"), expected);
     }
 
     @Test
@@ -76,7 +76,7 @@ public class EmptyCatchBlockCheckTest extends BaseCheckTestSupport {
             "230: Empty catch block.",
             "239: Empty catch block.",
         };
-        verify(checkConfig, getPath("InputEmptyCatchBlockCheck.java"), expected);
+        verify(checkConfig, getPath("InputEmptyCatchBlock.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
index 8133bf1ec..c20a8c534 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
@@ -120,7 +120,7 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("tokens", "LITERAL_WHILE, LITERAL_DO, LITERAL_FOR");
         checkConfig.addAttribute("allowSingleLineStatement", "true");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputNeedBracesCheckTest.java"), expected);
+        verify(checkConfig, getPath("InputNeedBraces.java"), expected);
     }
 
     @Test
@@ -138,6 +138,6 @@ public class NeedBracesCheckTest extends BaseCheckTestSupport {
             "49: " + getCheckMessage(MSG_KEY_NEED_BRACES, "default"),
             "56: " + getCheckMessage(MSG_KEY_NEED_BRACES, "default"),
         };
-        verify(checkConfig, getPath("InputNeedBracesCheckTest.java"), expected);
+        verify(checkConfig, getPath("InputNeedBraces.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java
index b412a915e..a4d70dbc6 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheckTest.java
@@ -56,7 +56,7 @@ public class EqualsHashCodeCheckTest
         final DefaultConfiguration checkConfig =
             createCheckConfig(EqualsHashCodeCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputEqualsHashCodeCheck.java"), expected);
+        verify(checkConfig, getPath("InputEqualsHashCode.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
index 63caad94f..2beabd4aa 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
@@ -106,7 +106,7 @@ public class FinalLocalVariableCheckTest
         checkConfig.addAttribute("tokens", "VARIABLE_DEF, PARAMETER_DEF");
 
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputFinalLocalVariableCheckFalsePositive.java"), expected);
+        verify(checkConfig, getPath("InputFinalLocalVariableFalsePositive.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java
index 18f41dc52..60a14ff7a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheckTest.java
@@ -50,7 +50,7 @@ public class IllegalCatchCheckTest extends BaseCheckTestSupport {
             "16:11: " + getCheckMessage(MSG_KEY, "java.lang.Throwable"),
         };
 
-        verify(checkConfig, getPath("InputIllegalCatchCheck.java"), expected);
+        verify(checkConfig, getPath("InputIllegalCatch.java"), expected);
     }
 
     @Test
@@ -66,7 +66,7 @@ public class IllegalCatchCheckTest extends BaseCheckTestSupport {
             "16:11: " + getCheckMessage(MSG_KEY, "java.lang.Throwable"),
         };
 
-        verify(checkConfig, getPath("InputIllegalCatchCheck.java"), expected);
+        verify(checkConfig, getPath("InputIllegalCatch.java"), expected);
     }
 
     @Test
@@ -80,7 +80,7 @@ public class IllegalCatchCheckTest extends BaseCheckTestSupport {
             "16:11: " + getCheckMessage(MSG_KEY, "RuntimeException"),
         };
 
-        verify(checkConfig, getPath("InputIllegalCatchCheck2.java"), expected);
+        verify(checkConfig, getPath("InputIllegalCatch2.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java
index bc3ce5b86..ae8b6b5be 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalInstantiationCheckTest.java
@@ -77,7 +77,7 @@ public class IllegalInstantiationCheckTest
                 createCheckConfig(IllegalInstantiationCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
         verify(checkConfig,
-                getNonCompilablePath("InputIllegalInstantiationCheckTest2.java"),
+                getNonCompilablePath("InputIllegalInstantiation2.java"),
                 expected);
     }
 
@@ -92,7 +92,7 @@ public class IllegalInstantiationCheckTest
             "3:19: " + getCheckMessage(MSG_KEY, "java.lang.Boolean"),
         };
         verify(checkConfig,
-                getNonCompilablePath("InputIllegalInstantiationCheckNoPackage.java"),
+                getNonCompilablePath("InputIllegalInstantiationNoPackage.java"),
                 expected);
     }
 
@@ -108,7 +108,7 @@ public class IllegalInstantiationCheckTest
             "11:20: " + getCheckMessage(MSG_KEY, "java.lang.String"),
         };
         verify(checkConfig,
-                getNonCompilablePath("InputIllegalInstantiationCheckLang.java"),
+                getNonCompilablePath("InputIllegalInstantiationLang.java"),
                 expected);
     }
 
@@ -121,7 +121,7 @@ public class IllegalInstantiationCheckTest
                 "jjva.lang.Boolean,java.lang*Boolean");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
         verify(checkConfig,
-                getNonCompilablePath("InputIllegalInstantiationCheckLang.java"),
+                getNonCompilablePath("InputIllegalInstantiationLang.java"),
                 expected);
     }
 
@@ -155,7 +155,7 @@ public class IllegalInstantiationCheckTest
         elistAst.setNextSibling(rparenAst);
 
         IllegalInstantiationCheck check = new IllegalInstantiationCheck();
-        File inputFile = new File(getNonCompilablePath("InputIllegalInstantiationCheckLang.java"));
+        File inputFile = new File(getNonCompilablePath("InputIllegalInstantiationLang.java"));
         check.setFileContents(new FileContents(new FileText(inputFile, "UTF-8")));
         check.configure(createCheckConfig(IllegalInstantiationCheck.class));
         check.setMessages(new LocalizedMessages());
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java
index 61010bdeb..8e51bd250 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheckTest.java
@@ -48,7 +48,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport {
             "14:73: " + getCheckMessage(MSG_KEY, "java.lang.Error"),
         };
 
-        verify(checkConfig, getPath("InputIllegalThrowsCheck.java"), expected);
+        verify(checkConfig, getPath("InputIllegalThrows.java"), expected);
     }
 
     @Test
@@ -66,7 +66,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport {
             "14:73: " + getCheckMessage(MSG_KEY, "java.lang.Error"),
         };
 
-        verify(checkConfig, getPath("InputIllegalThrowsCheck.java"), expected);
+        verify(checkConfig, getPath("InputIllegalThrows.java"), expected);
     }
 
     /**
@@ -82,7 +82,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport {
             "18:35: " + getCheckMessage(MSG_KEY, "Throwable"),
         };
 
-        verify(checkConfig, getPath("InputIllegalThrowsCheck.java"), expected);
+        verify(checkConfig, getPath("InputIllegalThrows.java"), expected);
     }
 
     /**
@@ -100,7 +100,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport {
             "18:35: " + getCheckMessage(MSG_KEY, "Throwable"),
         };
 
-        verify(checkConfig, getPath("InputIllegalThrowsCheck.java"), expected);
+        verify(checkConfig, getPath("InputIllegalThrows.java"), expected);
     }
 
     /**
@@ -114,7 +114,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport {
 
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputIllegalThrowsCheckIgnoreOverriddenMethods.java"), expected);
+        verify(checkConfig, getPath("InputIllegalThrowsIgnoreOverriddenMethods.java"), expected);
     }
 
     /**
@@ -131,7 +131,7 @@ public class IllegalThrowsCheckTest extends BaseCheckTestSupport {
             "12:51: " + getCheckMessage(MSG_KEY, "RuntimeException"),
         };
 
-        verify(checkConfig, getPath("InputIllegalThrowsCheckIgnoreOverriddenMethods.java"), expected);
+        verify(checkConfig, getPath("InputIllegalThrowsIgnoreOverriddenMethods.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
index c84c00fa3..d8a323a6b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheckTest.java
@@ -93,6 +93,6 @@ public class OneStatementPerLineCheckTest extends BaseCheckTestSupport {
             "24:6: " + getCheckMessage(MSG_KEY),
         };
 
-        verify(checkConfig, getNonCompilablePath("InputOneStatementPerLineCheck.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputOneStatementPerLine.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckTest.java
index 3cd5937bc..b7ece4834 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/SuperCloneCheckTest.java
@@ -64,7 +64,7 @@ public class SuperCloneCheckTest
             "13:8: " + getCheckMessage(MSG_KEY, "clone", "super.clone"),
             "19:8: " + getCheckMessage(MSG_KEY, "clone", "super.clone"),
         };
-        verify(checkConfig, getNonCompilablePath("InputSuperCloneCheck.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputSuperClone.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java
index 79dcab55f..aefe1b333 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheckTest.java
@@ -80,7 +80,7 @@ public class VariableDeclarationUsageDistanceCheckTest extends
             "901: " + getCheckMessage(MSG_KEY, "a", 4, 1),
             "967: " + getCheckMessage(MSG_KEY, "a", 4, 1),
         };
-        verify(checkConfig, getPath("InputVariableDeclarationUsageDistanceCheck.java"), expected);
+        verify(checkConfig, getPath("InputVariableDeclarationUsageDistance.java"), expected);
     }
 
     @Test
@@ -100,7 +100,7 @@ public class VariableDeclarationUsageDistanceCheckTest extends
             "901: " + getCheckMessage(MSG_KEY, "a", 4, 3),
             "967: " + getCheckMessage(MSG_KEY, "a", 4, 3),
         };
-        verify(checkConfig, getPath("InputVariableDeclarationUsageDistanceCheck.java"), expected);
+        verify(checkConfig, getPath("InputVariableDeclarationUsageDistance.java"), expected);
     }
 
     @Test
@@ -138,7 +138,7 @@ public class VariableDeclarationUsageDistanceCheckTest extends
             "540: " + getCheckMessage(MSG_KEY, "id", 2, 1),
             "542: " + getCheckMessage(MSG_KEY, "parentId", 3, 1),
         };
-        verify(checkConfig, getPath("InputVariableDeclarationUsageDistanceCheck.java"), expected);
+        verify(checkConfig, getPath("InputVariableDeclarationUsageDistance.java"), expected);
     }
 
     @Test
@@ -171,7 +171,7 @@ public class VariableDeclarationUsageDistanceCheckTest extends
             "540: Distance between variable 'id' declaration and its first usage is 2, but allowed 1.",
             "542: Distance between variable 'parentId' declaration and its first usage is 4, but allowed 1.",
         };
-        verify(checkConfig, getPath("InputVariableDeclarationUsageDistanceCheck.java"), expected);
+        verify(checkConfig, getPath("InputVariableDeclarationUsageDistance.java"), expected);
     }
 
     @Test
@@ -214,7 +214,7 @@ public class VariableDeclarationUsageDistanceCheckTest extends
             "901: " + getCheckMessage(MSG_KEY_EXT, "a", 4, 1),
             "967: " + getCheckMessage(MSG_KEY_EXT, "a", 4, 1),
         };
-        verify(checkConfig, getPath("InputVariableDeclarationUsageDistanceCheck.java"), expected);
+        verify(checkConfig, getPath("InputVariableDeclarationUsageDistance.java"), expected);
     }
 
     @Test
@@ -237,6 +237,6 @@ public class VariableDeclarationUsageDistanceCheckTest extends
         };
 
         createChecker(checkConfig);
-        verify(checkConfig, getPath("InputVariableDeclarationUsageDistanceCheck.java"), expected);
+        verify(checkConfig, getPath("InputVariableDeclarationUsageDistance.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java
index 3f26e6934..d3f891704 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheckTest.java
@@ -56,7 +56,7 @@ public class InnerTypeLastCheckTest extends BaseCheckTestSupport {
             "78:5: " + getCheckMessage(MSG_KEY),
             "95:9: " + getCheckMessage(MSG_KEY),
         };
-        verify(checkConfig, getPath("InputInnerClassCheck.java"), expected);
+        verify(checkConfig, getPath("InputInnerClass.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java
index d43626ea7..7d6babbe9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportTest.java
@@ -53,7 +53,7 @@ public class AvoidStarImportTest
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.*"),
         };
 
-        verify(checkConfig, getPath("InputAvoidStarImportCheck.java"),
+        verify(checkConfig, getPath("InputAvoidStarImport.java"),
                 expected);
     }
 
@@ -69,7 +69,7 @@ public class AvoidStarImportTest
             "7: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.*"),
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.*"),
         };
-        verify(checkConfig, getPath("InputAvoidStarImportCheck.java"),
+        verify(checkConfig, getPath("InputAvoidStarImport.java"),
                 expected2);
     }
 
@@ -82,7 +82,7 @@ public class AvoidStarImportTest
             "25: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
             "26: " + getCheckMessage(MSG_KEY, "javax.swing.WindowConstants.*"),
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.*"), };
-        verify(checkConfig, getPath("InputAvoidStarImportCheck.java"), expected2);
+        verify(checkConfig, getPath("InputAvoidStarImport.java"), expected2);
     }
 
     @Test
@@ -95,7 +95,7 @@ public class AvoidStarImportTest
             "9: " + getCheckMessage(MSG_KEY, "java.io.*"),
             "10: " + getCheckMessage(MSG_KEY, "java.lang.*"),
         };
-        verify(checkConfig, getPath("InputAvoidStarImportCheck.java"), expected2);
+        verify(checkConfig, getPath("InputAvoidStarImport.java"), expected2);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportTest.java
index f7c43cff4..d2e4a4444 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportTest.java
@@ -61,7 +61,7 @@ public class AvoidStaticImportTest
             "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
 
-        verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidStaticImport.java"), expected);
     }
 
     @Test
@@ -77,7 +77,7 @@ public class AvoidStaticImportTest
             "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"),
             "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
-        verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidStaticImport.java"), expected);
     }
 
     @Test
@@ -95,7 +95,7 @@ public class AvoidStaticImportTest
             "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"),
             "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
-        verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidStaticImport.java"), expected);
     }
 
     @Test
@@ -118,7 +118,7 @@ public class AvoidStaticImportTest
             "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"),
             "30: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass.one"),
         };
-        verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidStaticImport.java"), expected);
     }
 
     @Test
@@ -139,7 +139,7 @@ public class AvoidStaticImportTest
             "28: " + getCheckMessage(MSG_KEY, "java.io.File.pathSeparator"),
             "29: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.checks.imports.InputAvoidStaticImportNestedClass.InnerClass"),
         };
-        verify(checkConfig, getPath("InputAvoidStaticImportCheck.java"), expected);
+        verify(checkConfig, getPath("InputAvoidStaticImport.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java
index 72d9d1788..c5faa9b65 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheckTest.java
@@ -56,7 +56,7 @@ public class IllegalImportCheckTest extends BaseCheckTestSupport {
             "23:1: " + getCheckMessage(MSG_KEY, "java.io.File.listRoots"),
             "27:1: " + getCheckMessage(MSG_KEY, "java.io.File.createTempFile"),
         };
-        verify(checkConfig, getPath("InputIllegalImportCheck.java"), expected);
+        verify(checkConfig, getPath("InputIllegalImport.java"), expected);
     }
 
     @Test
@@ -68,7 +68,7 @@ public class IllegalImportCheckTest extends BaseCheckTestSupport {
             "15:1: " + getCheckMessage(MSG_KEY, "sun.applet.*"),
             "28:1: " + getCheckMessage(MSG_KEY, "sun.*"),
         };
-        verify(checkConfig, getPath("InputIllegalImportCheck.java"), expected);
+        verify(checkConfig, getPath("InputIllegalImport.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java
index a45958030..8b9511da4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheckTest.java
@@ -71,7 +71,7 @@ public class RedundantImportCheckTest
             "14:1: " + getCheckMessage(MSG_DUPLICATE, 13, "java.util.List"),
             "26:1: " + getCheckMessage(MSG_DUPLICATE, 25, "javax.swing.WindowConstants.*"),
         };
-        verify(checkConfig, getPath("InputRedundantImportCheck.java"), expected);
+        verify(checkConfig, getPath("InputRedundantImport.java"), expected);
     }
 
     @Test
@@ -83,7 +83,7 @@ public class RedundantImportCheckTest
             "2:1: " + getCheckMessage(MSG_DUPLICATE, 1, "java.util.List"),
             "4:1: " + getCheckMessage(MSG_LANG, "java.lang.String"),
         };
-        verify(checkConfig, getNonCompilablePath("InputRedundantImportCheck_UnnamedPackage.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputRedundantImport_UnnamedPackage.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java
index 9d3de1e43..d8bc81736 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheckTest.java
@@ -74,7 +74,7 @@ public class UnusedImportsCheckTest extends BaseCheckTestSupport {
             "44:8: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.DefaultConfiguration"),
             "45:8: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.DefaultLogger"),
         };
-        verify(checkConfig, getPath("InputUnusedImportsCheck.java"), expected);
+        verify(checkConfig, getPath("InputUnusedImports.java"), expected);
     }
 
     @Test
@@ -94,7 +94,7 @@ public class UnusedImportsCheckTest extends BaseCheckTestSupport {
             "32:8: " + getCheckMessage(MSG_KEY, "java.awt.Label"),
             "45:8: " + getCheckMessage(MSG_KEY, "com.puppycrawl.tools.checkstyle.DefaultLogger"),
         };
-        verify(checkConfig, getPath("InputUnusedImportsCheck.java"), expected);
+        verify(checkConfig, getPath("InputUnusedImports.java"), expected);
     }
 
     @Test
@@ -168,7 +168,7 @@ public class UnusedImportsCheckTest extends BaseCheckTestSupport {
             "3:8: " + getCheckMessage(MSG_KEY, "java.util.Arrays"),
             "4:8: " + getCheckMessage(MSG_KEY, "java.lang.String"),
         };
-        verify(checkConfig, getNonCompilablePath("InputRedundantImportCheck_UnnamedPackage.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputRedundantImport_UnnamedPackage.java"), expected);
     }
 
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckTest.java
index 6fb06508e..89bc8677b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheckTest.java
@@ -59,7 +59,7 @@ public class CommentsIndentationCheckTest extends BaseCheckTestSupport {
             "51: " + getCheckMessage(MSG_KEY_BLOCK, 53, 23, 36),
             "136: " + getCheckMessage(MSG_KEY_SINGLE, 137, 20, 16),
         };
-        verify(checkConfig, getPath("InputCommentsIndentationCheckSurroundingCode.java"), expected);
+        verify(checkConfig, getPath("InputCommentsIndentationSurroundingCode.java"), expected);
     }
 
     @Test
@@ -67,7 +67,7 @@ public class CommentsIndentationCheckTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
             createCheckConfig(CommentsIndentationCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputCommentsIndentationTestNpe.java"), expected);
+        verify(checkConfig, getPath("InputCommentsIndentationNpe.java"), expected);
     }
 
     @Test
@@ -80,7 +80,7 @@ public class CommentsIndentationCheckTest extends BaseCheckTestSupport {
             "50: " + getCheckMessage(MSG_KEY_SINGLE, 51, 27, 23),
             "136: " + getCheckMessage(MSG_KEY_SINGLE, 137, 20, 16),
         };
-        verify(checkConfig, getPath("InputCommentsIndentationCheckSurroundingCode.java"), expected);
+        verify(checkConfig, getPath("InputCommentsIndentationSurroundingCode.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java
index 5528bcbb7..5b076bc48 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheckTest.java
@@ -89,7 +89,7 @@ public class AbstractJavadocCheckTest extends BaseCheckTestSupport {
         checker.setModuleClassLoader(Thread.currentThread().getContextClassLoader());
         checker.configure(checkerConfig);
 
-        verify(checker, getPath("InputCorrectJavaDocParagraphCheck.java"));
+        verify(checker, getPath("InputCorrectJavaDocParagraph.java"));
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java
index 580144047..ba806df19 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AtclauseOrderCheckTest.java
@@ -58,7 +58,7 @@ public class AtclauseOrderCheckTest extends BaseCheckTestSupport {
         DefaultConfiguration checkConfig = createCheckConfig(AtclauseOrderCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputCorrectAtClauseOrderCheck.java"), expected);
+        verify(checkConfig, getPath("InputCorrectAtClauseOrder.java"), expected);
     }
 
     @Test
@@ -108,7 +108,7 @@ public class AtclauseOrderCheckTest extends BaseCheckTestSupport {
             "278: " + getCheckMessage(MSG_KEY, tagOrder),
             "288: " + getCheckMessage(MSG_KEY, tagOrder),
         };
-        verify(checkConfig, getPath("InputIncorrectAtClauseOrderCheck.java"), expected);
+        verify(checkConfig, getPath("InputIncorrectAtClauseOrder.java"), expected);
     }
 
     @Test
@@ -125,6 +125,6 @@ public class AtclauseOrderCheckTest extends BaseCheckTestSupport {
         final String[] expected = {
             "113: " + getCheckMessage(MSG_KEY, tagOrder),
         };
-        verify(checkConfig, getPath("InputIncorrectAtClauseOrderCheck.java"), expected);
+        verify(checkConfig, getPath("InputIncorrectAtClauseOrder.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java
index 3a44f8705..6ca395e51 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java
@@ -104,7 +104,7 @@ public class JavadocMethodCheckTest extends BaseCheckTestSupport {
         final String[] expected = {
             "57:5: " + getCheckMessage(MSG_JAVADOC_MISSING),
         };
-        verify(config, getPath("InputJavadocMethodCheck_SmallMethods.java"), expected);
+        verify(config, getPath("InputJavadocMethodSmallMethods.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java
index 65dbf96f2..0f49cfb51 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocParagraphCheckTest.java
@@ -61,7 +61,7 @@ public class JavadocParagraphCheckTest extends BaseCheckTestSupport {
     public void testCorrect() throws Exception {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputCorrectJavaDocParagraphCheck.java"), expected);
+        verify(checkConfig, getPath("InputCorrectJavaDocParagraph.java"), expected);
     }
 
     @Test
@@ -104,7 +104,7 @@ public class JavadocParagraphCheckTest extends BaseCheckTestSupport {
             "81: " + getCheckMessage(MSG_TAG_AFTER),
             "82: " + getCheckMessage(MSG_TAG_AFTER),
         };
-        verify(checkConfig, getPath("InputIncorrectJavaDocParagraphCheck.java"), expected);
+        verify(checkConfig, getPath("InputIncorrectJavaDocParagraph.java"), expected);
     }
 
     @Test
@@ -131,6 +131,6 @@ public class JavadocParagraphCheckTest extends BaseCheckTestSupport {
             "81: " + getCheckMessage(MSG_TAG_AFTER),
             "82: " + getCheckMessage(MSG_TAG_AFTER),
         };
-        verify(checkConfig, getPath("InputIncorrectJavaDocParagraphCheck.java"), expected);
+        verify(checkConfig, getPath("InputIncorrectJavaDocParagraph.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java
index f589b3082..5447ee63a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheckTest.java
@@ -117,7 +117,7 @@ public class JavadocStyleCheckTest
             "405: " + getCheckMessage(NO_PERIOD),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
@@ -141,7 +141,7 @@ public class JavadocStyleCheckTest
             "405: " + getCheckMessage(NO_PERIOD),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
@@ -169,7 +169,7 @@ public class JavadocStyleCheckTest
             "405: " + getCheckMessage(NO_PERIOD),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
@@ -192,7 +192,7 @@ public class JavadocStyleCheckTest
             "378:15: " + getCheckMessage(UNCLOSED_HTML, "<b>Note:<b> it's unterminated tag.</p>"),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
@@ -202,7 +202,7 @@ public class JavadocStyleCheckTest
         checkConfig.addAttribute("checkHtml", "true");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputJavadocStyleCheckHtmlComment.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyleHtmlComment.java"), expected);
     }
 
     @Test
@@ -226,7 +226,7 @@ public class JavadocStyleCheckTest
             "386: " + getCheckMessage(NO_PERIOD),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
@@ -253,7 +253,7 @@ public class JavadocStyleCheckTest
             "386: " + getCheckMessage(NO_PERIOD),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
@@ -285,7 +285,7 @@ public class JavadocStyleCheckTest
             "405: " + getCheckMessage(NO_PERIOD),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
@@ -302,7 +302,7 @@ public class JavadocStyleCheckTest
             "230: " + getCheckMessage(EMPTY),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
@@ -330,7 +330,7 @@ public class JavadocStyleCheckTest
             "405: " + getCheckMessage(NO_PERIOD),
         };
 
-        verify(checkConfig, getPath("InputJavadocStyleCheck.java"), expected);
+        verify(checkConfig, getPath("InputJavadocStyle.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
index e08e4c78c..c968d314f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/NonEmptyAtclauseDescriptionCheckTest.java
@@ -85,6 +85,6 @@ public class NonEmptyAtclauseDescriptionCheckTest
             "92: " + getCheckMessage(MSG_KEY),
             "93: " + getCheckMessage(MSG_KEY),
         };
-        verify(checkConfig, getPath("InputNonEmptyAtclauseDescriptionCheck.java"), expected);
+        verify(checkConfig, getPath("InputNonEmptyAtclauseDescription.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
index 23da92167..33c9eb56b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SingleLineJavadocCheckTest.java
@@ -63,7 +63,7 @@ public class SingleLineJavadocCheckTest extends BaseCheckTestSupport {
             "43: " + getCheckMessage(MSG_KEY),
             "49: " + getCheckMessage(MSG_KEY),
         };
-        verify(checkConfig, getPath("InputSingleLineJavadocCheck.java"), expected);
+        verify(checkConfig, getPath("InputSingleLineJavadoc.java"), expected);
     }
 
     @Test
@@ -82,6 +82,6 @@ public class SingleLineJavadocCheckTest extends BaseCheckTestSupport {
             "46: " + getCheckMessage(MSG_KEY),
             "49: " + getCheckMessage(MSG_KEY),
         };
-        verify(checkConfig, getPath("InputSingleLineJavadocCheck.java"), expected);
+        verify(checkConfig, getPath("InputSingleLineJavadoc.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java
index b821f1538..600056629 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/SummaryJavadocCheckTest.java
@@ -61,7 +61,7 @@ public class SummaryJavadocCheckTest extends BaseCheckTestSupport {
                 "^@return the *|^This method returns *|^A [{]@code [a-zA-Z0-9]+[}]( is a )");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputCorrectSummaryJavaDocCheck.java"), expected);
+        verify(checkConfig, getPath("InputCorrectSummaryJavaDoc.java"), expected);
     }
 
     @Test
@@ -77,7 +77,7 @@ public class SummaryJavadocCheckTest extends BaseCheckTestSupport {
             "83: " + getCheckMessage(SUMMARY_JAVADOC),
             "103: " + getCheckMessage(SUMMARY_FIRST_SENTENCE),
         };
-        verify(checkConfig, getPath("InputIncorrectSummaryJavaDocCheck.java"), expected);
+        verify(checkConfig, getPath("InputIncorrectSummaryJavaDoc.java"), expected);
     }
 
     @Test
@@ -88,7 +88,7 @@ public class SummaryJavadocCheckTest extends BaseCheckTestSupport {
             "10: " + getCheckMessage(SUMMARY_FIRST_SENTENCE),
         };
 
-        verify(checkConfig, getPath("InputSummaryJavadocCheckPeriod.java"), expected);
+        verify(checkConfig, getPath("InputSummaryJavadocPeriod.java"), expected);
     }
 
     @Test
@@ -96,7 +96,7 @@ public class SummaryJavadocCheckTest extends BaseCheckTestSupport {
         checkConfig.addAttribute("period", "");
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputSummaryJavadocCheckNoPeriod.java"), expected);
+        verify(checkConfig, getPath("InputSummaryJavadocNoPeriod.java"), expected);
     }
 
     @Test
@@ -109,6 +109,6 @@ public class SummaryJavadocCheckTest extends BaseCheckTestSupport {
         };
 
         createChecker(checkConfig);
-        verify(checkConfig, getPath("InputIncorrectSummaryJavaDocCheck.java"), expected);
+        verify(checkConfig, getPath("InputIncorrectSummaryJavaDoc.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
index d3d0992a4..04c589919 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheckTest.java
@@ -50,7 +50,7 @@ public class CyclomaticComplexityCheckTest
             "4:5: " + getCheckMessage(MSG_KEY, 2, 0),
         };
 
-        verify(checkConfig, getPath("InputComplexityCheckSwitchBlocks.java"), expected);
+        verify(checkConfig, getPath("InputComplexitySwitchBlocks.java"), expected);
     }
 
     @Test
@@ -64,7 +64,7 @@ public class CyclomaticComplexityCheckTest
             "4:5: " + getCheckMessage(MSG_KEY, 5, 0),
         };
 
-        verify(checkConfig, getPath("InputComplexityCheckSwitchBlocks.java"), expected);
+        verify(checkConfig, getPath("InputComplexitySwitchBlocks.java"), expected);
     }
 
     @Test
@@ -87,7 +87,7 @@ public class CyclomaticComplexityCheckTest
             "79:13: " + getCheckMessage(MSG_KEY, 2, 0),
         };
 
-        verify(checkConfig, getPath("InputComplexityCheck.java"), expected);
+        verify(checkConfig, getPath("InputComplexity.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
index 650f9fe3a..f7b8d3f2d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheckTest.java
@@ -61,7 +61,7 @@ public class NPathComplexityCheckTest extends BaseCheckTestSupport {
             "79:13: " + getCheckMessage(MSG_KEY, 2, 0),
         };
 
-        verify(checkConfig, getPath("InputComplexityCheck.java"), expected);
+        verify(checkConfig, getPath("InputComplexity.java"), expected);
     }
 
     @Test
@@ -87,7 +87,7 @@ public class NPathComplexityCheckTest extends BaseCheckTestSupport {
         String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
         createChecker(checkConfig);
-        verify(checkConfig, getPath("InputComplexityCheck.java"), expected);
+        verify(checkConfig, getPath("InputComplexity.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
index c1bc82bf7..e39a8bea1 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
@@ -58,7 +58,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "37: " + warningMessage,
         };
 
-        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -76,7 +76,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "32: " + warningMessage,
         };
 
-        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -94,7 +94,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "37: " + warningMessage,
         };
 
-        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -120,7 +120,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "58: " + warningMessage,
         };
 
-        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -149,7 +149,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "84: " + warningMessage,
         };
 
-        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -174,7 +174,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "38: " + warningMessage,
         };
 
-        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -202,7 +202,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "60: " + warningMessage, // no ignore for static
         };
 
-        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -229,7 +229,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "59: " + warningMessage, // no ignore for final
         };
 
-        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+        verify(checkConfig, getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -248,7 +248,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
         };
 
         verify(checkConfig,
-                getPath("InputAbbreviationAsWordInTypeNameCheckOverridableMethod.java"), expected);
+                getPath("InputAbbreviationAsWordInTypeNameOverridableMethod.java"), expected);
     }
 
     @Test
@@ -294,7 +294,7 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
             "98: " + warningMessage,
         };
         verify(checkConfig,
-                getPath("InputAbbreviationAsWordInTypeNameCheck.java"), expected);
+                getPath("InputAbbreviationAsWordInTypeName.java"), expected);
     }
 
     @Test
@@ -309,6 +309,6 @@ public class AbbreviationAsWordInNameCheckTest extends BaseCheckTestSupport {
 
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
-        verify(checkConfig, getPath("InputAbstractMultisetSetCountTester.java"), expected);
+        verify(checkConfig, getPath("InputAbstractMultisetSetCount.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java
index fe8d099e2..84744986f 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheckTest.java
@@ -105,6 +105,6 @@ public class ParameterNumberCheckTest
             "6:10: " + getCheckMessage(MSG_KEY, 7, 8),
             "11:10: " + getCheckMessage(MSG_KEY, 7, 8),
         };
-        verify(checkConfig, getPath("InputParameterNumberCheck.java"), expected);
+        verify(checkConfig, getPath("InputParameterNumber.java"), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java
index c705823ba..3a47c48d4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java
@@ -62,7 +62,7 @@ public class EmptyLineSeparatorCheckTest
             "79: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"),
             "110: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "INTERFACE_DEF"),
         };
-        verify(checkConfig, getPath("InputEmptyLineSeparatorCheck.java"), expected);
+        verify(checkConfig, getPath("InputEmptyLineSeparator.java"), expected);
     }
 
     @Test
@@ -81,7 +81,7 @@ public class EmptyLineSeparatorCheckTest
             "79: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "METHOD_DEF"),
             "110: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "INTERFACE_DEF"),
         };
-        verify(checkConfig, getPath("InputEmptyLineSeparatorCheck.java"), expected);
+        verify(checkConfig, getPath("InputEmptyLineSeparator.java"), expected);
     }
 
     @Test
@@ -90,7 +90,7 @@ public class EmptyLineSeparatorCheckTest
         final String[] expected = {
             "19: " + getCheckMessage(MSG_SHOULD_BE_SEPARATED, "package"),
         };
-        verify(checkConfig, getPath("InputEmptyLineSeparatorCheckHeader.java"), expected);
+        verify(checkConfig, getPath("InputEmptyLineSeparatorHeader.java"), expected);
     }
 
     @Test
@@ -104,7 +104,7 @@ public class EmptyLineSeparatorCheckTest
             "38: " + getCheckMessage(MSG_MULTIPLE_LINES, "VARIABLE_DEF"),
             "43: " + getCheckMessage(MSG_MULTIPLE_LINES, "METHOD_DEF"),
         };
-        verify(checkConfig, getPath("InputEmptyLineSeparatorCheckMultipleEmptyLines.java"), expected);
+        verify(checkConfig, getPath("InputEmptyLineSeparatorMultipleEmptyLines.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
index 0f239f264..178a8039a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
@@ -107,7 +107,7 @@ public class GenericWhitespaceCheckTest
             "60:60: " + getCheckMessage(WS_NOT_PRECEDED, "&"),
             "63:60: " + getCheckMessage(WS_FOLLOWED, ">"),
         };
-        verify(checkConfig, getPath("InputGenericWhitespaceCheck.java"), expected);
+        verify(checkConfig, getPath("InputGenericWhitespace.java"), expected);
     }
 
     @Test
@@ -119,13 +119,13 @@ public class GenericWhitespaceCheckTest
     @Test
     public void testInnerClass() throws Exception {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputGenericWhitespaceInnerClassCheck.java"), expected);
+        verify(checkConfig, getPath("InputGenericWhitespaceInnerClass.java"), expected);
     }
 
     @Test
     public void testMethodReferences() throws Exception {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputMethodReferencesTest3.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputMethodReferences3.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
index 9920d3dc0..75ec4a325 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
@@ -115,7 +115,7 @@ public class NoWhitespaceAfterCheckTest
     @Test
     public void testNpe() throws Exception {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputNoWhiteSpaceAfterCheckFormerNpe.java"),
+        verify(checkConfig, getPath("InputNoWhiteSpaceAfterFormerNpe.java"),
                  expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CommentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CommentsTest.java
index 0484313b4..eb6ab36c3 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CommentsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/comments/CommentsTest.java
@@ -211,7 +211,7 @@ public class CommentsTest extends BaseCheckTestSupport {
 
         DetailAST ident = new DetailAST();
         ident.setType(IDENT);
-        ident.setText("InputCommentsTest_1");
+        ident.setText("InputComments1");
         ident.setLineNo(5);
         ident.setColumnNo(0);
 
@@ -436,7 +436,7 @@ public class CommentsTest extends BaseCheckTestSupport {
 
         DetailAST identClassName = new DetailAST();
         identClassName.setType(IDENT);
-        identClassName.setText("InputCommentsTest_2");
+        identClassName.setText("InputComments2");
         identClassName.setLineNo(3);
         identClassName.setColumnNo(6);
 
@@ -636,7 +636,7 @@ public class CommentsTest extends BaseCheckTestSupport {
         DefaultConfiguration checkConfig = createCheckConfig(CompareTreesWithComments.class);
         CompareTreesWithComments.expectedTree = buildInput1();
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputCommentsTest_1.java"), expected);
+        verify(checkConfig, getPath("InputComments1.java"), expected);
     }
 
     @Test
@@ -644,7 +644,7 @@ public class CommentsTest extends BaseCheckTestSupport {
         DefaultConfiguration checkConfig = createCheckConfig(CompareTreesWithComments.class);
         CompareTreesWithComments.expectedTree = buildInput2();
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputCommentsTest_2.java"), expected);
+        verify(checkConfig, getPath("InputComments2.java"), expected);
     }
 
     @Test
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationTest.java
index 765e2bc87..bd20dded4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/AnnotationTest.java
@@ -48,7 +48,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputAnnotationsTest1.java"), expected);
+        verify(checkConfig, getPath("InputAnnotations1.java"), expected);
 
     }
 
@@ -58,7 +58,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest2.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations2.java"), expected);
 
     }
 
@@ -68,7 +68,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest3.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations3.java"), expected);
 
     }
 
@@ -78,7 +78,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest4.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations4.java"), expected);
 
     }
 
@@ -88,7 +88,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest5.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations5.java"), expected);
 
     }
 
@@ -98,7 +98,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest6.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations6.java"), expected);
 
     }
 
@@ -108,7 +108,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest7.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations7.java"), expected);
 
     }
 
@@ -118,7 +118,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest8.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations8.java"), expected);
 
     }
 
@@ -128,7 +128,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest9.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations9.java"), expected);
 
     }
 
@@ -138,7 +138,7 @@ public class AnnotationTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputAnnotationsTest10.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputAnnotations10.java"), expected);
 
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/DefaultMethodsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/DefaultMethodsTest.java
index 0774d4851..8d8823bba 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/DefaultMethodsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/DefaultMethodsTest.java
@@ -48,7 +48,7 @@ public class DefaultMethodsTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputDefaultMethodsTest.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputDefaultMethods.java"), expected);
 
     }
 
@@ -58,7 +58,7 @@ public class DefaultMethodsTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputDefaultMethodsTest2.java"), expected);
+        verify(checkConfig, getPath("InputDefaultMethods2.java"), expected);
 
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/LambdaTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/LambdaTest.java
index 9ce928448..4e57d7eac 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/LambdaTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/LambdaTest.java
@@ -42,7 +42,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest1.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda1.java"), expected);
 
     }
 
@@ -52,7 +52,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest2.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda2.java"), expected);
 
     }
 
@@ -62,7 +62,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest3.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda3.java"), expected);
 
     }
 
@@ -72,7 +72,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest4.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda4.java"), expected);
 
     }
 
@@ -82,7 +82,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest5.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda5.java"), expected);
 
     }
 
@@ -92,7 +92,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest6.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda6.java"), expected);
 
     }
 
@@ -102,7 +102,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest7.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda7.java"), expected);
 
     }
 
@@ -112,7 +112,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest8.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda8.java"), expected);
 
     }
 
@@ -122,7 +122,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest9.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda9.java"), expected);
 
     }
 
@@ -132,7 +132,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest10.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda10.java"), expected);
 
     }
 
@@ -142,7 +142,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest11.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda11.java"), expected);
 
     }
 
@@ -152,7 +152,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest12.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda12.java"), expected);
 
     }
 
@@ -162,7 +162,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest13.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda13.java"), expected);
 
     }
 
@@ -172,7 +172,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest14.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda14.java"), expected);
 
     }
 
@@ -182,7 +182,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest15.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda15.java"), expected);
 
     }
 
@@ -192,7 +192,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest16.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda16.java"), expected);
 
     }
 
@@ -202,7 +202,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest17.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda17.java"), expected);
 
     }
 
@@ -212,7 +212,7 @@ public class LambdaTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputLambdaTest18.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputLambda18.java"), expected);
 
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/MethodReferencesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/MethodReferencesTest.java
index 8eb14a238..cbf7e444c 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/MethodReferencesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammars/java8/MethodReferencesTest.java
@@ -42,7 +42,7 @@ public class MethodReferencesTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputMethodReferencesTest.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputMethodReferences.java"), expected);
 
     }
 
@@ -52,7 +52,7 @@ public class MethodReferencesTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputMethodReferencesTest2.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputMethodReferences2.java"), expected);
 
     }
 
@@ -62,7 +62,7 @@ public class MethodReferencesTest extends BaseCheckTestSupport {
         final DefaultConfiguration checkConfig =
                 createCheckConfig(MemberNameCheck.class);
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getNonCompilablePath("InputMethodReferencesTest3.java"), expected);
+        verify(checkConfig, getNonCompilablePath("InputMethodReferences3.java"), expected);
 
     }
 }