diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AvoidStarImport.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AvoidStarImportCheck.java
similarity index 98%
rename from src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AvoidStarImport.java
rename to src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AvoidStarImportCheck.java
index 89e3f4898..7eb889879 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AvoidStarImport.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/AvoidStarImportCheck.java
@@ -40,7 +40,7 @@ import com.puppycrawl.tools.checkstyle.api.FullIdent;
  * @author Oliver Burn
  * @version 1.0
  */
-public class AvoidStarImport
+public class AvoidStarImportCheck
     extends AbstractImportCheck
 {
     /** @see com.puppycrawl.tools.checkstyle.api.Check */
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/AvoidStarImportTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/AvoidStarImportTest.java
index f549196c2..46831a269 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/AvoidStarImportTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/AvoidStarImportTest.java
@@ -10,7 +10,7 @@ public class AvoidStarImportTest
         throws Exception
     {
         final DefaultConfiguration checkConfig =
-            createCheckConfig(AvoidStarImport.class);
+            createCheckConfig(AvoidStarImportCheck.class);
         final String[] expected = {
             "7: Avoid using the '.*' form of import - com.puppycrawl.tools.checkstyle.*.",
             "9: Avoid using the '.*' form of import - java.io.*.",