diff --git a/src/com/whalin/memcached/ErrorHandler.java b/src/com/whalin/memcached/ErrorHandler.java
index 31e0be9..1b37f00 100644
--- a/src/com/whalin/memcached/ErrorHandler.java
+++ b/src/com/whalin/memcached/ErrorHandler.java
@@ -15,7 +15,7 @@
  * library.
  *
  * This is an interface implemented by classes that want to receive callbacks
- * in the event of an error in {@link MemCachedClient}. The implementor can do
+ * in the event of an error in {@link MemcachedClient}. The implementor can do
  * things like flush caches or perform additioonal logging.
  *
  * @author Dan Zivkovic <zivkovic@apple.com>
@@ -28,47 +28,47 @@ public interface ErrorHandler {
     /**
      * Called for errors thrown during initialization.
      */
-    public void handleErrorOnInit( final MemCachedClient client ,
+    public void handleErrorOnInit( final MemcachedClient client ,
                                    final Throwable error );
 
     /**
-     * Called for errors thrown during {@link MemCachedClient#get(String)} and related methods.
+     * Called for errors thrown during {@link MemcachedClient#get(String)} and related methods.
      */
-    public void handleErrorOnGet( final MemCachedClient client ,
+    public void handleErrorOnGet( final MemcachedClient client ,
                                   final Throwable error ,
                                   final String cacheKey );
 
     /**
-     * Called for errors thrown during {@link MemCachedClient#getMulti(String)} and related methods.
+     * Called for errors thrown during {@link MemcachedClient#getMulti(String)} and related methods.
      */
-    public void handleErrorOnGet( final MemCachedClient client ,
+    public void handleErrorOnGet( final MemcachedClient client ,
                                   final Throwable error ,
                                   final String[] cacheKeys );
 
     /**
-     * Called for errors thrown during {@link MemCachedClient#set(String,Object)} and related methods.
+     * Called for errors thrown during {@link MemcachedClient#set(String,Object)} and related methods.
      */
-    public void handleErrorOnSet( final MemCachedClient client ,
+    public void handleErrorOnSet( final MemcachedClient client ,
                                   final Throwable error ,
                                   final String cacheKey );
 
     /**
-     * Called for errors thrown during {@link MemCachedClient#delete(String)} and related methods.
+     * Called for errors thrown during {@link MemcachedClient#delete(String)} and related methods.
      */
-    public void handleErrorOnDelete( final MemCachedClient client ,
+    public void handleErrorOnDelete( final MemcachedClient client ,
                                      final Throwable error ,
                                      final String cacheKey );
 
     /**
-     * Called for errors thrown during {@link MemCachedClient#flushAll()} and related methods.
+     * Called for errors thrown during {@link MemcachedClient#flushAll()} and related methods.
      */
-    public void handleErrorOnFlush( final MemCachedClient client ,
+    public void handleErrorOnFlush( final MemcachedClient client ,
                                     final Throwable error );
 
     /**
-     * Called for errors thrown during {@link MemCachedClient#stats()} and related methods.
+     * Called for errors thrown during {@link MemcachedClient#stats()} and related methods.
      */
-    public void handleErrorOnStats( final MemCachedClient client ,
+    public void handleErrorOnStats( final MemcachedClient client ,
                                     final Throwable error );
 
 } // interface
diff --git a/src/com/whalin/memcached/MemcachedClient.java b/src/com/whalin/memcached/MemcachedClient.java
index efceebe..4e07d91 100644
--- a/src/com/whalin/memcached/MemcachedClient.java
+++ b/src/com/whalin/memcached/MemcachedClient.java
@@ -160,7 +160,7 @@ public class MemcachedClient {
 
 	// logger
 	private static Logger log =
-		Logger.getLogger( MemCachedClient.class.getName() );
+		Logger.getLogger( MemcachedClient.class.getName() );
 
 	// return codes
 	private static final String VALUE        = "VALUE";			// start of value line from server