diff --git a/doc/net-http/examples.rdoc b/doc/net-http/examples.rdoc
index dd4acecd..c901ebe2 100644
--- a/doc/net-http/examples.rdoc
+++ b/doc/net-http/examples.rdoc
@@ -1,7 +1,8 @@
 Examples here assume that <tt>net/http</tt> has been required
-(which also requires +uri+):
+(which also requires +uri+), and that <tt>Net</tt> has been included.
 
-  require 'net/http'
+  require 'net/http' # Defines Net::HTTP.
+  include Net        # Allows abbreviating Net::HTTP to HTTP.
 
 Many code examples here use these example websites:
 
@@ -10,16 +11,17 @@ Many code examples here use these example websites:
 
 Some examples also assume these variables:
 
-  uri = URI('https://jsonplaceholder.typicode.com')
+  uri = URI('https://jsonplaceholder.typicode.com/')
   uri.freeze # Examples may not modify.
   hostname = uri.hostname # => "jsonplaceholder.typicode.com"
+  path = uri.path         # => "/"
   port = uri.port         # => 443
 
 So that example requests may be written as:
 
-  Net::HTTP.get(uri)
-  Net::HTTP.get(hostname, '/index.html')
-  Net::HTTP.start(hostname) do |http|
+  HTTP.get(uri)
+  HTTP.get(hostname, '/index.html')
+  HTTP.start(hostname) do |http|
     http.get('/todos/1')
     http.get('/todos/2')
   end
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 270743e5..b2020999 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -39,6 +39,10 @@ class HTTPHeaderSyntaxError < StandardError; end
   # - {Hypertext Transfer Protocol}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol].
   # - {Technical overview}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Technical_overview].
   #
+  # == About the Examples
+  #
+  # :include: doc/net-http/examples.rdoc
+  #
   # == Strategies
   #
   # - If you will make only a few GET requests,
@@ -46,54 +50,53 @@ class HTTPHeaderSyntaxError < StandardError; end
   # - If you will make only a few requests of all kinds,
   #   consider using the various singleton convenience methods in this class.
   #   Each of the following methods automatically starts and finishes
-  #   a {session}[rdoc-ref:Net::HTTP@Sessions] that sends a single request:
+  #   a {session}[rdoc-ref:HTTP@Sessions] that sends a single request:
   #
   #     # Return string response body.
-  #     Net::HTTP.get(hostname, path, port = 80)
-  #     Net::HTTP.get(uri, headers = {}, port = 80)
+  #     HTTP.get(hostname, path)
+  #     HTTP.get(uri)
   #
   #     # Write string response body to $stdout.
-  #     Net::HTTP.get_print(hostname, path_or_uri, port = 80)
-  #     Net::HTTP.get_print(uri, headers = {}, port = 80)
-  #
-  #     # Return response as Net::HTTPResponse object.
-  #     Net::HTTP.get_response(hostname, path_or_uri, port = 80)
-  #     Net::HTTP.get_response(uri, headers = {}, port = 80)
-  #     Net::HTTP.post(uri, data, headers = {})
-  #     Net::HTTP.post_form(uri, params)
-  #
-  # - If performance is important, consider using sessions, which lower request overhead.
-  #   This {session}[rdoc-ref:Net::HTTP@Sessions] has multiple requests for
+  #     HTTP.get_print(hostname, path)
+  #     HTTP.get_print(uri)
+  #
+  #     # Return response as HTTPResponse object.
+  #     HTTP.get_response(hostname, path)
+  #     HTTP.get_response(uri)
+  #     data = '{"title": "foo", "body": "bar", "userId": 1}'
+  #     HTTP.post(uri, data)
+  #     params = {title: 'foo', body: 'bar', userId: 1}
+  #     HTTP.post_form(uri, params)
+  #
+  # - If performance is important, consider using
+  #   {sessions}[rdoc-ref:HTTP@Sessions], which lower request overhead.
+  #   This session has multiple requests for
   #   {HTTP methods}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods]
   #   and {WebDAV methods}[https://en.wikipedia.org/wiki/WebDAV#Implementation]:
   #
-  #     Net::HTTP.start(hostname) do |http|
+  #     HTTP.start(hostname) do |http|
   #       # Session started automatically before block execution.
-  #       http.get(path_or_uri, headers = {})
-  #       http.head(path_or_uri, headers = {})
-  #       http.post(path_or_uri, body, headers = {})  # Can also have a block.
-  #       http.put(path_or_uri, body, headers = {})
-  #       http.delete(path_or_uri, headers = {Depth: 'Infinity'})
-  #       http.options(path_or_uri, headers = {})
-  #       http.trace(path_or_uri, headers = {})
-  #       http.patch(path_or_uri, body, headers = {}) # Can also have a block.
-  #       http.copy(path_or_uri, headers = {})
-  #       http.lock(path_or_uri, body, headers = {})
-  #       http.mkcol(path_or_uri, body = nil, headers = {})
-  #       http.move(path_or_uri, headers = {})
-  #       http.propfind(path_or_uri, body = nil, headers = {'Depth' => '0'})
-  #       http.proppatch(path_or_uri, body, headers = {})
-  #       http.unlock(path_or_uri, body, headers = {})
+  #       http.get(uri)
+  #       http.head(uri)
+  #       http.post(uri, data)  # Can also have a block.
+  #       http.put(uri, data)
+  #       http.delete(uri)
+  #       http.options(uri)
+  #       http.trace(uri)
+  #       http.patch(uri, data) # Can also have a block.
+  #       http.copy(uri)
+  #       http.lock(uri, data)
+  #       http.mkcol(uri)
+  #       http.move(uri)
+  #       http.propfind(uri)
+  #       http.proppatch(uri, data)
+  #       http.unlock(uri, data)
   #       # Session finished automatically at block exit.
   #     end
   #
   # The methods cited above are convenience methods that, via their few arguments,
   # allow minimal control over the requests.
-  # For greater control, consider using {request objects}[rdoc-ref:Net::HTTPRequest].
-  #
-  # == About the Examples
-  #
-  # :include: doc/net-http/examples.rdoc
+  # For greater control, consider using {request objects}[rdoc-ref:HTTPRequest].
   #
   # == URIs
   #
@@ -123,7 +126,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   # A hostname identifies a server (host) to which requests may be sent:
   #
   #   hostname = uri.hostname # => "jsonplaceholder.typicode.com"
-  #   Net::HTTP.start(hostname) do |http|
+  #   HTTP.start(hostname) do |http|
   #     # Some HTTP stuff.
   #   end
   #
@@ -135,7 +138,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #   _uri.path = '/todos/1'
   #   hostname = _uri.hostname
   #   path = _uri.path
-  #   Net::HTTP.get(hostname, path)
+  #   HTTP.get(hostname, path)
   #
   # === Queries
   #
@@ -145,7 +148,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #   params = {userId: 1, completed: false}
   #   _uri.query = URI.encode_www_form(params)
   #   _uri # => #<URI::HTTPS https://jsonplaceholder.typicode.com?userId=1&completed=false>
