Issue #2161: unify test input file names

39 files changed, 61 insertions, 61 deletions

diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotation2.java
index 7047d7729..b26198049 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotationCheckTest2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/annotation/InputPackageAnnotation2.java
@@ -1,6 +1,6 @@
 @Deprecated
 package com.puppycrawl.tools.checkstyle.checks.annotation;
 
-public class InputPackageAnnotationCheckTest2 {
+public class InputPackageAnnotation2 {
 	
 }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationCheckTest2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiation2.java
index daefc1457..1ec713f16 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationCheckTest2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiation2.java
@@ -3,7 +3,7 @@ package com.puppycrawl.tools.checkstyle.checks.coding;
 
 import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
 
-public class InputIllegalInstantiationCheckTest2
+public class InputIllegalInstantiation2
 {
 
     public static void main(String[] args)
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationCheckLang.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationLang.java
index d3f18b8c7..d3f18b8c7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationCheckLang.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationLang.java
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationCheckNoPackage.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationNoPackage.java
index c11e162d9..c11e162d9 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationCheckNoPackage.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputIllegalInstantiationNoPackage.java
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputOneStatementPerLineCheck.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputOneStatementPerLine.java
index 7cbc495be..65b8a2bf6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputOneStatementPerLineCheck.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputOneStatementPerLine.java
@@ -1,7 +1,7 @@
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
 /**
- * This file contains test inputs for OneStatementPerLineCheckInput
+ * This file contains test inputs for InputOneStatementPerLine
  * which cause compilation problem in Eclipse 4.2.2 but still
  * must be tested.
  */
@@ -14,7 +14,7 @@ import java.lang.annotation.Annotation;
 ;
 import java.lang.String;
 
-public class OneStatementPerLineCheckInput {
+public class InputOneStatementPerLine {
     /**
      * According to java language specifications,
      * statements end with ';'. That is why ';;'
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputSuperCloneCheck.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputSuperClone.java
index c83358406..be7914442 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputSuperCloneCheck.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/InputSuperClone.java
@@ -1,7 +1,7 @@
 // Requires Java8
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
-interface InputSuperCloneCheck {
+interface InputSuperClone {
     void clone();
 }
 
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck_UnnamedPackage.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImport_UnnamedPackage.java
index eca701104..267456e72 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImportCheck_UnnamedPackage.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/imports/InputRedundantImport_UnnamedPackage.java
@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.lang.String;
 import static java.lang.Math.PI;
 
-public class InputRedundantImportCheck_UnnamedPackage
+public class InputRedundantImport_UnnamedPackage
 {
     public static double pi=PI;
     public List myList;
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/InputMethodReferencesTest3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/InputMethodReferences3.java
index 4ef7b3d24..b6f8f89f6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/InputMethodReferencesTest3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/whitespace/InputMethodReferences3.java
@@ -1,7 +1,7 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.checks.whitespace;
 import java.util.function.Supplier;
-public static class InputMethodReferencesTest3
+public static class InputMethodReferences3
 {
   public static class SomeClass {
     public static class Nested<V> {
@@ -15,4 +15,4 @@ public static class InputMethodReferencesTest3
     Supplier<SomeClass.Nested<V>> passes = SomeClass.Nested::new;
     Supplier<SomeClass.Nested<V>> fails = SomeClass.Nested<V>::new;
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest10.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations10.java
index c74426650..6b79cd5f8 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest10.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations10.java
@@ -4,7 +4,7 @@ package com.puppycrawl.tools.checkstyle.grammars.java8;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
-public class InputAnnotationsTest10 {
+public class InputAnnotations10 {
 	public static Object methodName(Object str) {
 		try {
             return null;
@@ -20,4 +20,4 @@ public class InputAnnotationsTest10 {
 	String name();
 	int version();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations2.java
index ea4a45ede..0650b35e7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations2.java
@@ -4,7 +4,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
 @Schedule
-public class InputAnnotationsTest2 {
+public class InputAnnotations2 {
 	
 	
 }
@@ -12,4 +12,4 @@ public class InputAnnotationsTest2 {
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
 @interface Schedule { 
 
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations3.java
index 8c1a83a1c..e3d436d11 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations3.java
@@ -5,7 +5,7 @@ import java.lang.annotation.Target;
 
 
 
-public class InputAnnotationsTest3 {
+public class InputAnnotations3 {
 	
 	public static void methodName(Object str) {
 		String myString = (@NonNull String) str;
@@ -15,4 +15,4 @@ public class InputAnnotationsTest3 {
 	@interface NonNull {
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest4.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations4.java
index 84e3294cb..e2040e4f8 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest4.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations4.java
@@ -4,7 +4,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
 
-public class InputAnnotationsTest4 {
+public class InputAnnotations4 {
 	
 	public static void methodName(@NotNull String args) {
 		
@@ -14,4 +14,4 @@ public class InputAnnotationsTest4 {
 	@interface NotNull {
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest5.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations5.java
index 7f4c0346f..087c48530 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest5.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations5.java
@@ -4,7 +4,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
 
-public class InputAnnotationsTest5 {
+public class InputAnnotations5 {
 	
 	
 	void monitorTemperature() throws @Critical Exception {  }
@@ -13,4 +13,4 @@ public class InputAnnotationsTest5 {
 	@interface Critical {
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest6.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations6.java
index 690943249..652e6c23b 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest6.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations6.java
@@ -5,7 +5,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
 
-public class InputAnnotationsTest6 {
+public class InputAnnotations6 {
 
 	abstract class UnmodifiableList<T> implements @Readonly List<@Readonly T> {
 	}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest7.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations7.java
index 7914862ac..3f90a8e69 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest7.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations7.java
@@ -4,7 +4,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
 
-public class InputAnnotationsTest7 {
+public class InputAnnotations7 {
 	
 	public static void main(String[] args) {
 		Object object = new @Interned Object();
@@ -16,4 +16,4 @@ public class InputAnnotationsTest7 {
 
 	}	
 	
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest8.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations8.java
index f2329a213..578464b94 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest8.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations8.java
@@ -4,7 +4,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.Map;
 
-public class InputAnnotationsTest8 {
+public class InputAnnotations8 {
 	
 	public void main(String[] args) {
 		Map.@NotNull Entry entry;
@@ -31,4 +31,4 @@ public class InputAnnotationsTest8 {
 		class MyObject2{}
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest9.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations9.java
index ac083ef3c..743c0c644 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotationsTest9.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputAnnotations9.java
@@ -4,7 +4,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 import java.util.List;
 
-public class InputAnnotationsTest9 {
+public class InputAnnotations9 {
 	public static <T> void methodName(Object str) {
 		List<@Immutable ? extends Comparable<T>> unchangeable;
 	}
@@ -12,4 +12,4 @@ public class InputAnnotationsTest9 {
 	@Target(ElementType.TYPE_USE)
 	@interface Immutable {
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputDefaultMethodsTest.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputDefaultMethods.java
index b2f3492e5..06b1d3cbf 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputDefaultMethodsTest.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputDefaultMethods.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public interface InputDefaultMethodsTest {
+public interface InputDefaultMethods {
 	
 	default public void doSomething(){
 		System.out.println("Something done.");
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest1.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda1.java
index 30ff598fc..057be2349 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest1.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda1.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest1 {
+public class InputLambda1 {
 	
 	static Runnable r1 = ()->System.out.println("Hello world one!");
 	static Runnable r2 = () -> System.out.println("Hello world two!");
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest10.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda10.java
index 15525336c..3779282aa 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest10.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda10.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest10 {
+public class InputLambda10 {
 
 	public static void testVoidLambda(TestOfVoidLambdas test) {
 		System.out.println("Method called");
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest11.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda11.java
index 172747c78..43cfbd437 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest11.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda11.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest11 {
+public class InputLambda11 {
 
 	public static void testVoidLambda(TestOfVoidLambdas test) {
 		System.out.println("Method called");
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest12.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda12.java
index 0f2599cc8..8fc2e9ba7 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest12.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda12.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest12 {
+public class InputLambda12 {
 
 	public static void testVoidLambda(TestOfVoidLambdas test) {
 		System.out.println("Method called");
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest13.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda13.java
index 89ceb8950..7e81fcbfe 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest13.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda13.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest13 {
+public class InputLambda13 {
 
 	public static void testVoidLambda(TestOfVoidLambdas test) {
 		System.out.println("Method called");
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest14.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda14.java
index 300df18ed..9b1fe1c0f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest14.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda14.java
@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 
 
-public class InputLambdaTest14 {
+public class InputLambda14 {
 	
 	public static void main(String args[]) {
 		List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest15.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda15.java
index 1c270dd3e..9f6070a5f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest15.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda15.java
@@ -1,15 +1,15 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
 import java.util.function.Function;
-public class InputLambdaTest15
+public class InputLambda15
 {
 
     public static void main(String[] args) {
-        InputLambdaTest15 ex = new InputLambdaTest15();
+        InputLambda15 ex = new InputLambda15();
         Function<Double, Double> sin = d -> ex.sin(d);
         Function<Double, Double> log = d -> ex.log(d);
         Function<Double, Double> exp = d -> ex.exp(d);
-        InputLambdaTest15 compose = new InputLambdaTest15();
+        InputLambda15 compose = new InputLambda15();
         System.out.println(compose.calculate(sin.compose(log), 0.8));
         // prints log:sin:-0.22
         System.out.println(compose.calculate(sin.andThen(log), 0.8));
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest16.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda16.java
index 067f8d669..6d3bcba43 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest16.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda16.java
@@ -5,7 +5,7 @@ import java.time.chrono.ChronoLocalDateTime;
 import java.util.Comparator;
 
 
-public class InputLambdaTest16 {
+public class InputLambda16 {
 
 	static final Comparator<ChronoLocalDateTime<? extends ChronoLocalDate>> DATE_TIME_ORDER =
          (Comparator<ChronoLocalDateTime<? extends ChronoLocalDate>>) (dateTime1, dateTime2) -> {
@@ -19,4 +19,4 @@ public class InputLambdaTest16 {
 	public static void main(String args[]) {
 		
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest17.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda17.java
index dcfc9e903..4da4079ad 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest17.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda17.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 import java.util.function.Supplier;
-public class InputLambdaTest17{
+public class InputLambda17{
 
     void initPartialTraversalState() {
             SpinedBuffer<P_OUT> b = new SpinedBuffer<>();
@@ -25,4 +25,4 @@ public class InputLambdaTest17{
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest18.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda18.java
index 5031f8c5a..6147d1749 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest18.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda18.java
@@ -1,10 +1,10 @@
 //Compilable with Java8
 import java.util.function.Predicate;
-public class InputLambdaTest19 {
+public class InputLambda19 {
 
     static <T> Predicate<T> isEqual(Object targetRef) {
         return (null == targetRef)
                 ? null
                 : object -> targetRef.equals(object);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda2.java
index 462259c8a..d408f599f 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda2.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest2 {
+public class InputLambda2 {
 
 	public static void testVoidLambda(TestOfVoidLambdas test) {
 		System.out.println("Method called");
@@ -16,4 +16,4 @@ public class InputLambdaTest2 {
 
 		public void doSmth();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda3.java
index 5471c6b7a..96d5db518 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda3.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest3 {
+public class InputLambda3 {
 	
 	public static void testVoidLambda(TestOfVoidLambdas test) {
 		System.out.println("Method called");
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest4.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda4.java
index 604566a7a..cfeebe648 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest4.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda4.java
@@ -3,7 +3,7 @@ package com.puppycrawl.tools.checkstyle.grammars.java8;
 import java.util.Arrays;
 import java.util.List;
 
-public class InputLambdaTest4 {
+public class InputLambda4 {
 	
 	public void doSomething() {
 		List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest5.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda5.java
index d6d565d0c..7102f71e6 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest5.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda5.java
@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 
 
-public class InputLambdaTest5 {
+public class InputLambda5 {
 	
 	public void doSomething() {
 		List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest6.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda6.java
index 897f9281d..49f04d004 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest6.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda6.java
@@ -3,11 +3,11 @@ package com.puppycrawl.tools.checkstyle.grammars.java8;
 import java.util.Arrays;
 import java.util.List;
 
-public class InputLambdaTest6 {
+public class InputLambda6 {
 
 	public void doSomething() {
 		List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
 		
 		numbers.forEach((value) -> System.out.println(value));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest7.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda7.java
index bc9802714..9138d68ed 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest7.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda7.java
@@ -3,7 +3,7 @@ package com.puppycrawl.tools.checkstyle.grammars.java8;
 import java.util.Arrays;
 import java.util.List;
 
-public class InputLambdaTest7 {
+public class InputLambda7 {
 
 	public void doSomething() {
 		List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest8.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda8.java
index 4d2012fc7..1c3dcf3e3 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest8.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda8.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest8 {
+public class InputLambda8 {
 	public static void testVoidLambda(TestOfVoidLambdas test) {
 		System.out.println("Method called");
 		test.doSmth("fef", 2);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest9.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda9.java
index a17cb9e24..287bac92e 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambdaTest9.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputLambda9.java
@@ -1,6 +1,6 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
-public class InputLambdaTest9 {
+public class InputLambda9 {
 	public static void testVoidLambda(TestOfVoidLambdas test) {
 		System.out.println("Method called");
 		test.doSmth("fef", 2);
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferencesTest.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferences.java
index 480ee3997..8cfdbdd11 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferencesTest.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferences.java
@@ -6,7 +6,7 @@ import java.util.function.Supplier;
 
 import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
 
-public class InputMethodReferencesTest<T> extends ParentClass
+public class InputMethodReferences<T> extends ParentClass
 {
 
     public void main(String[] args) {
@@ -14,16 +14,16 @@ public class InputMethodReferencesTest<T> extends ParentClass
 		List<Integer> numbers = Arrays.asList(1,2,3,4,5,6);
 		
 		numbers.forEach(System.out::println);
-		InputMethodReferencesTest tl = new InputMethodReferencesTest();
+		InputMethodReferences tl = new InputMethodReferences();
 
 		String roster = new String();
-		Supplier<InputMethodReferencesTest> supplier = InputMethodReferencesTest<String>::new;
+		Supplier<InputMethodReferences> supplier = InputMethodReferences<String>::new;
 
 		numbers.forEach(this::println);
 		
 		numbers.forEach(super::println);
-        Supplier<InputMethodReferencesTest2> supplier = InputMethodReferencesTest2::new;
-        Supplier<InputMethodReferencesTest2> suppl = InputMethodReferencesTest2::<Integer> new;
+        Supplier<InputMethodReferences2> supplier = InputMethodReferences2::new;
+        Supplier<InputMethodReferences2> suppl = InputMethodReferences2::<Integer> new;
         Function<Integer, Message[]> messageArrayFactory = Message[]::new;
 		
 	}
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferencesTest2.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferences2.java
index cf8efd095..70d25a2f4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferencesTest2.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferences2.java
@@ -4,14 +4,14 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 
 import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
-public class InputMethodReferencesTest2
+public class InputMethodReferences2
 {
 
     public static void main(String[] args)
     {
 
-        Supplier<InputMethodReferencesTest2> supplier = InputMethodReferencesTest2::new;
-        Supplier<InputMethodReferencesTest2> suppl = InputMethodReferencesTest2::<Integer> new;
+        Supplier<InputMethodReferences2> supplier = InputMethodReferences2::new;
+        Supplier<InputMethodReferences2> suppl = InputMethodReferences2::<Integer> new;
         Function<Integer, Message[]> messageArrayFactory = Message[]::new;
 
     }
diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferencesTest3.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferences3.java
index 6cafa26ef..d9277a9f4 100644
--- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferencesTest3.java
+++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/grammars/java8/InputMethodReferences3.java
@@ -1,7 +1,7 @@
 //Compilable with Java8
 package com.puppycrawl.tools.checkstyle.grammars.java8;
 import java.util.function.Supplier;
-public static class InputMethodReferencesTest3
+public static class InputMethodReferences3
 {
   public static class SomeClass {
     public static class Nested<V> {
@@ -15,4 +15,4 @@ public static class InputMethodReferencesTest3
     Supplier<SomeClass.Nested<V>> passes = SomeClass.Nested::new;
     Supplier<SomeClass.Nested<V>> fails = SomeClass.Nested<V>::new;
   }
-}
\ No newline at end of file
+}