61 files changed, 92 insertions, 92 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputAvoidEscapedUnicodeCharactersCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputAvoidEscapedUnicodeCharacters.java
index 8e35c520a..d7b7e74c8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputAvoidEscapedUnicodeCharactersCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputAvoidEscapedUnicodeCharacters.java
@@ -2,7 +2,7 @@ package com.puppycrawl.tools.checkstyle.checks;
 
 import java.util.concurrent.TimeUnit;
 
-public class InputAvoidEscapedUnicodeCharactersCheck {
+public class InputAvoidEscapedUnicodeCharacters {
 
 	private String unitAbbrev2 = "\u03bcs";
 
@@ -82,4 +82,4 @@ public class InputAvoidEscapedUnicodeCharactersCheck {
 	          return c >= '\u2000' && c <= '\u200a';
 	      }
 	 }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilename1.java
index ebab957e9..1d3cf3e21 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilename1.java
@@ -1,9 +1,9 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks;
 
-public class InputOuterTypeFilenameCheck1 {
+public class InputOuterTypeFilename1 {
     
     public class UnicClassName {
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilename2.java
index cffd1d3d9..9a513eafb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilename2.java
@@ -1,7 +1,7 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks;
 
-public class InputOuterTypeFilenameCheck2 {
+public class InputOuterTypeFilename2 {
     
   
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilename3.java
index 54748e589..10bedc341 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilename3.java
@@ -1,7 +1,7 @@
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks;
 
-class InputOuterTypeFilenameCheck3 {
+class InputOuterTypeFilename3 {
     
 
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilename5.java
index 6a5324e5c..6a5324e5c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilenameCheck5.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputOuterTypeFilename5.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputReturnFromCatchCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputReturnFromCatch.java
index b0149d8e4..68702157f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputReturnFromCatchCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputReturnFromCatch.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks;
 
-public class InputReturnFromCatchCheck {
+public class InputReturnFromCatch {
     public void foo() {
         try {
             System.currentTimeMillis();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputReturnFromFinallyCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputReturnFromFinally.java
index 085c06043..bfc0aced5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputReturnFromFinallyCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputReturnFromFinally.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks;
 
-public class InputReturnFromFinallyCheck {
+public class InputReturnFromFinally {
     public void foo() {
         try {
             System.currentTimeMillis();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUniquePropertiesCheck.properties b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUniqueProperties.properties
index c65722e1e..c65722e1e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUniquePropertiesCheck.properties
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/InputUniqueProperties.properties
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationLocationCheckTest1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationLocation1.java
index ee72b54a2..224c63dc9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationLocationCheckTest1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationLocation1.java
@@ -1,5 +1,5 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-public class InputAnnotationLocationCheckTest1 {
+public class InputAnnotationLocation1 {
 	
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationLocationCheckTest2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationLocation2.java
index 299ff5bf0..c91ff0578 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationLocationCheckTest2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationLocation2.java
@@ -1,7 +1,7 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
 @MyAnnotation11 @MyAnnotation12 @MyAnnotation13
-public class InputAnnotationLocationCheckTest2 {
+public class InputAnnotationLocation2 {
 
     @MyAnnotation13
     void method() {
@@ -23,4 +23,4 @@ public class InputAnnotationLocationCheckTest2 {
 }
 
 @interface MyAnnotation13 {
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationUseStyleCheckTest.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationUseStyle.java
index 9ea5b2449..9ea5b2449 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationUseStyleCheckTest.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputAnnotationUseStyle.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecatedCheckTest1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecated1.java
index 7160d694c..2c999ad66 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecatedCheckTest1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecated1.java
@@ -9,7 +9,7 @@ import java.lang.annotation.Inherited;
  *stuff
  *stuff
  */
-public class InputMissingDeprecatedCheckTest1
+public class InputMissingDeprecated1
 {
     
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecatedCheckTest2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecated2.java
index 0d6232f93..e1cac3ce7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecatedCheckTest2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputMissingDeprecated2.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-public class InputMissingDeprecatedCheckTest2 {
+public class InputMissingDeprecated2 {
 
 
     /**
@@ -11,4 +11,4 @@ public class InputMissingDeprecatedCheckTest2 {
     public void method(){
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotation.java
index 66caa924a..100ac8dfb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotation.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
 @Deprecated
-public class InputPackageAnnotationCheckTest {
+public class InputPackageAnnotation {
 	
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlockCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlock.java
index d398c8f7c..762deede3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlockCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCatchBlock.java
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle.checks.blocks;
 import java.io.IOException;
-public class InputEmptyCatchBlockCheck
+public class InputEmptyCatchBlock
 {
     
     private void foo() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesCheckTest.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBraces.java
index 6f0f40ec9..7e87cda6b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesCheckTest.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBraces.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.blocks;
 
-public class InputNeedBracesCheckTest
+public class InputNeedBraces
 {
     public void method() {
         if (false)
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputEqualsHashCodeCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputEqualsHashCode.java
index a6734fe11..25b9b0e8d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputEqualsHashCodeCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputEqualsHashCode.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-public class InputEqualsHashCodeCheck {
+public class InputEqualsHashCode {
     public boolean notEquals() {
         return true;
     }
@@ -32,4 +32,4 @@ public class InputEqualsHashCodeCheck {
     private int hashCode(Object o1, Object o2) {
         return 1;
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableCheckFalsePositive.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableFalsePositive.java
index c4978eb5f..32e894faa 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableCheckFalsePositive.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputFinalLocalVariableFalsePositive.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-public class InputFinalLocalVariableCheckFalsePositive
+public class InputFinalLocalVariableFalsePositive
 {
     public void method()
     {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalCatchCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalCatch.java
index 976d795ff..5b78dab13 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalCatchCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalCatch.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-public class InputIllegalCatchCheck {
+public class InputIllegalCatch {
     public void foo() {
         try { //class names
         } catch (RuntimeException e) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalCatchCheck2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalCatch2.java
index 1fe6b5fef..1ae5bbd72 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalCatchCheck2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalCatch2.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-public class InputIllegalCatchCheck2 {
+public class InputIllegalCatch2 {
     public void foo() throws OneMoreException {
         try {
         	foo1();
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrows.java
index 564933157..b5c1a6eaa 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrows.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 /** Input file */
-public class InputIllegalThrowsCheck {
+public class InputIllegalThrows {
 
     public void method() throws NullPointerException
     { // no code
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsIgnoreOverriddenMethods.java
index b74114675..dc5be6d90 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsCheckIgnoreOverriddenMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalThrowsIgnoreOverriddenMethods.java
@@ -1,7 +1,7 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-public class InputIllegalThrowsCheckIgnoreOverriddenMethods
-             extends InputIllegalThrowsCheck
+public class InputIllegalThrowsIgnoreOverriddenMethods
+             extends InputIllegalThrows
 {
     @Override
     public void methodTwo() throws RuntimeException {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputVariableDeclarationUsageDistanceCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputVariableDeclarationUsageDistance.java
index beecb3259..ff223c802 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputVariableDeclarationUsageDistanceCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/InputVariableDeclarationUsageDistance.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 import java.util.*;
-public class InputVariableDeclarationUsageDistanceCheck {
+public class InputVariableDeclarationUsageDistance {
 
 	private static int test1 = 0;
 
@@ -34,7 +34,7 @@ public class InputVariableDeclarationUsageDistanceCheck {
 		a = b; // DECLARATION OF VARIABLE 'a' SHOULD BE HERE (distance = 2)
 	}
 
-	public InputVariableDeclarationUsageDistanceCheck(int test1) {
+	public InputVariableDeclarationUsageDistance(int test1) {
 		int temp = -1;
 		this.test1 = test1;
 		temp = test1; // DECLARATION OF VARIABLE 'temp' SHOULD BE HERE (distance = 2)
@@ -42,7 +42,7 @@ public class InputVariableDeclarationUsageDistanceCheck {
 
 	public boolean testMethod() {
 		int temp = 7;
-		new InputVariableDeclarationUsageDistanceCheck(2);
+		new InputVariableDeclarationUsageDistance(2);
 		String.valueOf(temp); // DECLARATION OF VARIABLE 'temp' SHOULD BE HERE (distance = 2)
 		boolean result = false;
 		String str = "";
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputInnerClassCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputInnerClass.java
index 7e338165b..61253fa30 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputInnerClassCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputInnerClass.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.design;
 
-public class InputInnerClassCheck {
+public class InputInnerClass {
 	public int test1 = 100;
 
 	public void methodTestInner1() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImport.java
index 6011add9a..86bbf3654 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStarImport.java
@@ -53,7 +53,7 @@ import com.puppycrawl.tools.checkstyle.DefaultLogger;
  * @author Michael Studman
  * @see Calendar Should avoid unused import for Calendar
  **/
-class InputAvoidStarImportCheck
+class InputAvoidStarImport
 {
     /** ignore **/
     private Class mUse1 = Connection.class;
@@ -108,4 +108,4 @@ class InputAvoidStarImportCheck
      * @deprecated in 1 for removal in 2. Use {@link TestClass8}
      */
     public void aMethodWithManyLinks() {}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImport.java
index d918678f2..758d43c61 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputAvoidStaticImport.java
@@ -55,7 +55,7 @@ import com.puppycrawl.tools.checkstyle.DefaultLogger;
  * @author Michael Studman
  * @see Calendar Should avoid unused import for Calendar
  **/
-class InputAvoidStaticImportCheck
+class InputAvoidStaticImport
 {
     /** ignore **/
     private Class mUse1 = Connection.class;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImport.java
index a047b22ac..41970d969 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputIllegalImport.java
@@ -53,7 +53,7 @@ import com.puppycrawl.tools.checkstyle.DefaultLogger;
  * @author Michael Studman
  * @see Calendar Should avoid unused import for Calendar
  **/
-class InputIllegalImportCheck
+class InputIllegalImport
 {
     /** ignore **/
     private Class mUse1 = Connection.class;
@@ -108,4 +108,4 @@ class InputIllegalImportCheck
      * @deprecated in 1 for removal in 2. Use {@link TestClass8}
      */
     public void aMethodWithManyLinks() {}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImport.java
index 9ed2ed82e..9dd871a09 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImport.java
@@ -56,7 +56,7 @@ import static com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportChec
  * @author Michael Studman
  * @see Calendar Should avoid unused import for Calendar
  **/
-class InputRedundantImportCheck
+class InputRedundantImport
 {
     /** ignore **/
     private Class mUse1 = null;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImportsCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImports.java
index 1fbdd2677..89807a9b3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImportsCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/imports/InputUnusedImports.java
@@ -52,7 +52,7 @@ import com.puppycrawl.tools.checkstyle.DefaultLogger;
  * @author Michael Studman
  * @see Calendar Should avoid unused import for Calendar
  **/
-class InputUnusedImportsCheck
+class InputUnusedImports
 {
     /** ignore {@literal <B>Test Javadoc Tag that is not processed for imports</B>}**/
     private Class mUse1 = null;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationTestNpe.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationNpe.java
index cc5a5fe03..da3909b83 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationTestNpe.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationNpe.java
@@ -26,7 +26,7 @@ import java.lang.reflect.Method;
  * Provides convenience methods such as {@link #isPublic} and {@link #isPackagePrivate}.
  * 
  */
-class InputCommentsIndentationTestNpe {
+class InputCommentsIndentationNpe {
 
 }
 /* The Check should not throw NPE here! */
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationCheckSurroundingCode.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationSurroundingCode.java
index fe9bdf8e8..e308cdbb1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationCheckSurroundingCode.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationSurroundingCode.java
@@ -4,7 +4,7 @@ package com.puppycrawl.tools.checkstyle.checks.indentation;
 import java.util.*;
 
 // some
-public class InputCommentsIndentationCheckSurroundingCode
+public class InputCommentsIndentationSurroundingCode
 {
     private void foo() {
         if (true) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectAtClauseOrderCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectAtClauseOrder.java
index 487458003..487458003 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectAtClauseOrderCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectAtClauseOrder.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectJavaDocParagraphCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectJavaDocParagraph.java
index 3d47e044d..bfdf6ab3c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectJavaDocParagraphCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectJavaDocParagraph.java
@@ -6,7 +6,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc;
  * <p>Some Javadoc.
  *
  */
-class InputCorrectJavaDocParagraphCheck {
+class InputCorrectJavaDocParagraph {
 
     /**
      * Some Javadoc.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectSummaryJavaDocCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectSummaryJavaDoc.java
index b5c1fcfd1..93f441e99 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectSummaryJavaDocCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputCorrectSummaryJavaDoc.java
@@ -3,7 +3,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc;
 /**
  * Some Javadoc A {@code Foo} is a simple Javadoc.
  */
-class InputCorrectSummaryJavaDocCheck {
+class InputCorrectSummaryJavaDoc {
 
     /**
      * Some Javadoc This method returns.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectAtClauseOrderCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectAtClauseOrder.java
index 33b87b51a..33b87b51a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectAtClauseOrderCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectAtClauseOrder.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectJavaDocParagraphCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectJavaDocParagraph.java
index f6ddde257..f827ce4eb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectJavaDocParagraphCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectJavaDocParagraph.java
@@ -8,7 +8,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc;
  * /^ WARN/   Some Javadoc.<p> //WARN
  *
  */
-class InputInCorrectJavaDocParagraphCheck {
+class InputIncorrectJavaDocParagraph {
 
     /**
      * Some Javadoc.<P>  //WARN
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectSummaryJavaDocCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectSummaryJavaDoc.java
index 13129353c..ffef6b002 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectSummaryJavaDocCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputIncorrectSummaryJavaDoc.java
@@ -4,7 +4,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc;
  * A {@code Foo. Foo}
  * is a simple Javadoc. Some javadoc.
  */
-class InputInCorrectSummaryJavaDocCheck {
+class InputIncorrectSummaryJavaDoc {
     
     /**
      * As of JDK 1.1, replaced by {@link #setBounds(int,int,int,int)}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocMethodCheck_SmallMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocMethodSmallMethods.java
index c319ba696..a510508a5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocMethodCheck_SmallMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocMethodSmallMethods.java
@@ -4,7 +4,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc;
  * The following is a bad tag.
  * @mytag Hello
  */
-public class InputJavadocMethodCheck_SmallMethods extends Some
+public class InputJavadocMethodSmallMethods extends Some
 {
     //with comments
 
@@ -99,4 +99,4 @@ class Some {
     protected String foo11() {
         return "4";
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocStyleCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocStyle.java
index 6b151256c..24694e442 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocStyleCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocStyle.java
@@ -12,7 +12,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc;
  * @author Chris Stillwell
  * @version 1.0
  */
-public class InputJavadocStyleCheck
+public class InputJavadocStyle
 {
    // This is OK. We don't flag missing javadoc.  That's left for other checks.
    private String first;
@@ -25,7 +25,7 @@ public class InputJavadocStyleCheck
     * tags to stop the scan for the end of sentence. 
     * @see Somthing
     */
-   public InputJavadocStyleCheck()
+   public InputJavadocStyle()
    {
    }
    
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocStyleCheckHtmlComment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocStyleHtmlComment.java
index 2544b2e69..581e1ddd1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocStyleCheckHtmlComment.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputJavadocStyleHtmlComment.java
@@ -12,7 +12,7 @@ package com.puppycrawl.tools.checkstyle.checks.javadoc;
  * @author Tobias Geyer
  * @version 1.0
  */
-public class InputJavadocStyleCheckHtmlComment
+public class InputJavadocStyleHtmlComment
 {
     /**
      * sometimes a tag starts
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputNonEmptyAtclauseDescriptionCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputNonEmptyAtclauseDescription.java
index 482011f10..91c2eb1ad 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputNonEmptyAtclauseDescriptionCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputNonEmptyAtclauseDescription.java
@@ -1,12 +1,12 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
-class InputNonEmptyAtclauseDescriptionCheck
+class InputNonEmptyAtclauseDescription
 {
 	/**
 	 * Some javadoc.
 	 * @param a Some javadoc.
 	 * @param b Some javadoc.
 	 */
-	public InputNonEmptyAtclauseDescriptionCheck(String a, int b)
+	public InputNonEmptyAtclauseDescription(String a, int b)
 	{
 		
 	}
@@ -16,7 +16,7 @@ class InputNonEmptyAtclauseDescriptionCheck
 	 * @param a Some javadoc.
 	 * @deprecated Some javadoc.
 	 */
-	public InputNonEmptyAtclauseDescriptionCheck(String a)
+	public InputNonEmptyAtclauseDescription(String a)
 	{
 		
 	}
@@ -27,7 +27,7 @@ class InputNonEmptyAtclauseDescriptionCheck
 	 * @param b           
 	 * @param c     
 	 */
-	public InputNonEmptyAtclauseDescriptionCheck(String a, int b, double c)
+	public InputNonEmptyAtclauseDescription(String a, int b, double c)
 	{
 		
 	}
@@ -38,7 +38,7 @@ class InputNonEmptyAtclauseDescriptionCheck
 	 * @param e     
 	 * @deprecated     
 	 */
-	public InputNonEmptyAtclauseDescriptionCheck(String a, boolean e)
+	public InputNonEmptyAtclauseDescription(String a, boolean e)
 	{
 		
 	}
@@ -96,4 +96,4 @@ class InputNonEmptyAtclauseDescriptionCheck
 	{
 		return 1;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSingleLineJavadocCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSingleLineJavadoc.java
index c112fe1fc..c112fe1fc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSingleLineJavadocCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSingleLineJavadoc.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSummaryJavadocCheckNoPeriod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSummaryJavadocNoPeriod.java
index ca33f49d6..534964adb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSummaryJavadocCheckNoPeriod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSummaryJavadocNoPeriod.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-public class InputSummaryJavadocCheckNoPeriod
+public class InputSummaryJavadocNoPeriod
 {
     /**
      * As of JDK 1.1, replaced by {@link #setBounds(int,int,int,int)}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSummaryJavadocCheckPeriod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSummaryJavadocPeriod.java
index 1334c3f5e..06149e8bd 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSummaryJavadocCheckPeriod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/javadoc/InputSummaryJavadocPeriod.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
-public class InputSummaryJavadocCheckPeriod
+public class InputSummaryJavadocPeriod
 {
     /**
      * As of JDK 1.1, replaced by {@link #setBounds(int,int,int,int)}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexityCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexity.java
index fbb8504b4..56f095e07 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexityCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexity.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.metrics;
 
-public class InputComplexityCheck {
+public class InputComplexity {
     public void foo() {
         while (true) {
             Runnable runnable = new Runnable() {
@@ -45,7 +45,7 @@ public class InputComplexityCheck {
         }
     }
 
-    public InputComplexityCheck()
+    public InputComplexity()
     {
         int i = 1;
         if (System.currentTimeMillis() == 0) {
@@ -73,7 +73,7 @@ public class InputComplexityCheck {
     }
     
     /** Inner */
-    public InputComplexityCheck(int aParam)
+    public InputComplexity(int aParam)
     {
         Runnable runnable = new Runnable() {
             public void run() {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexityCheckSwitchBlocks.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexitySwitchBlocks.java
index 6cca26310..ef302b82f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexityCheckSwitchBlocks.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/metrics/InputComplexitySwitchBlocks.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.metrics;
 
-public class InputComplexityCheckSwitchBlocks {
+public class InputComplexitySwitchBlocks {
     public void foo2() {
         String programmingLanguage = "Java";
         switch (programmingLanguage) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbbreviationAsWordInTypeNameCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbbreviationAsWordInTypeName.java
index 6dd9a7e14..6dd9a7e14 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbbreviationAsWordInTypeNameCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbbreviationAsWordInTypeName.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbbreviationAsWordInTypeNameCheckOverridableMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbbreviationAsWordInTypeNameOverridableMethod.java
index 9c2031db7..9c2031db7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbbreviationAsWordInTypeNameCheckOverridableMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbbreviationAsWordInTypeNameOverridableMethod.java
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbstractMultisetSetCountTester.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbstractMultisetSetCount.java
index f6285771d..c49a2e5d2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbstractMultisetSetCountTester.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/InputAbstractMultisetSetCount.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.naming;
 
-public abstract class InputAbstractMultisetSetCountTester<E> {
+public abstract class InputAbstractMultisetSetCount<E> {
 
   private static final String SUPPORTS_REMOVE = "";
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/InputParameterNumberCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/InputParameterNumber.java
index d8c5230f0..d2065836a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/InputParameterNumberCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/sizes/InputParameterNumber.java
@@ -13,7 +13,7 @@ class InputParameterNumberCheckBase
     }
 }
 
-public class InputParameterNumberCheck extends InputParameterNumberCheckBase
+public class InputParameterNumber extends InputParameterNumberCheckBase
 {
     @Override
     void myMethod(int a, int b, int c, int d, int e, int f, int g, int h) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparator.java
index e8658050d..65758baf2 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparator.java
@@ -32,7 +32,7 @@ import javax.swing.AbstractAction;
 
 import org.apache.commons.beanutils.locale.converters.ByteLocaleConverter;
 import org.apache.commons.beanutils.BasicDynaBean;
-class InputEmptyLineSeparatorCheck
+class InputEmptyLineSeparator
 {
     public static final double FOO_PI = 3.1415;
     private boolean flag = true; 
@@ -54,7 +54,7 @@ class InputEmptyLineSeparatorCheck
      * 
      * 
      */
-    private InputEmptyLineSeparatorCheck()
+    private InputEmptyLineSeparator()
     {
         //empty
     }
@@ -128,14 +128,14 @@ class InputEmptyLineSeparatorCheck
 }
 
 class Class2{
-    public int compareTo(InputEmptyLineSeparatorCheck aObject) //ok
+    public int compareTo(InputEmptyLineSeparator aObject) //ok
     {
         int number = 0;
         return 0;
     }
     
     Class2 anon = new Class2(){
-        public int compareTo(InputEmptyLineSeparatorCheck aObject) //ok
+        public int compareTo(InputEmptyLineSeparator aObject) //ok
         {
             int number = 0;
             return 0;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheckHeader.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorHeader.java
index 469247e78..854405a7b 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheckHeader.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorHeader.java
@@ -18,4 +18,4 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
-class InputEmptyLineSeparatorCheckHeader {}
+class InputEmptyLineSeparatorHeader {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheckMultipleEmptyLines.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleEmptyLines.java
index 8f9841132..71b4aef55 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorCheckMultipleEmptyLines.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleEmptyLines.java
@@ -26,7 +26,7 @@ import java.util.*;
 import java.io.*;
 
 
-public class InputEmptyLineSeparatorCheckMultipleEmptyLines
+public class InputEmptyLineSeparatorMultipleEmptyLines
 {
     
     
@@ -44,4 +44,4 @@ public class InputEmptyLineSeparatorCheckMultipleEmptyLines
     
     private static void foo1() {}
     
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespace.java
index 398f0252a..c1998259c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceCheck.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespace.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.Collections;
-class InputGenericWhitespaceCheck implements Comparable<InputGenericWhitespaceCheck>, Serializable
+class InputGenericWhitespace implements Comparable<InputGenericWhitespace>, Serializable
 {
     void meth()
     {
@@ -17,7 +17,7 @@ class InputGenericWhitespaceCheck implements Comparable<InputGenericWhitespaceCh
         List < List < Integer > > b = new ArrayList < List < Integer > > ();
     }
     //always 0
-    public int compareTo(InputGenericWhitespaceCheck aObject)
+    public int compareTo(InputGenericWhitespace aObject)
     {
         return 0;
     }
@@ -43,11 +43,11 @@ class InputGenericWhitespaceCheck implements Comparable<InputGenericWhitespaceCh
         return 666;
     }
     
-    <T> InputGenericWhitespaceCheck(List<T> things, int i)
+    <T> InputGenericWhitespace(List<T> things, int i)
     {
     }
 
-    public <T> InputGenericWhitespaceCheck(List<T> things)
+    public <T> InputGenericWhitespace(List<T> things)
     {
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceInnerClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceInnerClass.java
new file mode 100644
index 000000000..7b0e4c8a0
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceInnerClass.java
@@ -0,0 +1,11 @@
+package com.puppycrawl.tools.checkstyle.checks.whitespace;
+
+import java.util.List;
+
+public class InputGenericWhitespaceInnerClass<T>
+{
+    private List<InputGenericWhitespaceInnerClass<? extends T>.InnerClass> field;
+
+    public class InnerClass {
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceInnerClassCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceInnerClassCheck.java
deleted file mode 100644
index 12e2b0f14..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGenericWhitespaceInnerClassCheck.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
-
-import java.util.List;
-
-public class InputGenericWhitespaceInnerClassCheck<T>
-{
-    private List<InputGenericWhitespaceInnerClassCheck<? extends T>.InnerClass> field;
-
-    public class InnerClass {
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputNoWhiteSpaceAfterCheckFormerNpe.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputNoWhiteSpaceAfterFormerNpe.java
index 2f94861c9..722aab8c6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputNoWhiteSpaceAfterCheckFormerNpe.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputNoWhiteSpaceAfterFormerNpe.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.checks.whitespace;
 
-public class InputNoWhiteSpaceAfterCheckFormerNpe
+public class InputNoWhiteSpaceAfterFormerNpe
 {
     private int[] getSome() {
         return new int[4];
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/comments/InputCommentsTest_1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/comments/InputComments1.java
index 157cee8f9..ea8857b93 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/comments/InputCommentsTest_1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/comments/InputComments1.java
@@ -2,6 +2,6 @@ package com.puppycrawl.tools.checkstyle.grammars.comments;
 public class /*
     i'mcomment567
     */
-InputCommentsTest_1
+InputComments1
 { // comment to left curly brace
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/comments/InputCommentsTest_2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/comments/InputComments2.java
index 61ca32f0f..d6c718061 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/comments/InputCommentsTest_2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/comments/InputComments2.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.grammars.comments;
 // my class
-class InputCommentsTest_2
+class InputComments2
 {
     /**
      * Lines <b>method</b>.
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations1.java
index e17bd3e81..82462fe46 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest1.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations1.java
@@ -2,7 +2,7 @@ package com.puppycrawl.tools.checkstyle.grammars.java8;
 
 import java.util.List;
 
-public class InputAnnotationsTest1 {
+public class InputAnnotations1 {
 	
 	@NonNull
 	List<Integer> numbers;
@@ -11,4 +11,4 @@ public class InputAnnotationsTest1 {
 
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/java8/InputDefaultMethodsTest2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/java8/InputDefaultMethods2.java
index e5f757403..fd59b1b1d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/java8/InputDefaultMethodsTest2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/grammars/java8/InputDefaultMethods2.java
@@ -1,6 +1,6 @@
 package com.puppycrawl.tools.checkstyle.grammars.java8;
 
-public class InputDefaultMethodsTest2 {
+public class InputDefaultMethods2 {
 	
 	public void doSomething(){
 		int a = 5;