-  #   Net::HTTP.get(_uri)
+  #   HTTP.get(_uri)
   #
   # === Fragments
   #
@@ -164,7 +167,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   # where the headers are expressed as a hash of field-name/value pairs:
   #
   #   headers = {Accept: 'application/json', Connection: 'Keep-Alive'}
-  #   Net::HTTP.get(uri, headers)
+  #   HTTP.get(uri, headers)
   #
   # See lists of both standard request fields and common request fields at
   # {Request Fields}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields].
@@ -174,16 +177,16 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # A _session_ is a connection between a server (host) and a client that:
   #
-  # - Is begun by instance method Net::HTTP#start.
+  # - Is begun by instance method HTTP#start.
   # - May contain any number of requests.
-  # - Is ended by instance method Net::HTTP#finish.
+  # - Is ended by instance method HTTP#finish.
   #
-  # See example sessions at {Strategies}[rdoc-ref:Net::HTTP@Strategies].
+  # See example sessions at {Strategies}[rdoc-ref:HTTP@Strategies].
   #
-  # === Session Using \Net::HTTP.start
+  # === Session Using \HTTP.start
   #
   # If you have many requests to make to a single host (and port),
-  # consider using singleton method Net::HTTP.start with a block;
+  # consider using singleton method HTTP.start with a block;
   # the method handles the session automatically by:
   #
   # - Calling #start before block execution.
@@ -213,11 +216,11 @@ class HTTPHeaderSyntaxError < StandardError; end
   #   - #proppatch: PROPPATCH.
   #   - #unlock: UNLOCK.
   #
-  # === Session Using \Net::HTTP.start and \Net::HTTP.finish
+  # === Session Using \HTTP.start and \HTTP.finish
   #
   # You can manage a session manually using methods #start and #finish:
   #
-  #   http = Net::HTTP.new(hostname)
+  #   http = HTTP.new(hostname)
   #   http.start
   #   http.get('/todos/1')
   #   http.get('/todos/2')
@@ -238,7 +241,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # - ::get: Returns the string response body.
   # - ::get_print: Writes the string response body to $stdout.
-  # - ::get_response: Returns a Net::HTTPResponse object.
+  # - ::get_response: Returns an HTTPResponse object.
   #
   # Such methods that send POST requests:
   #
@@ -249,76 +252,68 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # Many of the methods above are convenience methods,
   # each of which sends a request and returns a string
-  # without directly using \Net::HTTPRequest and \Net::HTTPResponse objects.
+  # without directly using \HTTPRequest and \HTTPResponse objects.
   #
   # You can, however, directly create a request object, send the request,
   # and retrieve the response object; see:
   #
-  # - Net::HTTPRequest.
-  # - Net::HTTPResponse.
+  # - HTTPRequest.
+  # - HTTPResponse.
   #
   # == Following Redirection
   #
-  # Each Net::HTTPResponse object belongs to a class for its response code.
+  # Each HTTPResponse object belongs to a class for its response code.
   #
-  # For example, all 2XX responses are instances of a Net::HTTPSuccess
-  # subclass, a 3XX response is an instance of a Net::HTTPRedirection
-  # subclass and a 200 response is an instance of the Net::HTTPOK class.  For
-  # details of response classes, see the section "HTTP Response Classes"
-  # below.
+  # For example, all 2XX responses are instances of an HTTPSuccess
+  # subclass, a 3XX response is an instance of an HTTPRedirection
+  # subclass and a 200 response is an instance of the HTTPOK class.
+  # For details, see HTTPResponse.
   #
   # Using a case statement you can handle various types of responses properly:
   #
-  #   def fetch(uri_str, limit = 10)
+  #   def fetch(uri, limit = 10)
   #     # You should choose a better exception.
   #     raise ArgumentError, 'too many HTTP redirects' if limit == 0
   #
-  #     response = Net::HTTP.get_response(URI(uri_str))
-  #
-  #     case response
+  #     res = HTTP.get_response(uri)
+  #     case res
   #     when Net::HTTPSuccess then
-  #       response
+  #       res
   #     when Net::HTTPRedirection then
-  #       location = response['location']
+  #       location = res['location']
   #       warn "redirected to #{location}"
   #       fetch(location, limit - 1)
   #     else
-  #       response.value
+  #       res.value
   #     end
   #   end
   #
-  #   print fetch('http://www.ruby-lang.org')
+  #   fetch(uri) # => #<Net::HTTPOK 200 OK readbody=true>
   #
   # == Basic Authentication
   #
   # Basic authentication is performed according to
-  # [RFC2617](http://www.ietf.org/rfc/rfc2617.txt).
+  # {RFC2617}[http://www.ietf.org/rfc/rfc2617.txt].
   #
-  #   uri = URI('http://example.com/index.html?key=value')
+  #   req = HTTP::Get.new(uri)
+  #   req.basic_auth('user', 'pass')
   #
-  #   req = Net::HTTP::Get.new(uri)
-  #   req.basic_auth 'user', 'pass'
-  #
-  #   res = Net::HTTP.start(uri.hostname, uri.port) {|http|
+  #   res = HTTP.start(hostname) do |http|
   #     http.request(req)
-  #   }
-  #   puts res.body
+  #   end
   #
   # == Streaming Response Bodies
   #
-  # By default Net::HTTP reads an entire response into memory.  If you are
+  # By default, \Net::HTTP reads an entire response into memory.  If you are
   # handling large files or wish to implement a progress bar you can instead
   # stream the body directly to an IO.
   #
-  #   uri = URI('http://example.com/large_file')
-  #
-  #   Net::HTTP.start(uri.host, uri.port) do |http|
-  #     request = Net::HTTP::Get.new uri
-  #
-  #     http.request request do |response|
-  #       open 'large_file', 'w' do |io|
-  #         response.read_body do |chunk|
-  #           io.write chunk
+  #   HTTP.start(hostname) do |http|
+  #     req = HTTP::Get.new(uri)
+  #     http.request(req) do |res|
+  #       open('t.tmp', 'w') do |f|
+  #         res.read_body do |chunk|
+  #           f.write chunk
   #         end
   #       end
   #     end
@@ -326,28 +321,23 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # == HTTPS
   #
-  # HTTPS is enabled for an HTTP connection by Net::HTTP#use_ssl=.
+  # HTTPS is enabled for an \HTTP connection by HTTP#use_ssl=:
   #
-  #   uri = URI('https://secure.example.com/some_path?query=string')
-  #
-  #   Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-  #     request = Net::HTTP::Get.new uri
-  #     response = http.request request # Net::HTTPResponse object
+  #   HTTP.start(hostname, :use_ssl => true) do |http|
+  #     req = HTTP::Get.new(uri)
+  #     res = http.request(req)
   #   end
   #
