diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
index baca7a9c2..0cf386ae3 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/Checker.java
@@ -38,7 +38,7 @@ import com.puppycrawl.tools.checkstyle.api.MessageDispatcher;
  * @author lkuehne
  */
 public class Checker extends AutomaticBean
-    implements Defn, MessageDispatcher
+    implements MessageDispatcher
 {
     /**
      * An AuditListener that maintains the number of errors.
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/Defn.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/Defn.java
index ec38a9542..cbf7adda4 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/Defn.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/Defn.java
@@ -19,12 +19,12 @@
 package com.puppycrawl.tools.checkstyle;
 
 /**
- * Contains definitions common to the package.
+ * Contains constant definitions common to the package.
  * @author <a href="mailto:oliver@puppycrawl.com">Oliver Burn</a>
  **/
-public interface Defn
+public final class Defn
 {
-    // TODO: Change to a class - follow the advice of Bloch.
     /** name of resource bundle for Checkstyle */
-    String CHECKSTYLE_BUNDLE = "com.puppycrawl.tools.checkstyle.messages";
+    public static final String CHECKSTYLE_BUNDLE =
+            "com.puppycrawl.tools.checkstyle.messages";
 }