diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
index 9b6b9daee..9094b972e 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceTest.java
@@ -63,7 +63,7 @@ public class GenericWhitespaceTest extends BaseCheckTestSupport {
             "20:61: " + getCheckMessage(checkConfig.getMessages(), msgPreceded, ">"),
         };
 
-        final String filePath = builder.getFilePath("WhitespaceAroundInput_Generics");
+        final String filePath = builder.getFilePath("InputWhitespaceAroundGenerics");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
@@ -106,7 +106,7 @@ public class GenericWhitespaceTest extends BaseCheckTestSupport {
             "63:60: " + getCheckMessage(checkConfig.getMessages(), msgFollowed, ">"),
         };
 
-        final String filePath = builder.getFilePath("GenericWhitespaceInput");
+        final String filePath = builder.getFilePath("InputGenericWhitespace");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
index ff8b22604..a8de72b58 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundTest.java
@@ -68,7 +68,7 @@ public class WhitespaceAroundTest extends BaseCheckTestSupport {
             "150:20: " + getCheckMessage(checkConfig.getMessages(), msgPreceded, ":"),
         };
 
-        final String filePath = builder.getFilePath("WhitespaceAroundInput_Basic");
+        final String filePath = builder.getFilePath("InputWhitespaceAroundBasic");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
@@ -80,7 +80,7 @@ public class WhitespaceAroundTest extends BaseCheckTestSupport {
         final String[] expected = ArrayUtils.EMPTY_STRING_ARRAY;
 
         final Configuration checkConfig = builder.getCheckConfig("WhitespaceAround");
-        final String filePath = builder.getFilePath("WhitespaceAroundInput_EmptyTypesAndCycles");
+        final String filePath = builder.getFilePath("InputWhitespaceAroundEmptyTypesAndCycles");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
index df0961618..d613a560f 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsTest.java
@@ -70,7 +70,7 @@ public class MultipleVariableDeclarationsTest extends BaseCheckTestSupport {
         };
 
         final Configuration checkConfig = builder.getCheckConfig("MultipleVariableDeclarations");
-        final String filePath = builder.getFilePath("MultipleVariableDeclarationsInput");
+        final String filePath = builder.getFilePath("InputMultipleVariableDeclarations");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
index 7dc44b147..52aa560e3 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleTest.java
@@ -53,7 +53,7 @@ public class ArrayTypeStyleTest extends BaseCheckTestSupport {
         };
 
         final Configuration checkConfig = builder.getCheckConfig("ArrayTypeStyle");
-        final String filePath = builder.getFilePath("ArrayTypeStyleInput");
+        final String filePath = builder.getFilePath("InputArrayTypeStyle");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
index 00188d0a5..3d3fabc62 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughTest.java
@@ -58,7 +58,7 @@ public class FallThroughTest extends BaseCheckTestSupport {
         };
 
         final Configuration checkConfig = builder.getCheckConfig("FallThrough");
-        final String filePath = builder.getFilePath("FallThroughInput");
+        final String filePath = builder.getFilePath("InputFallThrough");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
index af8ced75a..d1e5162eb 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultTest.java
@@ -54,7 +54,7 @@ public class MissingSwitchDefaultTest extends BaseCheckTestSupport {
         };
 
         final Configuration checkConfig = builder.getCheckConfig("MissingSwitchDefault");
-        final String filePath = builder.getFilePath("MissingSwitchDefaultInput");
+        final String filePath = builder.getFilePath("InputMissingSwitchDefault");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
index 9929340b8..7bf6a8661 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationTest.java
@@ -61,7 +61,7 @@ public class AnnotationLocationTest extends BaseCheckTestSupport {
             "90: " + getCheckMessage(clazz, msgLocation, "MyAnnotation2", "1", "0"),
         };
 
-        final String filePath = builder.getFilePath("AnnotationLocationInput");
+        final String filePath = builder.getFilePath("InputAnnotationLocation");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationTest.java
index 7600d3f1d..a00d353dc 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationTest.java
@@ -99,7 +99,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
 
         final Configuration checkConfig = builder.getCheckConfig("CommentsIndentation");
         final String filePath =
-            builder.getFilePath("CommentsIndentationCommentIsAtTheEndOfBlockInput");
+            builder.getFilePath("InputCommentsIndentationCommentIsAtTheEndOfBlock");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
@@ -144,7 +144,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
 
         final Configuration checkConfig = builder.getCheckConfig("CommentsIndentation");
         final String filePath =
-            builder.getFilePath("CommentsIndentationInSwitchBlockInput");
+            builder.getFilePath("InputCommentsIndentationInSwitchBlock");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
@@ -167,7 +167,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
 
         final Configuration checkConfig = builder.getCheckConfig("CommentsIndentation");
         final String filePath =
-            builder.getFilePath("CommentsIndentationInEmptyBlockInput");
+            builder.getFilePath("InputCommentsIndentationInEmptyBlock");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
@@ -198,7 +198,7 @@ public class CommentsIndentationTest extends BaseCheckTestSupport {
 
         final Configuration checkConfig = builder.getCheckConfig("CommentsIndentation");
         final String filePath =
-            builder.getFilePath("CommentsIndentationSurroundingCodeInput");
+            builder.getFilePath("InputCommentsIndentationSurroundingCode");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
index 14e74ad36..aa120edec 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderTest.java
@@ -102,7 +102,7 @@ public class ModifierOrderTest extends BaseCheckTestSupport {
         };
 
         final Configuration checkConfig = builder.getCheckConfig("ModifierOrder");
-        final String filePath = builder.getFilePath("ModifierOrderInput");
+        final String filePath = builder.getFilePath("InputModifierOrder");
 
         final Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputGenericWhitespace.java
similarity index 86%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputGenericWhitespace.java
index c1d34de89..ccda4bc7e 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/GenericWhitespaceInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputGenericWhitespace.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.Collections;
-class GenericWhitespaceInput implements Comparable<GenericWhitespaceInput>, Serializable
+class InputGenericWhitespace implements Comparable<InputGenericWhitespace>, Serializable
 {
     void meth()
     {
@@ -17,7 +17,7 @@ class GenericWhitespaceInput implements Comparable<GenericWhitespaceInput>, Seri
         List < List < Integer > > b = new ArrayList < List < Integer > > (); // warn
     }
 
-    public int compareTo(GenericWhitespaceInput aObject)
+    public int compareTo(InputGenericWhitespace aObject)
     {
         return 0;
     }
@@ -43,11 +43,11 @@ class GenericWhitespaceInput implements Comparable<GenericWhitespaceInput>, Seri
         return 666;
     }
     
-    <T> GenericWhitespaceInput(List<T> things, int i)
+    <T> InputGenericWhitespace(List<T> things, int i)
     {
     }
 
-    public <T> GenericWhitespaceInput(List<T> things)
+    public <T> InputGenericWhitespace(List<T> things)
     {
     }
 
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundInput_Basic.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAroundBasic.java
similarity index 100%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundInput_Basic.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAroundBasic.java
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundInput_EmptyTypesAndCycles.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAroundEmptyTypesAndCycles.java
similarity index 100%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundInput_EmptyTypesAndCycles.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAroundEmptyTypesAndCycles.java
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundInput_Generics.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAroundGenerics.java
similarity index 95%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundInput_Generics.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAroundGenerics.java
index 6255c36b3..ec5471de4 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/WhitespaceAroundInput_Generics.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule462horizontalwhitespace/InputWhitespaceAroundGenerics.java
@@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule462horizontalwhitespac
 import java.util.Collection;
 import java.util.Map;
 
-public class WhitespaceAroundInput_Generics
+public class InputWhitespaceAroundGenerics
 {
     
 }
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/InputMultipleVariableDeclarations.java
similarity index 98%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/InputMultipleVariableDeclarations.java
index 9a6188405..5731490d9 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/MultipleVariableDeclarationsInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4821onevariableperline/InputMultipleVariableDeclarations.java
@@ -1,6 +1,6 @@
 package com.google.checkstyle.test.chapter4formatting.rule4821onevariableperline;
 
-public class MultipleVariableDeclarationsInput
+public class InputMultipleVariableDeclarations
 {
     int i, j; //warn
     int i1; int j1; //warn
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/InputArrayTypeStyle.java
similarity index 97%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/InputArrayTypeStyle.java
index 096d0c03f..ed2bb0690 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/ArrayTypeStyleInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4832nocstylearray/InputArrayTypeStyle.java
@@ -3,7 +3,7 @@ package com.google.checkstyle.test.chapter4formatting.rule4832nocstylearray;
 /**
  * Test case for ArrayTypeStyle (Java vs C)
  **/
-public class ArrayTypeStyleInput
+public class InputArrayTypeStyle
 {
     private int[] javaStyle = new int[0];
     private int cStyle[] = new int[0]; //warn
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/InputFallThrough.java
similarity index 99%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/InputFallThrough.java
index 8b6590b07..4877727d0 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/FallThroughInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4842fallthrough/InputFallThrough.java
@@ -1,6 +1,6 @@
 package com.google.checkstyle.test.chapter4formatting.rule4842fallthrough;
 
-public class FallThroughInput
+public class InputFallThrough
 {
     void method(int i, int j, boolean cond) {
         while (true) {
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/InputMissingSwitchDefault.java
similarity index 96%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/InputMissingSwitchDefault.java
index f45e934d7..d76e41ff5 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/MissingSwitchDefaultInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4843defaultcasepresent/InputMissingSwitchDefault.java
@@ -1,6 +1,6 @@
 package com.google.checkstyle.test.chapter4formatting.rule4843defaultcasepresent;
 
-public class MissingSwitchDefaultInput {
+public class InputMissingSwitchDefault {
     public void foo() {
         int i = 1;
         switch (i) {
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule485annotations/InputAnnotationLocation.java
similarity index 100%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule485annotations/AnnotationLocationInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule485annotations/InputAnnotationLocation.java
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationCommentIsAtTheEndOfBlockInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationCommentIsAtTheEndOfBlock.java
similarity index 99%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationCommentIsAtTheEndOfBlockInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationCommentIsAtTheEndOfBlock.java
index e184f3b82..5dbac5d27 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationCommentIsAtTheEndOfBlockInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationCommentIsAtTheEndOfBlock.java
@@ -6,7 +6,7 @@ import com.puppycrawl.tools.checkstyle.utils.CheckUtils;
 /**
  * Contains examples of using comments at the end of the block.
  */
-public class CommentsIndentationCommentIsAtTheEndOfBlockInput {
+public class InputCommentsIndentationCommentIsAtTheEndOfBlock {
 
     public void foo1() {
         foo2();
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationInEmptyBlockInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationInEmptyBlock.java
similarity index 97%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationInEmptyBlockInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationInEmptyBlock.java
index 0706d7d3b..01b5bfd1f 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationInEmptyBlockInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationInEmptyBlock.java
@@ -1,6 +1,6 @@
 package com.google.checkstyle.test.chapter4formatting.rule4861blockcommentstyle;
 
-public class CommentsIndentationInEmptyBlockInput {
+public class InputCommentsIndentationInEmptyBlock {
 
     private void foo1() {
         int a = 5, b = 3, v = 6;
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationInSwitchBlockInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationInSwitchBlock.java
similarity index 99%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationInSwitchBlockInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationInSwitchBlock.java
index ee9d6673d..4acbe634a 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationInSwitchBlockInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationInSwitchBlock.java
@@ -1,6 +1,6 @@
 package com.google.checkstyle.test.chapter4formatting.rule4861blockcommentstyle;
 
-public class CommentsIndentationInSwitchBlockInput {
+public class InputCommentsIndentationInSwitchBlock {
 
     private static void fooSwitch() {
         switch("") {
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationSurroundingCodeInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationSurroundingCode.java
similarity index 98%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationSurroundingCodeInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationSurroundingCode.java
index cc5525d9e..04503871e 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/CommentsIndentationSurroundingCodeInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule4861blockcommentstyle/InputCommentsIndentationSurroundingCode.java
@@ -4,7 +4,7 @@ package com.google.checkstyle.test.chapter4formatting.rule4861blockcommentstyle;
 import java.util.Arrays;
 
 // some
-public class CommentsIndentationSurroundingCodeInput
+public class InputCommentsIndentationSurroundingCode
 {
     private void foo1() {
         if (true) {
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule487modifiers/InputModifierOrder.java
similarity index 99%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule487modifiers/InputModifierOrder.java
index d522351d3..ad405600d 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule487modifiers/ModifierOrderInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule487modifiers/InputModifierOrder.java
@@ -1,6 +1,6 @@
 package com.google.checkstyle.test.chapter4formatting.rule487modifiers;
 
-strictfp abstract class ModifierOrderInput //warn
+strictfp abstract class InputModifierOrder //warn
 {
 	transient private String dontSaveMe; //warn