-  # Or if you simply want to make a GET request, you may pass in an URI
-  # object that has an HTTPS URL. Net::HTTP automatically turns on TLS
-  # verification if the URI object has a 'https' URI scheme.
-  #
-  #   uri = URI('https://example.com/')
-  #   Net::HTTP.get(uri) # => String
+  # Or if you simply want to make a GET request, you may pass in a URI
+  # object that has an HTTPS URL. \Net::HTTP automatically turns on TLS
+  # verification if the URI object has a 'https' URI scheme:
   #
-  # In previous versions of Ruby you would need to require 'net/https' to use
-  # HTTPS. This is no longer true.
+  #   uri # => #<URI::HTTPS https://jsonplaceholder.typicode.com/>
+  #   HTTP.get(uri)
   #
   # == Proxies
   #
-  # Net::HTTP will automatically create a proxy from the +http_proxy+
+  # \Net::HTTP will automatically create a proxy from the +http_proxy+
   # environment variable if it is present.  To disable use of +http_proxy+,
   # pass +nil+ for the proxy address.
   #
@@ -355,17 +345,13 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   #   proxy_addr = 'your.proxy.host'
   #   proxy_port = 8080
-  #
-  #   Net::HTTP.new('example.com', nil, proxy_addr, proxy_port).start { |http|
+  #   HTTP.new('example.com', nil, proxy_addr, proxy_port).start { |http|
   #     # always proxy via your.proxy.addr:8080
   #   }
   #
-  # See Net::HTTP.new for further details and examples such as proxies that
-  # require a username and password.
-  #
   # == Compression
   #
-  # Net::HTTP automatically adds Accept-Encoding for compression of response
+  # \Net::HTTP automatically adds Accept-Encoding for compression of response
   # bodies and automatically decompresses gzip and deflate responses unless a
   # Range header was sent.
   #
@@ -405,11 +391,7 @@ class << HTTP
       alias is_version_1_2? version_1_2?   #:nodoc:
     end
 
