diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index e961b16474..376ad01130 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -67,8 +67,8 @@ class CGI
   # Create an HTTP header block as a string.
   #
   # :call-seq:
-  #   headers(content_type_string="text/html")
-  #   headers(headers_hash)
+  #   header(content_type_string="text/html")
+  #   header(headers_hash)
   #
   # Includes the empty line that ends the header block.
   #
@@ -452,10 +452,10 @@ class CGI
     end
 
     ##
-    # Parses multipart form elements according to 
+    # Parses multipart form elements according to
     #   http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.2
     #
-    # Returns a hash of multipart form parameters with bodies of type StringIO or 
+    # Returns a hash of multipart form parameters with bodies of type StringIO or
     # Tempfile depending on whether the multipart form element exceeds 10 KB
     #
     #   params[name => body]
diff --git a/lib/cgi/html.rb b/lib/cgi/html.rb
index 04e2431735..1f8e638e26 100644
--- a/lib/cgi/html.rb
+++ b/lib/cgi/html.rb
@@ -63,8 +63,8 @@ class CGI
   #   cgi.a("http://www.example.com") { "Example" }
   #     # => "<A HREF=\"http://www.example.com\">Example</A>"
   #
-  # Modules Http3, Http4, etc., contain more basic HTML-generation methods
-  # (:title, :center, etc.).
+  # Modules Html3, Html4, etc., contain more basic HTML-generation methods
+  # (+#title+, +#h1+, etc.).
   #
   # See class CGI for a detailed example.
   #