diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java
index 7c3d3892b..612bbe45d 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java
@@ -234,7 +234,7 @@ public final class TreeWalker
     void registerCheck(Check aCheck)
            throws CheckstyleException
     {
-        final Set checkTokens = aCheck.getTokens();
+        final Set checkTokens = aCheck.getTokenNames();
         if (!checkTokens.isEmpty()) {
             int acceptableTokens[] = aCheck.getAcceptableTokens();
             Arrays.sort(acceptableTokens);
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Check.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Check.java
index 855dcdc01..587c0afca 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Check.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Check.java
@@ -104,7 +104,7 @@ public abstract class Check extends AutomaticBean
      * Returns the tokens registered for the check.
      * @return the set of token names
      */
-    final public Set getTokens()
+    final public Set getTokenNames()
     {
         return mTokens;
     }