-    # :call-seq:
-    #   Net::HTTP.get_print(hostname, path, port = 80) -> nil
-    #   Net::HTTP:get_print(uri, headers = {}, port = uri.port) -> nil
-    #
-    # Like Net::HTTP.get, but writes the returned body to $stdout;
+    # Like HTTP.get, but writes the returned body to $stdout;
     # returns +nil+.
     def HTTP.get_print(uri_or_host, path_or_headers = nil, port = nil)
       get_response(uri_or_host, path_or_headers, port) {|res|
@@ -420,17 +402,13 @@ def HTTP.get_print(uri_or_host, path_or_headers = nil, port = nil)
       nil
     end
 
-    # :call-seq:
-    #   Net::HTTP.get(hostname, path, port = 80) -> body
-    #   Net::HTTP:get(uri, headers = {}, port = uri.port) -> body
-    #
     # Sends a GET request and returns the \HTTP response body as a string.
     #
     # With string arguments +hostname+ and +path+:
     #
     #   hostname = 'jsonplaceholder.typicode.com'
     #   path = '/todos/1'
-    #   puts Net::HTTP.get(hostname, path)
+    #   puts HTTP.get(hostname, path)
     #
     # Output:
     #
@@ -445,22 +423,18 @@ def HTTP.get_print(uri_or_host, path_or_headers = nil, port = nil)
     #
     #   uri = URI('https://jsonplaceholder.typicode.com/todos/1')
     #   headers = {'Content-type' => 'application/json; charset=UTF-8'}
-    #   Net::HTTP.get(uri, headers)
+    #   HTTP.get(uri, headers)
     #
     # Related:
     #
-    # - Net::HTTP::Get: request class for \HTTP method +GET+.
-    # - Net::HTTP#get: convenience method for \HTTP method +GET+.
+    # - HTTP::Get: request class for \HTTP method +GET+.
+    # - HTTP#get: convenience method for \HTTP method +GET+.
     #
     def HTTP.get(uri_or_host, path_or_headers = nil, port = nil)
       get_response(uri_or_host, path_or_headers, port).body
     end
 
-    # :call-seq:
-    #   Net::HTTP.get_response(hostname, path, port = 80) -> http_response
-    #   Net::HTTP:get_response(uri, headers = {}, port = uri.port) -> http_response
-    #
-    # Like Net::HTTP.get, but returns a Net::HTTPResponse object
+    # Like HTTP.get, but returns an HTTPResponse object
     # instead of the body string.
     def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
       if path_or_headers && !path_or_headers.is_a?(Hash)
@@ -479,7 +453,7 @@ def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
       end
     end
 
-    # Posts data to a host; returns a Net::HTTPResponse object.
+    # Posts data to a host; returns an HTTPResponse object.
     #
     # Argument +url+ must be a URL;
     # argument +data+ must be a string:
@@ -488,7 +462,7 @@ def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
     #   _uri.path = '/posts'
     #   data = '{"title": "foo", "body": "bar", "userId": 1}'
     #   headers = {'content-type': 'application/json'}
-    #   res = Net::HTTP.post(_uri, data, headers) # => #<Net::HTTPCreated 201 Created readbody=true>
+    #   res = HTTP.post(_uri, data, headers) # => #<Net::HTTPCreated 201 Created readbody=true>
     #   puts res.body
     #
     # Output:
@@ -502,8 +476,8 @@ def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
     #
     # Related:
     #
-    # - Net::HTTP::Post: request class for \HTTP method +POST+.
-    # - Net::HTTP#post: convenience method for \HTTP method +POST+.
+    # - HTTP::Post: request class for \HTTP method +POST+.
+    # - HTTP#post: convenience method for \HTTP method +POST+.
     #
     def HTTP.post(url, data, header = nil)
       start(url.hostname, url.port,
@@ -512,7 +486,7 @@ def HTTP.post(url, data, header = nil)
       }
     end
 
-    # Posts data to a host; returns a Net::HTTPResponse object.
+    # Posts data to a host; returns an HTTPResponse object.
     #
     # Argument +url+ must be a URI;
     # argument +data+ must be a hash:
@@ -520,7 +494,7 @@ def HTTP.post(url, data, header = nil)
     #   _uri = uri.dup
     #   _uri.path = '/posts'
     #   data = {title: 'foo', body: 'bar', userId: 1}
-    #   res = Net::HTTP.post_form(_uri, data) # => #<Net::HTTPCreated 201 Created readbody=true>
+    #   res = HTTP.post_form(_uri, data) # => #<Net::HTTPCreated 201 Created readbody=true>
     #   puts res.body
     #
     # Output:
@@ -548,7 +522,7 @@ def HTTP.post_form(url, params)
 
     # Returns intger +80+, the default port to use for HTTP requests:
     #
-    #   Net::HTTP.default_port # => 80
+    #   HTTP.default_port # => 80
     #
     def HTTP.default_port
       http_default_port()
@@ -556,7 +530,7 @@ def HTTP.default_port
 
     # Returns integer +80+, the default port to use for HTTP requests:
     #
-    #   Net::HTTP.http_default_port # => 80
+    #   HTTP.http_default_port # => 80
     #
     def HTTP.http_default_port
       80
@@ -564,7 +538,7 @@ def HTTP.http_default_port
 
     # Returns integer +443+, the default port to use for HTTPS requests:
     #
-    #   Net::HTTP.https_default_port # => 443
+    #   HTTP.https_default_port # => 443
     #
     def HTTP.https_default_port
       443
@@ -578,15 +552,15 @@ def HTTP.socket_type   #:nodoc: obsolete
     #   HTTP.start(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, opts) -> http
     #   HTTP.start(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, opts) {|http| ... } -> object
     #
-    # Creates a new \Net::HTTP object, +http+, via \Net::HTTP.new:
+    # Creates a new \Net::HTTP object, +http+, via \HTTP.new:
     #
-    #   Net::HTTP.new(address, port, p_addr, p_port, p_user, p_pass)
+    #   HTTP.new(address, port, p_addr, p_port, p_user, p_pass)
     #
-    # - For arguments +hostname+ through +p_pass+, see Net::HTTP.new.
+    # - For arguments +hostname+ through +p_pass+, see HTTP.new.
     # - For argument +opts+, see below.
     #
     # Note: If +port+ is +nil+ and <tt>opts[:use_ssl]</tt> is a truthy value,
-    # the value passed to +new+ is Net::HTTP.https_default_port, not +port+.
+    # the value passed to +new+ is HTTP.https_default_port, not +port+.
     #
     # With no block given:
     #
@@ -595,7 +569,7 @@ def HTTP.socket_type   #:nodoc: obsolete
     # - Returns +http+.
     # - The caller should call #finish to close the session:
     #
-    #     http = Net::HTTP.start(hostname)
+    #     http = HTTP.start(hostname)
     #     http.started? # => true
     #     http.finish
     #     http.started? # => false
@@ -615,7 +589,7 @@ def HTTP.socket_type   #:nodoc: obsolete
     # Example:
     #
     #   hostname = 'jsonplaceholder.typicode.com'
-    #   Net::HTTP.start(hostname) do |http|
+    #   HTTP.start(hostname) do |http|
     #     puts http.get('/todos/1').body
     #     puts http.get('/todos/2').body
     #   end
@@ -686,7 +660,7 @@ class << HTTP
       alias newobj new # :nodoc:
     end
 
-    # Returns a new Net::HTTP object +http+
+    # Returns a new \Net::HTTP object +http+
     # (but does not open a TCP connection or HTTP session).
     #
     # <b>No Proxy</b>
@@ -696,12 +670,12 @@ class << HTTP
     # the returned +http+:
     #
     # - Has the given address.
-    # - Has the default port number, Net::HTTP.default_port (80).
+    # - Has the default port number, HTTP.default_port (80).
     # - Has no proxy.
     #
     # Example:
     #
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   # => #<Net::HTTP jsonplaceholder.typicode.com:80 open=false>
     #   http.address # => "jsonplaceholder.typicode.com"
     #   http.port    # => 80
@@ -710,7 +684,7 @@ class << HTTP
     # With integer argument +port+ also given,
     # the returned +http+ has the given port:
     #
-    #   http = Net::HTTP.new(hostname, 8000)
+    #   http = HTTP.new(hostname, 8000)
     #   # => #<Net::HTTP jsonplaceholder.typicode.com:8000 open=false>
     #   http.port # => 8000
     #
@@ -719,7 +693,7 @@ class << HTTP
     # When argument +p_addr+ is a string hostname,
     # the returned +http+ has a proxy:
     #
-    #   http = Net::HTTP.new(hostname, nil, 'proxy.example')
+    #   http = HTTP.new(hostname, nil, 'proxy.example')
     #   # => #<Net::HTTP jsonplaceholder.typicode.com:80 open=false>
     #   http.proxy?        # => true
     #   http.proxy_address # => "proxy.example"
@@ -730,7 +704,7 @@ class << HTTP
     #
     # The port, username, and password for the proxy may also be given:
     #
-    #   http = Net::HTTP.new(hostname, nil, 'proxy.example', 8000, 'pname', 'ppass')
+    #   http = HTTP.new(hostname, nil, 'proxy.example', 8000, 'pname', 'ppass')
     #   # => #<Net::HTTP jsonplaceholder.typicode.com:80 open=false>
     #   http.proxy?        # => true
     #   http.proxy_address # => "proxy.example"
@@ -748,7 +722,7 @@ class << HTTP
     #
     #   ENV['http_proxy'] = 'http://example.com'
     #   # => "http://example.com"
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   # => #<Net::HTTP jsonplaceholder.typicode.com:80 open=false>
     #   http.proxy?        # => true
     #   http.address       # => "jsonplaceholder.typicode.com"
@@ -758,7 +732,7 @@ class << HTTP
     #
     #   ENV['http_proxy'] = 'http://pname:ppass@example.com:8000'
     #   # => "http://pname:ppass@example.com:8000"
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   # => #<Net::HTTP jsonplaceholder.typicode.com:80 open=false>
     #   http.proxy_port # => 8000
     #   http.proxy_user # => "pname"
@@ -770,28 +744,28 @@ class << HTTP
     #
     # - Reject a certain address:
     #
-    #     http = Net::HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example')
+    #     http = HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example')
     #     http.proxy_address # => nil
     #
     # - Reject certain domains or subdomains:
     #
-    #     http = Net::HTTP.new('example.com', nil, 'my.proxy.example', 8000, 'pname', 'ppass', 'proxy.example')
+    #     http = HTTP.new('example.com', nil, 'my.proxy.example', 8000, 'pname', 'ppass', 'proxy.example')
     #     http.proxy_address # => nil
     #
     # - Reject certain addresses and port combinations:
     #
-    #     http = Net::HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example:1234')
+    #     http = HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example:1234')
     #     http.proxy_address # => "proxy.example"
     #
-    #     http = Net::HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example:8000')
+    #     http = HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'proxy.example:8000')
     #     http.proxy_address # => nil
     #
     # - Reject a list of the types above delimited using a comma:
     #
-    #     http = Net::HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'my.proxy,proxy.example:8000')
+    #     http = HTTP.new('example.com', nil, 'proxy.example', 8000, 'pname', 'ppass', 'my.proxy,proxy.example:8000')
     #     http.proxy_address # => nil
     #
-    #     http = Net::HTTP.new('example.com', nil, 'my.proxy', 8000, 'pname', 'ppass', 'my.proxy,proxy.example:8000')
+    #     http = HTTP.new('example.com', nil, 'my.proxy', 8000, 'pname', 'ppass', 'my.proxy,proxy.example:8000')
     #     http.proxy_address # => nil
     #
     def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_no_proxy = nil)
@@ -819,7 +793,7 @@ def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_p
       http
     end
 
-    # Creates a new Net::HTTP object for the specified server address,
+    # Creates a new \Net::HTTP object for the specified server address,
     # without opening the TCP connection or initializing the HTTP session.
     # The +address+ should be a DNS hostname or IP address.
     def initialize(address, port = nil)
@@ -861,7 +835,7 @@ def initialize(address, port = nil)
 
     # Returns a string representation of +self+:
     #
