diff --git a/src/java/org/apache/http/conn/SchemeRegistry.java b/src/java/org/apache/http/conn/SchemeRegistry.java
index 9a967f1c6..e6a531f1f 100644
--- a/src/java/org/apache/http/conn/SchemeRegistry.java
+++ b/src/java/org/apache/http/conn/SchemeRegistry.java
@@ -57,8 +57,8 @@ public final class SchemeRegistry {
     /**
      * A default scheme registry.
      * It is empty by default, but can be initialized by any application.
-     * The default scheme set should only be used by applications that
-     * know for sure that this class is NOT shared with any other applications.
+     * The default scheme registry should only be used by applications that
+     * know for sure that this class is NOT shared with any other application.
      * For example a Servlet, Portlet or EJB should not rely on being the
      * only user of this class.
      */
diff --git a/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java b/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
index da700487e..5c16dc21a 100644
--- a/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
+++ b/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
@@ -66,23 +66,23 @@ public class DefaultClientConnectionOperator
     implements ClientConnectionOperator {
 
 
-    /** The scheme set for looking up socket factories. */
+    /** The scheme registry for looking up socket factories. */
     protected SchemeRegistry schemeRegistry;
 
 
     /**
      * Creates a new client connection operator.
      * Uses {@link SchemeRegistry#DEFAULT SchemeRegistry.DEFAULT}
-     * as the scheme set.
+     * as the scheme registry.
      */
     public DefaultClientConnectionOperator() {
         this(null);
     }
 
     /**
-     * Creates a new client connection operator for the given scheme set.
+     * Creates a new client connection operator for the given scheme registry.
      *
-     * @param schemes   the scheme set, or <code>null</code> to use
+     * @param schemes   the scheme registry, or <code>null</code> to use
      *                  {@link SchemeRegistry#DEFAULT SchemeRegistry.DEFAULT}
      */
     public DefaultClientConnectionOperator(SchemeRegistry schemes) {
@@ -227,5 +227,5 @@ public class DefaultClientConnectionOperator
     } // prepareSocket
 
 
-} // interface ClientConnectionOperator
+} // class DefaultClientConnectionOperator