-    #   Net::HTTP.new(hostname).inspect
+    #   HTTP.new(hostname).inspect
     #   # => "#<Net::HTTP jsonplaceholder.typicode.com:80 open=false>"
     #
     def inspect
@@ -873,7 +847,7 @@ def inspect
     #
     # Sets the output stream for debugging:
     #
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   File.open('t.tmp', 'w') do |file|
     #     http.set_debug_output(file)
     #     http.start
@@ -952,7 +926,7 @@ def set_debug_output(output)
     #
     # Examples:
     #
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   http.response_body_encoding = Encoding::US_ASCII # => #<Encoding:US-ASCII>
     #   http.response_body_encoding = 'US-ASCII'         # => "US-ASCII"
     #   http.response_body_encoding = 'ASCII'            # => "ASCII"
@@ -974,7 +948,7 @@ def response_body_encoding=(value)
     # returns the value set by #ipaddr=,
     # or +nil+ if it has not been set:
     #
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   http.ipaddr # => nil
     #   http.ipaddr = '172.67.155.76'
     #   http.ipaddr # => "172.67.155.76"
@@ -982,7 +956,7 @@ def response_body_encoding=(value)
     # If the session has been started,
     # returns the IP address from the socket:
     #
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   http.start
     #   http.ipaddr # => "172.67.155.76"
     #   http.finish
@@ -993,7 +967,7 @@ def ipaddr
 
     # Sets the IP address for the connection:
     #
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   http.ipaddr # => nil
     #   http.ipaddr = '172.67.155.76'
     #   http.ipaddr # => "172.67.155.76"
@@ -1007,31 +981,31 @@ def ipaddr=(addr)
     # Number of seconds to wait for the connection to open. Any number
     # may be used, including Floats for fractional seconds. If the HTTP
     # object cannot open a connection in this many seconds, it raises a
-    # Net::OpenTimeout exception. The default value is 60 seconds.
+    # \Net::OpenTimeout exception. The default value is 60 seconds.
     attr_accessor :open_timeout
 
     # Number of seconds to wait for one block to be read (via one read(2)
     # call). Any number may be used, including Floats for fractional
     # seconds. If the HTTP object cannot read data in this many seconds,
-    # it raises a Net::ReadTimeout exception. The default value is 60 seconds.
+    # it raises a \Net::ReadTimeout exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
     # Number of seconds to wait for one block to be written (via one write(2)
     # call). Any number may be used, including Floats for fractional
     # seconds. If the HTTP object cannot write data in this many seconds,
-    # it raises a Net::WriteTimeout exception. The default value is 60 seconds.
-    # Net::WriteTimeout is not raised on Windows.
+    # it raises a \Net::WriteTimeout exception. The default value is 60 seconds.
+    # \Net::WriteTimeout is not raised on Windows.
     attr_reader :write_timeout
 
     # Sets the maximum number of times to retry an idempotent request in case of
-    # Net::ReadTimeout, IOError, EOFError, Errno::ECONNRESET,
+    # \Net::ReadTimeout, IOError, EOFError, Errno::ECONNRESET,
     # Errno::ECONNABORTED, Errno::EPIPE, OpenSSL::SSL::SSLError,
     # Timeout::Error.
     # The initial value is 1.
     #
     # Argument +retries+ must be a non-negative numeric value:
     #
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   http.max_retries = 2   # => 2
     #   http.max_retries       # => 2
     #
@@ -1050,7 +1024,7 @@ def max_retries=(retries)
     #
     # Argument +sec+ must be a non-negative numeric value:
     #
-    #   http = Net::HTTP.new(hostname)
+    #   http = HTTP.new(hostname)
     #   http.read_timeout # => 60
     #   http.get('/todos/1') # => #<Net::HTTPOK 200 OK readbody=true>
     #   http.read_timeout = 0
@@ -1084,7 +1058,7 @@ def continue_timeout=(sec)
 
     # Seconds to reuse the connection of the previous request.
     # If the idle time is less than this Keep-Alive Timeout,
-    # Net::HTTP reuses the TCP/IP socket used by the previous communication.
+    # reuses the TCP/IP socket used by the previous communication.
     # The default value is 2 seconds.
     attr_accessor :keep_alive_timeout
 
@@ -1109,7 +1083,7 @@ def use_ssl?
     # Turn on/off SSL.
     # This flag must be set before starting session.
     # If you change use_ssl value after session started,
-    # a Net::HTTP object raises IOError.
+    # IOError is raised.
     def use_ssl=(flag)
       flag = flag ? true : false
       if started? and @use_ssl != flag
@@ -1218,7 +1192,7 @@ def peer_cert
 
     # Opens a TCP connection and HTTP session.
     #
-    # When this method is called with a block, it passes the Net::HTTP
+    # When this method is called with a block, it passes the \Net::HTTP
     # object to the block, and closes the TCP connection and HTTP session
     # after the block has been executed.
     #
@@ -1387,11 +1361,11 @@ def do_finish
     @proxy_user = nil
     @proxy_pass = nil
 
-    # Creates an HTTP proxy class which behaves like Net::HTTP, but
+    # Creates an HTTP proxy class which behaves like \Net::HTTP, but
     # performs all access via the specified proxy.
     #
     # This class is obsolete.  You may pass these same parameters directly to
-    # Net::HTTP.new.  See Net::HTTP.new for details of the arguments.
+    # HTTP.new.  See HTTP.new for details of the arguments.
     def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil) #:nodoc:
       return self unless p_addr
 
@@ -1419,16 +1393,16 @@ def proxy_class?
         defined?(@is_proxy_class) ? @is_proxy_class : false
       end
 
-      # Address of proxy host. If Net::HTTP does not use a proxy, nil.
+      # Address of proxy host. If \Net::HTTP does not use a proxy, nil.
       attr_reader :proxy_address
 
-      # Port number of proxy host. If Net::HTTP does not use a proxy, nil.
+      # Port number of proxy host. If \Net::HTTP does not use a proxy, nil.
       attr_reader :proxy_port
 
-      # User name for accessing proxy. If Net::HTTP does not use a proxy, nil.
+      # User name for accessing proxy. If \Net::HTTP does not use a proxy, nil.
       attr_reader :proxy_user
 
-      # User password for accessing proxy. If Net::HTTP does not use a proxy,
+      # User password for accessing proxy. If \Net::HTTP does not use a proxy,
       # nil.
       attr_reader :proxy_pass
     end
@@ -1544,7 +1518,7 @@ def edit_path(path)
     # the header as well to prevent confusion.  Otherwise
     # it leaves the body as it found it.
     #
-    # This method returns a Net::HTTPResponse object.
+    # This method returns an HTTPResponse object.
     #
     # If called with a block, yields each fragment of the
     # entity body in turn as a string as it is read from
@@ -1577,12 +1551,12 @@ def get(path, initheader = nil, dest = nil, &block) # :yield: +body_segment+
     # Gets only the header from +path+ on the connected-to host.
     # +header+ is a Hash like { 'Accept' => '*/*', ... }.
     #
-    # This method returns a Net::HTTPResponse object.
+    # This method returns an HTTPResponse object.
     #
     # This method never raises an exception.
     #
     #     response = nil
-    #     Net::HTTP.start('some.www.server', 80) {|http|
+    #     HTTP.start('some.www.server', 80) {|http|
     #       response = http.head('/index.html')
     #     }
     #     p response['content-type']
@@ -1594,7 +1568,7 @@ def head(path, initheader = nil)
     # Posts +data+ (must be a String) to +path+. +header+ must be a Hash
     # like { 'Accept' => '*/*', ... }.
     #
-    # This method returns a Net::HTTPResponse object.
+    # This method returns an HTTPResponse object.
     #
     # If called with a block, yields each fragment of the
     # entity body in turn as a string as it is read from
@@ -1694,7 +1668,7 @@ def trace(path, initheader = nil)
     end
 
     # Sends a GET request to the +path+.
-    # Returns the response as a Net::HTTPResponse object.
+    # Returns the response as an HTTPResponse object.
     #
     # When called with a block, passes an HTTPResponse object to the block.
     # The body of the response will not have been read yet;
@@ -1723,7 +1697,7 @@ def request_get(path, initheader = nil, &block) # :yield: +response+
     end
 
     # Sends a HEAD request to the +path+ and returns the response
-    # as a Net::HTTPResponse object.
+    # as an HTTPResponse object.
     #
     # Returns the response.
     #
@@ -1738,7 +1712,7 @@ def request_head(path, initheader = nil, &block)
 
     # Sends a POST request to the +path+.
     #
-    # Returns the response as a Net::HTTPResponse object.
+    # Returns the response as an HTTPResponse object.
     #
     # When called with a block, the block is passed an HTTPResponse
     # object.  The body of that response will not have been read yet;
@@ -1779,7 +1753,7 @@ def request_put(path, data, initheader = nil, &block)   #:nodoc:
     # Sends an HTTP request to the HTTP server.
     # Also sends a DATA string if +data+ is given.
     #
-    # Returns a Net::HTTPResponse object.
+    # Returns an HTTPResponse object.
     #
     # This method never raises Net::* exceptions.
     #
@@ -1794,9 +1768,9 @@ def send_request(name, path, data = nil, header = nil)
 
     # Sends an HTTPRequest object +req+ to the HTTP server.
     #
-    # If +req+ is a Net::HTTP::Post or Net::HTTP::Put request containing
-    # data, the data is also sent. Providing data for a Net::HTTP::Head or
-    # Net::HTTP::Get request results in an ArgumentError.
+    # If +req+ is an HTTP::Post or HTTP::Put request containing
+    # data, the data is also sent. Providing data for an HTTP::Head or
+    # HTTP::Get request results in an ArgumentError.
     #
     # Returns an HTTPResponse object.
     #
diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb
index ef6f32b8..c74e7313 100644
--- a/lib/net/http/header.rb
+++ b/lib/net/http/header.rb
@@ -4,8 +4,10 @@
 #
 # The module is included in:
 #
-# - Net::HTTPGenericRequest (and therefore Net::HTTPRequest).
-# - Net::HTTPResponse.
+# - HTTPGenericRequest (and therefore also in
+#
+# HTTPRequest).
+# - HTTPResponse.
 #
 # The headers are a hash-like collection of key/value pairs called _fields_.
 #
@@ -13,15 +15,15 @@
 #
 # Headers may be included in:
 #
-# - A Net::HTTPRequest object:
+# - An HTTPRequest object:
 #   the object's headers will be sent with the request.
 #   Any fields may be defined in the request;
-#   see {Setters}[rdoc-ref:Net::HTTPHeader@Setters].
-# - A Net::HTTPResponse object:
+#   see {Setters}[rdoc-ref:HTTPHeader@Setters].
+# - An HTTPResponse object:
 #   the objects headers are usually those returned from the host.
 #   Fields may be retrieved from the object;
-#   see {Getters}[rdoc-ref:Net::HTTPHeader@Getters]
-#   and {Iterators}[rdoc-ref:Net::HTTPHeader@Iterators].
+#   see {Getters}[rdoc-ref:HTTPHeader@Getters]
+#   and {Iterators}[rdoc-ref:HTTPHeader@Iterators].
 #
 # Exactly which fields should be sent or expected depends on the host;
 # see:
@@ -48,7 +50,7 @@
 #
 # Examples:
 #
-#   req = Net::HTTP::Get.new(uri)
+#   req = HTTP::Get.new(uri)
 #   req[:accept]  # => "*/*"
 #   req['Accept'] # => "*/*"
 #   req['ACCEPT'] # => "*/*"
@@ -205,14 +207,14 @@ def size   #:nodoc: obsolete
 
   # Returns the string field value for the case-insensitive field +key+,
   # or +nil+ if there is no such key;
-  # see {Fields}[rdoc-ref:Net::HTTPHeader@Fields]:
+  # see {Fields}[rdoc-ref:HTTPHeader@Fields]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res['Connection'] # => "keep-alive"
   #   res['Nosuch']     # => nil
   #
   # Note that some field values may be retrieved via convenience methods;
-  # see {Getters}[rdoc-ref:Net::HTTPHeader@Getters].
+  # see {Getters}[rdoc-ref:HTTPHeader@Getters].
   def [](key)
     a = @header[key.downcase.to_s] or return nil
     a.join(', ')
@@ -220,15 +222,15 @@ def [](key)
 
   # Sets the value for the case-insensitive +key+ to +val+,
   # overwriting the previous value if the field exists;
-  # see {Fields}[rdoc-ref:Net::HTTPHeader@Fields]:
+  # see {Fields}[rdoc-ref:HTTPHeader@Fields]:
   #
-  #   req = Net::HTTP::Get.new(uri)
+  #   req = HTTP::Get.new(uri)
   #   req['Accept'] # => "*/*"
   #   req['Accept'] = 'text/html'
   #   req['Accept'] # => "text/html"
   #
   # Note that some field values may be set via convenience methods;
-  # see {Setters}[rdoc-ref:Net::HTTPHeader@Setters].
+  # see {Setters}[rdoc-ref:HTTPHeader@Setters].
   def []=(key, val)
     unless val
       @header.delete key.downcase.to_s
@@ -239,9 +241,9 @@ def []=(key, val)
 
   # Adds value +val+ to the value array for field +key+ if the field exists;
   # creates the field with the given +key+ and +val+ if it does not exist.
-  # see {Fields}[rdoc-ref:Net::HTTPHeader@Fields]:
+  # see {Fields}[rdoc-ref:HTTPHeader@Fields]:
   #
-  #   req = Net::HTTP::Get.new(uri)
+  #   req = HTTP::Get.new(uri)
   #   req.add_field('Foo', 'bar')
   #   req['Foo']            # => "bar"
   #   req.add_field('Foo', 'baz')
@@ -289,9 +291,9 @@ def add_field(key, val)
 
   # Returns the array field value for the given +key+,
   # or +nil+ if there is no such field;
-  # see {Fields}[rdoc-ref:Net::HTTPHeader@Fields]:
+  # see {Fields}[rdoc-ref:HTTPHeader@Fields]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res.get_fields('Connection') # => ["keep-alive"]
   #   res.get_fields('Nosuch')     # => nil
   #
@@ -308,9 +310,9 @@ def get_fields(key)
   # With a block, returns the string value for +key+ if it exists;
   # otherwise returns the value of the block;
   # ignores the +default_val+;
-  # see {Fields}[rdoc-ref:Net::HTTPHeader@Fields]:
+  # see {Fields}[rdoc-ref:HTTPHeader@Fields]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #
   #   # Field exists; block not called.
   #   res.fetch('Connection') do |value|
@@ -337,7 +339,7 @@ def fetch(key, *args, &block)   #:yield: +key+
 
   # Calls the block with each key/value pair:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res.each_header do |key, value|
   #     p [key, value] if key.start_with?('c')
   #   end
@@ -352,7 +354,7 @@ def fetch(key, *args, &block)   #:yield: +key+
   #
   # Returns an enumerator if no block is given.
   #
-  # Net::HTTPHeader#each is an alias for Net::HTTPHeader#each_header.
+  # HTTPHeader#each is an alias for HTTPHeader#each_header.
   def each_header   #:yield: +key+, +value+
     block_given? or return enum_for(__method__) { @header.size }
     @header.each do |k,va|
@@ -364,7 +366,7 @@ def each_header   #:yield: +key+, +value+
 
   # Calls the block with each field key:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res.each_key do |key|
   #     p key if key.start_with?('c')
   #   end
@@ -379,7 +381,7 @@ def each_header   #:yield: +key+, +value+
   #
   # Returns an enumerator if no block is given.
   #
-  # Net::HTTPHeader#each_name is an alias for Net::HTTPHeader#each_key.
+  # HTTPHeader#each_name is an alias for HTTPHeader#each_key.
   def each_name(&block)   #:yield: +key+
     block_given? or return enum_for(__method__) { @header.size }
     @header.each_key(&block)
@@ -389,7 +391,7 @@ def each_name(&block)   #:yield: +key+
 
   # Calls the block with each capitalized field name:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res.each_capitalized_name do |key|
   #     p key if key.start_with?('C')
   #   end
@@ -415,7 +417,7 @@ def each_capitalized_name  #:yield: +key+
 
   # Calls the block with each string field value:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res.each_value do |value|
   #     p value if value.start_with?('c')
   #   end
@@ -435,10 +437,10 @@ def each_value   #:yield: +value+
   end
 
   # Removes the header for the given case-insensitive +key+
-  # (see {Fields}[rdoc-ref:Net::HTTPHeader@Fields]);
+  # (see {Fields}[rdoc-ref:HTTPHeader@Fields]);
   # returns the deleted value, or +nil+ if no such field exists:
   #
-  #   req = Net::HTTP::Get.new(uri)
+  #   req = HTTP::Get.new(uri)
   #   req.delete('Accept') # => ["*/*"]
   #   req.delete('Nosuch') # => nil
   #
@@ -448,7 +450,7 @@ def delete(key)
 
   # Returns +true+ if the field for the case-insensitive +key+ exists, +false+ otherwise:
   #
-  #   req = Net::HTTP::Get.new(uri)
+  #   req = HTTP::Get.new(uri)
   #   req.key?('Accept') # => true
   #   req.key?('Nosuch') # => false
   #
@@ -458,7 +460,7 @@ def key?(key)
 
   # Returns a hash of the key/value pairs:
   #
-  #   req = Net::HTTP::Get.new(uri)
+  #   req = HTTP::Get.new(uri)
   #   req.to_hash
   #   # =>
   #   {"accept-encoding"=>["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"],
@@ -472,7 +474,7 @@ def to_hash
 
   # Like #each_header, but the keys are returned in capitalized form.
   #
-  # Net::HTTPHeader#canonical_each is an alias for Net::HTTPHeader#each_capitalized.
+  # HTTPHeader#canonical_each is an alias for HTTPHeader#each_capitalized.
   def each_capitalized
     block_given? or return enum_for(__method__) { @header.size }
     @header.each do |k,v|
@@ -492,7 +494,7 @@ def capitalize(name)
   # or +nil+ if there is no such field;
   # see {Range request header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#range-request-header]:
   #
-  #   req = Net::HTTP::Get.new(uri)
+  #   req = HTTP::Get.new(uri)
   #   req['Range'] = 'bytes=0-99,200-299,400-499'
   #   req.range # => [0..99, 200..299, 400..499]
   #   req.delete('Range')
@@ -550,7 +552,7 @@ def range
   #
   # With argument +length+:
   #
-  #   req = Net::HTTP::Get.new(uri)
+  #   req = HTTP::Get.new(uri)
   #   req.set_range(100)      # => 100
   #   req['Range']            # => "bytes=0-99"
   #
@@ -564,7 +566,7 @@ def range
   #   req.set_range(100..199) # => 100..199
   #   req['Range']            # => "bytes=100-199"
   #
-  # Net::HTTPHeader#range= is an alias for Net::HTTPHeader#set_range.
+  # HTTPHeader#range= is an alias for HTTPHeader#set_range.
   def set_range(r, e = nil)
     unless r
       @header.delete 'range'
@@ -600,9 +602,9 @@ def set_range(r, e = nil)
   # or +nil+ if there is no such field;
   # see {Content-Length request header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-length-request-header]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/nosuch/1')
+  #   res = HTTP.get_response(hostname, '/nosuch/1')
   #   res.content_length # => 2
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res.content_length # => nil
   #
   def content_length
@@ -618,11 +620,11 @@ def content_length
   #   _uri = uri.dup
   #   hostname = _uri.hostname           # => "jsonplaceholder.typicode.com"
   #   _uri.path = '/posts'               # => "/posts"
-  #   req = Net::HTTP::Post.new(_uri)    # => #<Net::HTTP::Post POST>
+  #   req = HTTP::Post.new(_uri)    # => #<Net::HTTP::Post POST>
   #   req.body = '{"title": "foo","body": "bar","userId": 1}'
   #   req.content_length = req.body.size # => 42
   #   req.content_type = 'application/json'
-  #   res = Net::HTTP.start(hostname) do |http|
+  #   res = HTTP.start(hostname) do |http|
   #     http.request(req)
   #   end # => #<Net::HTTPCreated 201 Created readbody=true>
   #
@@ -639,7 +641,7 @@ def content_length=(len)
   # +false+ otherwise;
   # see {Transfer-Encoding response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#transfer-encoding-response-header]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res['Transfer-Encoding'] # => "chunked"
   #   res.chunked?             # => true
   #
@@ -653,7 +655,7 @@ def chunked?
   # <tt>'Content-Range'</tt>, or +nil+ if no such field exists;
   # see {Content-Range response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-range-response-header]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res['Content-Range'] # => nil
   #   res['Content-Range'] = 'bytes 0-499/1000'
   #   res['Content-Range'] # => "bytes 0-499/1000"
@@ -671,7 +673,7 @@ def content_range
   # <tt>'Content-Range'</tt>, or +nil+ if no such field exists;
   # see {Content-Range response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-range-response-header]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res['Content-Range'] # => nil
   #   res['Content-Range'] = 'bytes 0-499/1000'
   #   res.range_length     # => 500
@@ -686,7 +688,7 @@ def range_length
   # or +nil+ if no such field exists;
   # see {Content-Type response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-response-header]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res['content-type'] # => "application/json; charset=utf-8"
   #   res.content_type    # => "application/json"
   #
@@ -704,7 +706,7 @@ def content_type
   # or +nil+ if no such field exists;
   # see {Content-Type response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-response-header]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res['content-type'] # => "application/json; charset=utf-8"
   #   res.main_type       # => "application"
   #
@@ -719,7 +721,7 @@ def main_type
   # or +nil+ if no such field exists;
   # see {Content-Type response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-response-header]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res['content-type'] # => "application/json; charset=utf-8"
   #   res.sub_type        # => "json"
   #
@@ -734,7 +736,7 @@ def sub_type
   # or +nil+ if no such field exists;
   # see {Content-Type response header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-response-header]:
   #
-  #   res = Net::HTTP.get_response(hostname, '/todos/1')
+  #   res = HTTP.get_response(hostname, '/todos/1')
   #   res['content-type'] # => "application/json; charset=utf-8"
   #   res.type_params     # => {"charset"=>"utf-8"}
   #
@@ -753,10 +755,10 @@ def type_params
   # returns the new value;
   # see {Content-Type request header}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-type-request-header]:
   #
-  #   req = Net::HTTP::Get.new(uri)
+  #   req = HTTP::Get.new(uri)
   #   req.set_content_type('application/json') # => ["application/json"]
   #
-  # Net::HTTPHeader#content_type= is an alias for Net::HTTPHeader#set_content_type.
+  # HTTPHeader#content_type= is an alias for HTTPHeader#set_content_type.
   def set_content_type(type, params = {})
     @header['content-type'] = [type + params.map{|k,v|"; #{k}=#{v}"}.join('')]
   end
@@ -775,7 +777,7 @@ def set_content_type(type, params = {})
   # With only argument +params+ given,
   # sets the body to a URL-encoded string with the default separator <tt>'&'</tt>:
   #
-  #   req = Net::HTTP::Post.new('example.com')
+  #   req = HTTP::Post.new('example.com')
   #
   #   req.set_form_data(q: 'ruby', lang: 'en')
   #   req.body            # => "q=ruby&lang=en"
@@ -796,7 +798,7 @@ def set_content_type(type, params = {})
   #   req.set_form_data({q: 'ruby', lang: 'en'}, '|')
   #   req.body # => "q=ruby|lang=en"
   #
-  # Net::HTTPHeader#form_data= is an alias for Net::HTTPHeader#set_form_data.
+  # HTTPHeader#form_data= is an alias for HTTPHeader#set_form_data.
   def set_form_data(params, sep = '&')
     query = URI.encode_www_form(params)
     query.gsub!(/&/, sep) if sep != '&'
@@ -824,7 +826,7 @@ def set_form_data(params, sep = '&')
   #
   #   _uri = uri.dup
   #   _uri.path ='/posts'
-  #   req = Net::HTTP::Post.new(_uri)
+  #   req = HTTP::Post.new(_uri)
   #
   # <b>Argument +params+ As an Array</b>
   #
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb
index 83853ffd..e96db2e2 100644
--- a/lib/net/http/response.rb
+++ b/lib/net/http/response.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 
-# This class is the base class for \Net::HTTP request classes.
+# This class is the base class for \Net::HTTP response classes.
 #
 # == About the Examples
 #
@@ -8,22 +8,22 @@
 #
 # == Returned Responses
 #
-# \Method Net::HTTP.get_response returns
-# an instance of one of the subclasses of \Net::HTTPResponse:
+# \Method HTTP.get_response returns
+# an instance of one of the subclasses of \HTTPResponse:
 #
-#   Net::HTTP.get_response(uri)
+#   HTTP.get_response(uri)
 #   # => #<Net::HTTPOK 200 OK readbody=true>
-#   Net::HTTP.get_response(hostname, '/nosuch')
+#   HTTP.get_response(hostname, '/nosuch')
 #   # => #<Net::HTTPNotFound 404 Not Found readbody=true>
 #
-# As does method Net::HTTP#request:
+# As does method HTTP#request:
 #
-#   req = Net::HTTP::Get.new(uri)
-#   Net::HTTP.start(hostname) do |http|
+#   req = HTTP::Get.new(uri)
+#   HTTP.start(hostname) do |http|
 #     http.request(req)
 #   end # => #<Net::HTTPOK 200 OK readbody=true>
 #
-# \Class \Net::HTTPResponse includes module Net::HTTPHeader,
+# \Class \HTTPResponse includes module Net::HTTPHeader,
 # which provides access to response header values via (among others):
 #
 # - \Hash-like method <tt>[]</tt>.
@@ -31,24 +31,24 @@
 #
 # Examples:
 #
-#   res = Net::HTTP.get_response(uri) # => #<Net::HTTPOK 200 OK readbody=true>
+#   res = HTTP.get_response(uri)      # => #<Net::HTTPOK 200 OK readbody=true>
 #   res['Content-Type']               # => "text/html; charset=UTF-8"
 #   res.content_type                  # => "text/html"
 #
 # == Response Subclasses
 #
-# \Class \Net::HTTPResponse has a subclass for each
+# \Class \HTTPResponse has a subclass for each
 # {HTTP status code}[https://en.wikipedia.org/wiki/List_of_HTTP_status_codes].
 # You can look up the response class for a given code:
 #
-#   Net::HTTPResponse::CODE_TO_OBJ['200'] # => Net::HTTPOK
-#   Net::HTTPResponse::CODE_TO_OBJ['400'] # => Net::HTTPBadRequest
-#   Net::HTTPResponse::CODE_TO_OBJ['404'] # => Net::HTTPNotFound
+#   HTTPResponse::CODE_TO_OBJ['200'] # => Net::HTTPOK
+#   HTTPResponse::CODE_TO_OBJ['400'] # => Net::HTTPBadRequest
+#   HTTPResponse::CODE_TO_OBJ['404'] # => Net::HTTPNotFound
 #
 # And you can retrieve the status code for a response object:
 #
-#   Net::HTTP.get_response(uri).code                 # => "200"
-#   Net::HTTP.get_response(hostname, '/nosuch').code # => "404"
+#   HTTP.get_response(uri).code                 # => "200"
+#   HTTP.get_response(hostname, '/nosuch').code # => "404"
 #
 # The response subclasses (indentation shows class hierarchy):
 #