diff --git a/Makefile.am b/Makefile.am
index 5fd7f459..8e0b07a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/README.rst b/README.rst
index dcbdeba1..6e8cc8d2 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
-nghttp2 - HTTP/2.0 C Library
+nghttp2 - HTTP/2 C Library
 ============================
 
 This is an experimental implementation of Hypertext Transfer Protocol
-version 2.0.
+version 2.
 
 Development Status
 ------------------
@@ -150,12 +150,12 @@ http://tatsuhiro-t.github.io/nghttp2/
 Client, Server and Proxy programs
 ---------------------------------
 
-The src directory contains HTTP/2.0 client, server and proxy programs.
+The src directory contains HTTP/2 client, server and proxy programs.
 
 nghttp - client
 +++++++++++++++
 
-``nghttp`` is a HTTP/2.0 client. It can connect to the HTTP/2.0 server
+``nghttp`` is a HTTP/2 client. It can connect to the HTTP/2 server
 with prior knowledge, HTTP Upgrade and NPN/ALPN TLS extension.
 
 It has verbose output mode for framing information. Here is sample
@@ -279,8 +279,8 @@ nghttpd - server
 By default, it uses SSL/TLS connection. Use ``--no-tls`` option to
 disable it.
 
-``nghttpd`` only accepts the HTTP/2.0 connection via NPN/ALPN or direct
-HTTP/2.0 connection. No HTTP Upgrade is supported.
+``nghttpd`` only accepts the HTTP/2 connection via NPN/ALPN or direct
+HTTP/2 connection. No HTTP Upgrade is supported.
 
 ``-p`` option allows users to configure server push.
 
@@ -338,15 +338,15 @@ nghttpx - proxy
 ``nghttpx`` is a multi-threaded reverse proxy for
 h2-10, SPDY and HTTP/1.1. It has several operation modes:
 
-================== ============================== ============== =============
-Mode option        Frontend                       Backend        Note
-================== ============================== ============== =============
-default mode       HTTP/2.0, SPDY, HTTP/1.1 (TLS) HTTP/1.1       Reverse proxy
-``--http2-proxy``  HTTP/2.0, SPDY, HTTP/1.1 (TLS) HTTP/1.1       SPDY proxy
-``--http2-bridge`` HTTP/2.0, SPDY, HTTP/1.1 (TLS) HTTP/2.0 (TLS)
-``--client``       HTTP/2.0, HTTP/1.1             HTTP/2.0 (TLS)
-``--client-proxy`` HTTP/2.0, HTTP/1.1             HTTP/2.0 (TLS) Forward proxy
-================== ============================== ============== =============
+================== ============================ ============== =============
+Mode option        Frontend                     Backend        Note
+================== ============================ ============== =============
+default mode       HTTP/2, SPDY, HTTP/1.1 (TLS) HTTP/1.1       Reverse proxy
+``--http2-proxy``  HTTP/2, SPDY, HTTP/1.1 (TLS) HTTP/1.1       SPDY proxy
+``--http2-bridge`` HTTP/2, SPDY, HTTP/1.1 (TLS) HTTP/2 (TLS)
+``--client``       HTTP/2, HTTP/1.1             HTTP/2 (TLS)
+``--client-proxy`` HTTP/2, HTTP/1.1             HTTP/2 (TLS)   Forward proxy
+================== ============================ ============== =============
 
 The interesting mode at the moment is the default mode. It works like
 a reverse proxy and listens for h2-10, SPDY and HTTP/1.1 and
@@ -356,7 +356,7 @@ The default mode, ``--http2-proxy`` and ``--http2-bridge`` modes use
 SSL/TLS in the frontend connection by default. To disable SSL/TLS, use
 ``--frontend-no-tls`` option. If that option is used, SPDY is disabled
 in the frontend and incoming HTTP/1.1 connection can be upgraded to
-HTTP/2.0 through HTTP Upgrade.
+HTTP/2 through HTTP Upgrade.
 
 The ``--http2-bridge``, ``--client`` and ``--client-proxy`` modes use
 SSL/TLS in the backend connection by deafult. To disable SSL/TLS, use
@@ -371,13 +371,13 @@ In the default mode, (without any of ``--http2-proxy``,
 ``--http2-bridge``, ``--client-proxy`` and ``--client`` options),
 ``nghttpx`` works as reverse proxy to the backend server::
 
-    Client <-- (HTTP/2.0, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Web Server
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Web Server
                                           [reverse proxy]
 
 With ``--http2-proxy`` option, it works as so called secure proxy (aka
 SPDY proxy)::
 
-    Client <-- (HTTP/2.0, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Proxy
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Proxy
                                            [secure proxy]            (e.g., Squid)
 
 The ``Client`` in the above is needs to be configured to use
@@ -401,42 +401,42 @@ Then run Chrome with the following arguments::
 
     $ google-chrome --proxy-pac-url=file:///path/to/proxy.pac --use-npn
 
-With ``--http2-bridge``, it accepts HTTP/2.0, SPDY and HTTP/1.1
-connections and communicates with backend in HTTP/2.0::
+With ``--http2-bridge``, it accepts HTTP/2, SPDY and HTTP/1.1
+connections and communicates with backend in HTTP/2::
 
-    Client <-- (HTTP/2.0, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/2.0) --> Web or HTTP/2.0 Proxy etc
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/2) --> Web or HTTP/2 Proxy etc
                                                                          (e.g., nghttpx -s)
 
 With ``--client-proxy`` option, it works as forward proxy and expects
-that the backend is HTTP/2.0 proxy::
+that the backend is HTTP/2 proxy::
 
-    Client <-- (HTTP/2.0, HTTP/1.1) --> nghttpx <-- (HTTP/2.0) --> HTTP/2.0 Proxy
+    Client <-- (HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/2) --> HTTP/2 Proxy
                                      [forward proxy]               (e.g., nghttpx -s)
 
 The ``Client`` needs to be configured to use nghttpx as forward
-proxy.  The frontend HTTP/1.1 connection can be upgraded to HTTP/2.0
+proxy.  The frontend HTTP/1.1 connection can be upgraded to HTTP/2
 through HTTP Upgrade.  With the above configuration, one can use
-HTTP/1.1 client to access and test their HTTP/2.0 servers.
+HTTP/1.1 client to access and test their HTTP/2 servers.
 
 With ``--client`` option, it works as reverse proxy and expects that
-the backend is HTTP/2.0 Web server::
+the backend is HTTP/2 Web server::
 
-    Client <-- (HTTP/2.0, HTTP/1.1) --> nghttpx <-- (HTTP/2.0) --> Web Server
+    Client <-- (HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/2) --> Web Server
                                     [reverse proxy]
 
-The frontend HTTP/1.1 connection can be upgraded to HTTP/2.0
+The frontend HTTP/1.1 connection can be upgraded to HTTP/2
 through HTTP Upgrade.
 
-For the operation modes which talk to the backend in HTTP/2.0 over
+For the operation modes which talk to the backend in HTTP/2 over
 SSL/TLS, the backend connections can be tunneled through HTTP
 proxy. The proxy is specified using ``--backend-http-proxy-uri``
 option. The following figure illustrates the example of
 ``--http2-bridge`` and ``--backend-http-proxy-uri`` options to talk to
-the outside HTTP/2.0 proxy through HTTP proxy::
+the outside HTTP/2 proxy through HTTP proxy::
 
-    Client <-- (HTTP/2.0, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/2.0) --
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/2) --
 
-            --===================---> HTTP/2.0 Proxy
+            --===================---> HTTP/2 Proxy
               (HTTP proxy tunnel)     (e.g., nghttpx -s)
 
 Benchmarking tool
diff --git a/android-config b/android-config
index 3c9910b6..562660a7 100755
--- a/android-config
+++ b/android-config
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 #
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 #
diff --git a/android-make b/android-make
index e28c42a9..375045a6 100755
--- a/android-make
+++ b/android-make
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 #
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 #
diff --git a/configure.ac b/configure.ac
index 538ecb26..2e077cbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl nghttp2 - HTTP/2.0 C Library
+dnl nghttp2 - HTTP/2 C Library
 
 dnl Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7a3f878e..aaa216a2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 75c1626c..08721b3d 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/doc/mkapiref.py b/doc/mkapiref.py
index b538387c..1d55242a 100755
--- a/doc/mkapiref.py
+++ b/doc/mkapiref.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/doc/sources/index.rst b/doc/sources/index.rst
index 563fa286..65449b9f 100644
--- a/doc/sources/index.rst
+++ b/doc/sources/index.rst
@@ -3,11 +3,11 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-nghttp2 - HTTP/2.0 C Library
+nghttp2 - HTTP/2 C Library
 ============================
 
 This is an experimental implementation of Hypertext Transfer Protocol
-version 2.0.
+version 2.
 
 The project is hosted at `github.com/tatsuhiro-t/nghttp2 <https://github.com/tatsuhiro-t/nghttp2>`_.
 
diff --git a/doc/sources/tutorial-client.rst b/doc/sources/tutorial-client.rst
index 297773e1..265eb166 100644
--- a/doc/sources/tutorial-client.rst
+++ b/doc/sources/tutorial-client.rst
@@ -1,7 +1,7 @@
-Tutorial: HTTP/2.0 client
+Tutorial: HTTP/2 client
 =========================
 
-In this tutorial, we are going to write very primitive HTTP/2.0
+In this tutorial, we are going to write very primitive HTTP/2
 client. The complete source code, `libevent-client.c`_, is attached at
 the end of this page.  It also resides in examples directory in the
 archive or repository.
@@ -19,7 +19,7 @@ function ``main()`` and ``run()``, which is not so relevant to nghttp2
 library use. The one thing you should look at is setup NPN callback.
 The NPN callback is used for the client to select the next application
 protocol over the SSL/TLS transport. In this tutorial, we use
-`nghttp2_select_next_protocol()` function to select the HTTP/2.0
+`nghttp2_select_next_protocol()` function to select the HTTP/2
 protocol the library supports::
 
     static int select_next_proto_cb(SSL* ssl,
@@ -52,7 +52,7 @@ The callback is set to the SSL_CTX object using
     }
 
 We use ``http2_session_data`` structure to store the data related to
-the HTTP/2.0 session::
+the HTTP/2 session::
 
     typedef struct {
       nghttp2_session *session;
@@ -176,7 +176,7 @@ The `delete_http2_session_data()` destroys ``session_data`` and frees
 its bufferevent, so it closes underlying connection as well. It also
 calls `nghttp2_session_del()` to delete nghttp2 session object.
 
-We begin HTTP/2.0 communication by sending client connection header,
+We begin HTTP/2 communication by sending client connection header,
 which is 24 bytes magic byte sequence
 (:macro:`NGHTTP2_CLIENT_CONNECTION_HEADER`) followed by SETTINGS
 frame.  The transmission of client connection header is done in
@@ -371,7 +371,7 @@ request based on priority and stream ID must be monotonically
 increased, the stream ID is not assigned just before transmission.
 The one of the purpose of this callback is get the stream ID assigned
 to the frame. First we check that the frame is HEADERS frame. Since
-HEADERS has several meanings in HTTP/2.0, we check that it is request
+HEADERS has several meanings in HTTP/2, we check that it is request
 HEADERS (which means that the first HEADERS frame to create a stream).
 The assigned stream ID is ``frame->hd.stream_id``.  Recall that we
 passed ``stream_data`` in the *stream_user_data* parameter of
@@ -479,6 +479,6 @@ If the stream ID matches the one we initiated, it means that its
 stream is going to be closed. Since we have finished to get the
 resource we want (or the stream was reset by RST_STREAM from the
 remote peer), we call `nghttp2_session_terminate_session()` to
-commencing the closure of the HTTP/2.0 session gracefully. If you have
+commencing the closure of the HTTP/2 session gracefully. If you have
 some data associated for the stream to be closed, you may delete it
 here.
diff --git a/doc/sources/tutorial-server.rst b/doc/sources/tutorial-server.rst
index bf06223e..cf6db0a0 100644
--- a/doc/sources/tutorial-server.rst
+++ b/doc/sources/tutorial-server.rst
@@ -1,8 +1,8 @@
-Tutorial: HTTP/2.0 server
+Tutorial: HTTP/2 server
 =========================
 
 In this tutorial, we are going to write single-threaded, event-based
-HTTP/2.0 web server, which supports HTTPS only. It can handle
+HTTP/2 web server, which supports HTTPS only. It can handle
 concurrent multiple requests, but only GET method is supported. The
 complete source code, `libevent-server.c`_, is attached at the end of
 this page.  It also resides in examples directory in the archive or
@@ -57,7 +57,7 @@ life time::
 
 The wire format of NPN is a sequence of length prefixed string. The
 exactly one byte is used to specify the length of each protocol
-identifier.  In this tutorial, we advertise the HTTP/2.0 protocol the
+identifier.  In this tutorial, we advertise the HTTP/2 protocol the
 nghttp2 library supports. The nghttp2 library exports its identifier
 in :macro:`NGHTTP2_PROTO_VERSION_ID`. The ``next_proto_cb()`` function
 is the server-side NPN callback. In OpenSSL implementation, we just
@@ -73,7 +73,7 @@ We use ``app_content`` structure to store the application-wide data::
     };
 
 We use ``http2_session_data`` structure to store the session-level
-(which corresponds to 1 HTTP/2.0 connection) data::
+(which corresponds to 1 HTTP/2 connection) data::
 
     typedef struct http2_session_data {
       struct http2_stream_data root;
@@ -94,7 +94,7 @@ data::
       int fd;
     } http2_stream_data;
 
-1 HTTP/2.0 session can have multiple streams.  We manage these
+1 HTTP/2 session can have multiple streams.  We manage these
 multiple streams by intrusive doubly linked list to add and remove the
 object in O(1). The first element of this list is pointed by the
 ``root->next`` in ``http2_session_data``.  Initially, ``root->next``
@@ -226,10 +226,10 @@ it::
 
 We check that the received byte string matches
 :macro:`NGHTTP2_CLIENT_CONNECTION_HEADER`.  When they match, the
-connection state is ready for starting HTTP/2.0 communication. First
+connection state is ready for starting HTTP/2 communication. First
 we change the callback functions for the bufferevent object. We use
 same ``eventcb`` as before. But we specify new ``readcb`` and
-``writecb`` function to handle HTTP/2.0 communication. We describe
+``writecb`` function to handle HTTP/2 communication. We describe
 these 2 functions later.
 
 We initialize nghttp2 session object which is done in
@@ -435,7 +435,7 @@ of header block in HEADERS or PUSH_PROMISE frame is started::
     }
 
 We only interested in HEADERS frame in this function. Since HEADERS
-frame has several roles in HTTP/2.0 protocol, we check that it is a
+frame has several roles in HTTP/2 protocol, we check that it is a
 request HEADERS, which opens new stream. If frame is request HEADERS,
 then we create ``http2_stream_data`` object to store stream related
 data. We associate created ``http2_stream_data`` object to the stream
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a3feb5a9..9e3f1f3e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/examples/client.c b/examples/client.c
index c1c77f62..5acac92a 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -146,7 +146,7 @@ static size_t GZIP_LEN = sizeof(GZIP) - 1;
 
 /*
  * Check response is content-encoding: gzip. We need this because
- * HTTP/2.0 client is required to support gzip.
+ * HTTP/2 client is required to support gzip.
  */
 static void check_gzip(struct Request *req, nghttp2_nv *nva, size_t nvlen)
 {
@@ -395,7 +395,7 @@ static void setup_nghttp2_callbacks(nghttp2_session_callbacks *callbacks)
 
 /*
  * Callback function for TLS NPN. Since this program only supports
- * HTTP/2.0 protocol, if server does not offer HTTP/2.0 the nghttp2
+ * HTTP/2 protocol, if server does not offer HTTP/2 the nghttp2
  * library supports, we terminate program.
  */
 static int select_next_proto_cb(SSL* ssl,
@@ -404,11 +404,11 @@ static int select_next_proto_cb(SSL* ssl,
                                 void *arg)
 {
   int rv;
-  /* nghttp2_select_next_protocol() selects HTTP/2.0 protocol the
+  /* nghttp2_select_next_protocol() selects HTTP/2 protocol the
      nghttp2 library supports. */
   rv = nghttp2_select_next_protocol(out, outlen, in, inlen);
   if(rv <= 0) {
-    die("Server did not advertise HTTP/2.0 protocol");
+    die("Server did not advertise HTTP/2 protocol");
   }
   return SSL_TLSEXT_ERR_OK;
 }
diff --git a/examples/libevent-client.c b/examples/libevent-client.c
index 5699a048..7734e607 100644
--- a/examples/libevent-client.c
+++ b/examples/libevent-client.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -190,7 +190,7 @@ static ssize_t send_callback(nghttp2_session *session,
 
 /* nghttp2_before_frame_send_callback: Called when nghttp2 library is
    about to send a frame. We use this callback to get stream ID of new
-   stream. Since HEADERS in HTTP/2.0 has several roles, we check that
+   stream. Since HEADERS in HTTP/2 has several roles, we check that
    it is a HTTP request HEADERS. */
 static int before_frame_send_callback
 (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
@@ -308,7 +308,7 @@ static int on_stream_close_callback(nghttp2_session *session,
 }
 
 /* NPN TLS extension client callback. We check that server advertised
-   the HTTP/2.0 protocol the nghttp2 library supports. If not, exit
+   the HTTP/2 protocol the nghttp2 library supports. If not, exit
    the program. */
 static int select_next_proto_cb(SSL* ssl,
                                 unsigned char **out, unsigned char *outlen,
diff --git a/examples/libevent-server.c b/examples/libevent-server.c
index 58060b8b..2fcff6c0 100644
--- a/examples/libevent-server.c
+++ b/examples/libevent-server.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -549,7 +549,7 @@ static void initialize_nghttp2_session(http2_session_data *session_data)
   nghttp2_session_server_new(&session_data->session, &callbacks, session_data);
 }
 
-/* Send HTTP/2.0 client connection header, which includes 24 bytes
+/* Send HTTP/2 client connection header, which includes 24 bytes
    magic octets and SETTINGS frame */
 static int send_server_connection_header(http2_session_data *session_data)
 {
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cd419557..daaab783 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
 
diff --git a/lib/includes/Makefile.am b/lib/includes/Makefile.am
index dec70162..80af63cc 100644
--- a/lib/includes/Makefile.am
+++ b/lib/includes/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/lib/includes/nghttp2/nghttp2.h b/lib/includes/nghttp2/nghttp2.h
index 10e81d60..1348024b 100644
--- a/lib/includes/nghttp2/nghttp2.h
+++ b/lib/includes/nghttp2/nghttp2.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013, 2014 Tatsuhiro Tsujikawa
  *
@@ -52,7 +52,7 @@ struct nghttp2_session;
 /**
  * @struct
  *
- * The primary structure to hold the resources needed for a HTTP/2.0
+ * The primary structure to hold the resources needed for a HTTP/2
  * session. The details of this structure are intentionally hidden
  * from the public API.
  */
@@ -332,7 +332,7 @@ typedef struct {
 
 /**
  * @enum
- * The control frame types in HTTP/2.0.
+ * The control frame types in HTTP/2.
  */
 typedef enum {
   /**
@@ -380,7 +380,7 @@ typedef enum {
 /**
  * @enum
  *
- * The flags for HTTP/2.0 frames. This enum defines all flags for
+ * The flags for HTTP/2 frames. This enum defines all flags for
  * frames, assuming that the same flag name has the same mask.
  */
 typedef enum {
@@ -616,7 +616,7 @@ typedef struct {
  * @enum
  *
  * The category of HEADERS, which indicates the role of the frame. In
- * HTTP/2.0 spec, request, response, push response and other arbitrary
+ * HTTP/2 spec, request, response, push response and other arbitrary
  * headers (e.g., trailers) are all called just HEADERS. To give the
  * application the role of incoming HEADERS frame, we define several
  * categories.
@@ -2023,7 +2023,7 @@ void nghttp2_priority_spec_dep_init(nghttp2_priority_spec *pri_spec,
  * appearing in different header fields, it has to concatenate them
  * using NULL byte (0x0) before passing them to this function.
  *
- * HTTP/2.0 specification has requirement about header fields in the
+ * HTTP/2 specification has requirement about header fields in the
  * request HEADERS. See the specification for more details.
  *
  * This function creates copies of all name/value pairs in |nva|.  It
@@ -2042,7 +2042,7 @@ void nghttp2_priority_spec_dep_init(nghttp2_priority_spec *pri_spec,
  * `nghttp2_session_get_stream_user_data()`.
  *
  * Since the library reorders the frames and tries to send the highest
- * prioritized one first and the HTTP/2.0 specification requires the
+ * prioritized one first and the HTTP/2 specification requires the
  * stream ID must be strictly increasing, the stream ID of this
  * request cannot be known until it is about to sent.  To know the
  * stream ID of the request, the application can use
@@ -2078,7 +2078,7 @@ int nghttp2_submit_request(nghttp2_session *session,
  * appearing in different header fields, it has to concatenate them
  * using NULL byte (0x0) before passing them to this function.
  *
- * HTTP/2.0 specification has requirement about header fields in the
+ * HTTP/2 specification has requirement about header fields in the
  * response HEADERS. See the specification for more details.
  *
  * This function creates copies of all name/value pairs in |nva|.  It
@@ -2299,7 +2299,7 @@ int nghttp2_submit_settings(nghttp2_session *session, uint8_t flags,
  * :type:`nghttp2_on_frame_send_callback` of this frame.
  *
  * Since the library reorders the frames and tries to send the highest
- * prioritized one first and the HTTP/2.0 specification requires the
+ * prioritized one first and the HTTP/2 specification requires the
  * stream ID must be strictly increasing, the promised stream ID
  * cannot be known until it is about to sent.  To know the promised
  * stream ID, the application can use
@@ -2434,7 +2434,7 @@ int nghttp2_nv_compare_name(const nghttp2_nv *lhs, const nghttp2_nv *rhs);
  *
  * The selection algorithm is as follows:
  *
- * 1. If peer's list contains HTTP/2.0 protocol the library supports,
+ * 1. If peer's list contains HTTP/2 protocol the library supports,
  *    it is selected and returns 1. The following step is not taken.
  *
  * 2. If peer's list contains ``http/1.1``, this function selects
diff --git a/lib/includes/nghttp2/nghttp2ver.h.in b/lib/includes/nghttp2/nghttp2ver.h.in
index 142dede8..7717a647 100644
--- a/lib/includes/nghttp2/nghttp2ver.h.in
+++ b/lib/includes/nghttp2/nghttp2ver.h.in
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
  *
diff --git a/lib/libnghttp2.pc.in b/lib/libnghttp2.pc.in
index 99c3ce81..e41f4f47 100644
--- a/lib/libnghttp2.pc.in
+++ b/lib/libnghttp2.pc.in
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
 
@@ -26,7 +26,7 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: libnghttp2
-Description: HTTP/2.0 C library
+Description: HTTP/2 C library
 URL: https://github.com/tatsuhiro-t/nghttp2
 Version: @VERSION@
 Libs: -L${libdir} -lnghttp2
diff --git a/lib/nghttp2_buf.c b/lib/nghttp2_buf.c
index be82f925..744f8cd7 100644
--- a/lib/nghttp2_buf.c
+++ b/lib/nghttp2_buf.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_buf.h b/lib/nghttp2_buf.h
index cb59804d..a457a4e1 100644
--- a/lib/nghttp2_buf.h
+++ b/lib/nghttp2_buf.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_frame.c b/lib/nghttp2_frame.c
index 390e598b..2fa6b4ed 100644
--- a/lib/nghttp2_frame.c
+++ b/lib/nghttp2_frame.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_frame.h b/lib/nghttp2_frame.h
index df9a9ac7..ed92a440 100644
--- a/lib/nghttp2_frame.h
+++ b/lib/nghttp2_frame.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_gzip.c b/lib/nghttp2_gzip.c
index c22cba94..cab7163e 100644
--- a/lib/nghttp2_gzip.c
+++ b/lib/nghttp2_gzip.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_gzip.h b/lib/nghttp2_gzip.h
index ca2a5655..f0fe48b9 100644
--- a/lib/nghttp2_gzip.h
+++ b/lib/nghttp2_gzip.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_hd.c b/lib/nghttp2_hd.c
index 4d42e783..fdb28538 100644
--- a/lib/nghttp2_hd.c
+++ b/lib/nghttp2_hd.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_hd.h b/lib/nghttp2_hd.h
index 61fc6088..0f490826 100644
--- a/lib/nghttp2_hd.h
+++ b/lib/nghttp2_hd.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_hd_huffman.c b/lib/nghttp2_hd_huffman.c
index 5dfbba7d..4fe3a07d 100644
--- a/lib/nghttp2_hd_huffman.c
+++ b/lib/nghttp2_hd_huffman.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_hd_huffman.h b/lib/nghttp2_hd_huffman.h
index fa992061..ba464017 100644
--- a/lib/nghttp2_hd_huffman.h
+++ b/lib/nghttp2_hd_huffman.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_hd_huffman_data.c b/lib/nghttp2_hd_huffman_data.c
index 76ff83d1..afb7eeb2 100644
--- a/lib/nghttp2_hd_huffman_data.c
+++ b/lib/nghttp2_hd_huffman_data.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_helper.c b/lib/nghttp2_helper.c
index a841bfdd..3ac011be 100644
--- a/lib/nghttp2_helper.c
+++ b/lib/nghttp2_helper.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_helper.h b/lib/nghttp2_helper.h
index 2e3d9517..931ed88c 100644
--- a/lib/nghttp2_helper.h
+++ b/lib/nghttp2_helper.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_int.h b/lib/nghttp2_int.h
index bc54c960..678d1eef 100644
--- a/lib/nghttp2_int.h
+++ b/lib/nghttp2_int.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_map.c b/lib/nghttp2_map.c
index a4ccf76c..ac23c1aa 100644
--- a/lib/nghttp2_map.c
+++ b/lib/nghttp2_map.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_map.h b/lib/nghttp2_map.h
index 9c03be1a..a28ff0bd 100644
--- a/lib/nghttp2_map.h
+++ b/lib/nghttp2_map.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_net.h b/lib/nghttp2_net.h
index a80e1461..621231ef 100644
--- a/lib/nghttp2_net.h
+++ b/lib/nghttp2_net.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_npn.c b/lib/nghttp2_npn.c
index ead53d61..78b6cfa3 100644
--- a/lib/nghttp2_npn.c
+++ b/lib/nghttp2_npn.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -42,7 +42,7 @@ int nghttp2_select_next_protocol(unsigned char **out, unsigned char *outlen,
       http_selected = 1;
       *out = (unsigned char*)&in[i+1];
       *outlen = in[i];
-      /* Go through to the next iteration, because "HTTP/2.0" may be
+      /* Go through to the next iteration, because "HTTP/2" may be
          there */
     }
   }
diff --git a/lib/nghttp2_npn.h b/lib/nghttp2_npn.h
index 69ac466f..55485408 100644
--- a/lib/nghttp2_npn.h
+++ b/lib/nghttp2_npn.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_outbound_item.c b/lib/nghttp2_outbound_item.c
index e1386c2f..da137c18 100644
--- a/lib/nghttp2_outbound_item.c
+++ b/lib/nghttp2_outbound_item.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_outbound_item.h b/lib/nghttp2_outbound_item.h
index 8a6da1c4..37245f64 100644
--- a/lib/nghttp2_outbound_item.h
+++ b/lib/nghttp2_outbound_item.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_pq.c b/lib/nghttp2_pq.c
index 33401bcb..07aa331c 100644
--- a/lib/nghttp2_pq.c
+++ b/lib/nghttp2_pq.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_pq.h b/lib/nghttp2_pq.h
index 2c8c363b..325de228 100644
--- a/lib/nghttp2_pq.h
+++ b/lib/nghttp2_pq.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_priority_spec.c b/lib/nghttp2_priority_spec.c
index 416a7f19..9c9028e7 100644
--- a/lib/nghttp2_priority_spec.c
+++ b/lib/nghttp2_priority_spec.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_priority_spec.h b/lib/nghttp2_priority_spec.h
index c2ea55a0..a68cdc75 100644
--- a/lib/nghttp2_priority_spec.h
+++ b/lib/nghttp2_priority_spec.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_queue.c b/lib/nghttp2_queue.c
index 9f638254..71357a45 100644
--- a/lib/nghttp2_queue.c
+++ b/lib/nghttp2_queue.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_queue.h b/lib/nghttp2_queue.h
index e53564b1..4e5f6647 100644
--- a/lib/nghttp2_queue.h
+++ b/lib/nghttp2_queue.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_session.c b/lib/nghttp2_session.c
index 62b39df6..4701f5b3 100644
--- a/lib/nghttp2_session.c
+++ b/lib/nghttp2_session.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_session.h b/lib/nghttp2_session.h
index f406d573..0702adf0 100644
--- a/lib/nghttp2_session.h
+++ b/lib/nghttp2_session.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_stream.c b/lib/nghttp2_stream.c
index e58e7dd4..0cec7682 100644
--- a/lib/nghttp2_stream.c
+++ b/lib/nghttp2_stream.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_stream.h b/lib/nghttp2_stream.h
index b5300950..c43f9e75 100644
--- a/lib/nghttp2_stream.h
+++ b/lib/nghttp2_stream.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_submit.c b/lib/nghttp2_submit.c
index 7fc70b35..cf033575 100644
--- a/lib/nghttp2_submit.c
+++ b/lib/nghttp2_submit.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_submit.h b/lib/nghttp2_submit.h
index c8478366..74d702fb 100644
--- a/lib/nghttp2_submit.h
+++ b/lib/nghttp2_submit.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/lib/nghttp2_version.c b/lib/nghttp2_version.c
index 7e3d8e86..8d0f680b 100644
--- a/lib/nghttp2_version.c
+++ b/lib/nghttp2_version.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
  *
diff --git a/python/Makefile.am b/python/Makefile.am
index 6c32e3c6..b2364c37 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 
diff --git a/python/cnghttp2.pxd b/python/cnghttp2.pxd
index 2754878f..b3ccb35d 100644
--- a/python/cnghttp2.pxd
+++ b/python/cnghttp2.pxd
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 
diff --git a/python/nghttp2.pyx b/python/nghttp2.pyx
index f74a7c11..596ac0a2 100644
--- a/python/nghttp2.pyx
+++ b/python/nghttp2.pyx
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 
@@ -674,7 +674,7 @@ cdef class _HTTP2SessionCore:
             path = handler.path.decode('utf-8')
         except:
             path = handler.path
-        sys.stderr.write('{} - - [{}] "{} {} HTTP/2.0" {} - {}\n'.format\
+        sys.stderr.write('{} - - [{}] "{} {} HTTP/2" {} - {}\n'.format\
                          (handler.client_address[0],
                           datestr, method, path, handler.status,
                           'P' if handler.pushed else '-'))
diff --git a/python/setup.py.in b/python/setup.py.in
index 75b43cd3..aa66cd59 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 
@@ -25,7 +25,7 @@ from distutils.extension import Extension
 
 setup(
     name = 'python-nghttp2',
-    description = 'Python HTTP/2.0 library on top of nghttp2',
+    description = 'Python HTTP/2 library on top of nghttp2',
     author = 'Tatsuhiro Tsujikawa',
     author_email = 'tatsuhiro.t@gmail.com',
     url = 'http://tatsuhiro-t.github.io/nghttp2/',
diff --git a/src/HtmlParser.cc b/src/HtmlParser.cc
index a805b1f9..f9b841b0 100644
--- a/src/HtmlParser.cc
+++ b/src/HtmlParser.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/HtmlParser.h b/src/HtmlParser.h
index 5b334893..a2408a1e 100644
--- a/src/HtmlParser.h
+++ b/src/HtmlParser.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/HttpServer.cc b/src/HttpServer.cc
index 9ac77852..161012ac 100644
--- a/src/HttpServer.cc
+++ b/src/HttpServer.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -761,7 +761,7 @@ int Http2Handler::verify_npn_result()
     }
   }
   if(sessions_->get_config()->verbose) {
-    std::cerr << "Client did not advertise HTTP/2.0 protocol."
+    std::cerr << "Client did not advertise HTTP/2 protocol."
               << " (nghttp2 expects " << NGHTTP2_PROTO_VERSION_ID << ")"
               << std::endl;
   }
diff --git a/src/HttpServer.h b/src/HttpServer.h
index 674ad41f..e51d22bb 100644
--- a/src/HttpServer.h
+++ b/src/HttpServer.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/Makefile.am b/src/Makefile.am
index 59b6700a..757f4279 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/src/app_helper.cc b/src/app_helper.cc
index 43e3ecd6..dd4dc5a6 100644
--- a/src/app_helper.cc
+++ b/src/app_helper.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/app_helper.h b/src/app_helper.h
index e9f74664..9738f836 100644
--- a/src/app_helper.h
+++ b/src/app_helper.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/base64.h b/src/base64.h
index 5e4631af..49aaa2fb 100644
--- a/src/base64.h
+++ b/src/base64.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/comp_helper.c b/src/comp_helper.c
index c258d78f..25383d30 100644
--- a/src/comp_helper.c
+++ b/src/comp_helper.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/comp_helper.h b/src/comp_helper.h
index 974afecb..d5db2e27 100644
--- a/src/comp_helper.h
+++ b/src/comp_helper.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/deflatehd.c b/src/deflatehd.c
index 540694c0..2ed602a5 100644
--- a/src/deflatehd.c
+++ b/src/deflatehd.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -316,7 +316,7 @@ static int perform_from_http1text(void)
 
 static void print_help(void)
 {
-  printf("HPACK HTTP/2.0 header encoder\n"
+  printf("HPACK HTTP/2 header encoder\n"
          "Usage: deflatehd [OPTIONS] < INPUT\n"
          "\n"
          "Reads JSON data or HTTP/1-style header fields from stdin and\n"
diff --git a/src/h2load.cc b/src/h2load.cc
index 1523f026..78e02e90 100644
--- a/src/h2load.cc
+++ b/src/h2load.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/h2load.h b/src/h2load.h
index c13cfb2f..e336a533 100644
--- a/src/h2load.h
+++ b/src/h2load.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/h2load_http2_session.cc b/src/h2load_http2_session.cc
index 824c4ad5..6df6435d 100644
--- a/src/h2load_http2_session.cc
+++ b/src/h2load_http2_session.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/h2load_http2_session.h b/src/h2load_http2_session.h
index 1c82b1d3..27d201a2 100644
--- a/src/h2load_http2_session.h
+++ b/src/h2load_http2_session.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/h2load_session.h b/src/h2load_session.h
index 90ddddba..3767ca44 100644
--- a/src/h2load_session.h
+++ b/src/h2load_session.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/h2load_spdy_session.cc b/src/h2load_spdy_session.cc
index d61d4b8d..b667d986 100644
--- a/src/h2load_spdy_session.cc
+++ b/src/h2load_spdy_session.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/h2load_spdy_session.h b/src/h2load_spdy_session.h
index 9c248a63..caf053f0 100644
--- a/src/h2load_spdy_session.h
+++ b/src/h2load_spdy_session.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/http2.cc b/src/http2.cc
index 59fe021c..0feb4b4c 100644
--- a/src/http2.cc
+++ b/src/http2.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/http2.h b/src/http2.h
index 1a057ffa..901541f1 100644
--- a/src/http2.h
+++ b/src/http2.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -58,7 +58,7 @@ void copy_url_component(std::string& dest, const http_parser_url *u, int field,
                         const char* url);
 
 // Returns true if the header field |name| with length |namelen| bytes
-// is valid for HTTP/2.0.
+// is valid for HTTP/2.
 bool check_http2_allowed_header(const uint8_t *name, size_t namelen);
 
 // Calls check_http2_allowed_header with |name| and strlen(name),
@@ -66,7 +66,7 @@ bool check_http2_allowed_header(const uint8_t *name, size_t namelen);
 bool check_http2_allowed_header(const char *name);
 
 // Checks that headers |nva| do not contain disallowed header fields
-// in HTTP/2.0 spec. This function returns true if |nva| does not
+// in HTTP/2 spec. This function returns true if |nva| does not
 // contains such headers.
 bool check_http2_headers(const Headers& nva);
 
@@ -151,7 +151,7 @@ nghttp2_nv make_nv_ls(const char(&name)[N], const std::string& value)
 }
 
 // Appends headers in |headers| to |nv|. Certain headers, including
-// disallowed headers in HTTP/2.0 spec and headers which require
+// disallowed headers in HTTP/2 spec and headers which require
 // special handling (i.e. via), are not copied.
 void copy_norm_headers_to_nva
 (std::vector<nghttp2_nv>& nva, const Headers& headers);
diff --git a/src/http2_test.cc b/src/http2_test.cc
index 1d0b93e6..de74ceea 100644
--- a/src/http2_test.cc
+++ b/src/http2_test.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/http2_test.h b/src/http2_test.h
index 3b1a08d1..f2a2769f 100644
--- a/src/http2_test.h
+++ b/src/http2_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/inflatehd.c b/src/inflatehd.c
index 2bdec0e8..f3570f68 100644
--- a/src/inflatehd.c
+++ b/src/inflatehd.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -206,7 +206,7 @@ static int perform(void)
 
 static void print_help(void)
 {
-  printf("HPACK HTTP/2.0 header decoder\n"
+  printf("HPACK HTTP/2 header decoder\n"
          "Usage: inflatehd [OPTIONS] < INPUT\n"
          "\n"
          "Reads JSON data from stdin and outputs inflated name/value pairs\n"
diff --git a/src/nghttp.cc b/src/nghttp.cc
index 0c0366c7..7a9871cd 100644
--- a/src/nghttp.cc
+++ b/src/nghttp.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -1388,7 +1388,7 @@ void print_stats(const HttpClient& client)
 namespace {
 void print_protocol_nego_error()
 {
-  std::cerr << "HTTP/2.0 protocol was not selected."
+  std::cerr << "HTTP/2 protocol was not selected."
             << " (nghttp2 expects " << NGHTTP2_PROTO_VERSION_ID << ")"
             << std::endl;
 }
@@ -1805,10 +1805,10 @@ Options:
   -m, --multiply=<N> Request each URI <N> times.  By default, same URI
                      is not requested twice.   This option disables it
                      too.
-  -u, --upgrade      Perform HTTP  Upgrade for HTTP/2.0.   This option
-                     is ignored  if the request URI  has https scheme.
-                     If  -d  is  used,  the HTTP  upgrade  request  is
-                     performed with OPTIONS method.
+  -u, --upgrade      Perform HTTP Upgrade for  HTTP/2.  This option is
+                     ignored if the request  URI has https scheme.  If
+                     -d is used, the HTTP upgrade request is performed
+                     with OPTIONS method.
   -p, --weight=<WEIGHT>
                      Sets priority group weight. Default: )"
       << NGHTTP2_DEFAULT_WEIGHT << R"(
diff --git a/src/nghttp2_config.h b/src/nghttp2_config.h
index 1447bcbc..c175a304 100644
--- a/src/nghttp2_config.h
+++ b/src/nghttp2_config.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/nghttpd.cc b/src/nghttpd.cc
index 714ceb63..566cf672 100644
--- a/src/nghttpd.cc
+++ b/src/nghttpd.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx-unittest.cc b/src/shrpx-unittest.cc
index 7fb6d860..f9d666cc 100644
--- a/src/shrpx-unittest.cc
+++ b/src/shrpx-unittest.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx.cc b/src/shrpx.cc
index d7668dd8..f92ee315 100644
--- a/src/shrpx.cc
+++ b/src/shrpx.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -374,13 +374,13 @@ void fill_default_config()
   // Timeout for pooled (idle) connections
   mod_config()->downstream_idle_read_timeout.tv_sec = 60;
 
-  // window bits for HTTP/2.0 and SPDY upstream/downstream connection
-  // per stream. 2**16-1 = 64KiB-1, which is HTTP/2.0 default. Please
+  // window bits for HTTP/2 and SPDY upstream/downstream connection
+  // per stream. 2**16-1 = 64KiB-1, which is HTTP/2 default. Please
   // note that SPDY/3 default is 64KiB.
   mod_config()->http2_upstream_window_bits = 16;
   mod_config()->http2_downstream_window_bits = 16;
 
-  // HTTP/2.0 SPDY/3.1 has connection-level flow control. The default
+  // HTTP/2 SPDY/3.1 has connection-level flow control. The default
   // window size for HTTP/2 is 64KiB - 1. SPDY/3's default is 64KiB
   mod_config()->http2_upstream_connection_window_bits = 16;
   mod_config()->http2_downstream_connection_window_bits = 16;
diff --git a/src/shrpx.h b/src/shrpx.h
index e72c5a11..e1fb27ca 100644
--- a/src/shrpx.h
+++ b/src/shrpx.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_accesslog.cc b/src/shrpx_accesslog.cc
index 02cf133e..91149630 100644
--- a/src/shrpx_accesslog.cc
+++ b/src/shrpx_accesslog.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_accesslog.h b/src/shrpx_accesslog.h
index 77dd4d46..ac08f10d 100644
--- a/src/shrpx_accesslog.h
+++ b/src/shrpx_accesslog.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_client_handler.cc b/src/shrpx_client_handler.cc
index 3db011bd..e14c2238 100644
--- a/src/shrpx_client_handler.cc
+++ b/src/shrpx_client_handler.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -189,9 +189,9 @@ void upstream_http1_connhd_readcb(bufferevent *bev, void *arg)
             data, readlen) != 0) {
     if(LOG_ENABLED(INFO)) {
       CLOG(INFO, handler) << "This is HTTP/1.1 connection, "
-                          << "but may be upgraded to HTTP/2.0 later.";
+                          << "but may be upgraded to HTTP/2 later.";
     }
-    // Reset header length for later HTTP/2.0 upgrade
+    // Reset header length for later HTTP/2 upgrade
     handler->set_left_connhd_len(NGHTTP2_CLIENT_CONNECTION_HEADER_LEN);
     handler->set_bev_cb(upstream_readcb, upstream_writecb, upstream_eventcb);
     if(handler->on_read() != 0) {
@@ -208,7 +208,7 @@ void upstream_http1_connhd_readcb(bufferevent *bev, void *arg)
   handler->set_left_connhd_len(leftlen);
   if(leftlen == 0) {
     if(LOG_ENABLED(INFO)) {
-      CLOG(INFO, handler) << "direct HTTP/2.0 connection";
+      CLOG(INFO, handler) << "direct HTTP/2 connection";
     }
     handler->direct_http2_upgrade();
     handler->set_bev_cb(upstream_readcb, upstream_writecb, upstream_eventcb);
@@ -291,7 +291,7 @@ ClientHandler::ClientHandler(bufferevent *bev,
     evbuffer_add_cb(output, tls_raw_writecb, this);
   } else {
     // For non-TLS version, first create HttpsUpstream. It may be
-    // upgraded to HTTP/2.0 through HTTP Upgrade or direct HTTP/2.0
+    // upgraded to HTTP/2 through HTTP Upgrade or direct HTTP/2
     // connection.
     upstream_ = util::make_unique<HttpsUpstream>(this);
     set_bev_cb(upstream_http1_connhd_readcb, nullptr, upstream_eventcb);
diff --git a/src/shrpx_client_handler.h b/src/shrpx_client_handler.h
index e2502b4b..3037b3d5 100644
--- a/src/shrpx_client_handler.h
+++ b/src/shrpx_client_handler.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -71,10 +71,10 @@ public:
   Http2Session* get_http2_session() const;
   size_t get_left_connhd_len() const;
   void set_left_connhd_len(size_t left);
-  // Call this function when HTTP/2.0 connection header is received at
+  // Call this function when HTTP/2 connection header is received at
   // the start of the connection.
   void direct_http2_upgrade();
-  // Performs HTTP/2.0 Upgrade from the connection managed by
+  // Performs HTTP/2 Upgrade from the connection managed by
   // |http|. If this function fails, the connection must be
   // terminated. This function returns 0 if it succeeds, or -1.
   int perform_http2_upgrade(HttpsUpstream *http);
@@ -94,7 +94,7 @@ private:
   // HTTP2. Not deleted by this object.
   Http2Session *http2session_;
   SSL *ssl_;
-  // The number of bytes of HTTP/2.0 client connection header to read
+  // The number of bytes of HTTP/2 client connection header to read
   size_t left_connhd_len_;
   int fd_;
   bool should_close_after_write_;
diff --git a/src/shrpx_config.cc b/src/shrpx_config.cc
index 4ce5affd..98acddf1 100644
--- a/src/shrpx_config.cc
+++ b/src/shrpx_config.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_config.h b/src/shrpx_config.h
index 778f5c3f..c102e96f 100644
--- a/src/shrpx_config.h
+++ b/src/shrpx_config.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_config_test.cc b/src/shrpx_config_test.cc
index 8517d088..3d4def42 100644
--- a/src/shrpx_config_test.cc
+++ b/src/shrpx_config_test.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_config_test.h b/src/shrpx_config_test.h
index caa6ed73..4128cf1b 100644
--- a/src/shrpx_config_test.h
+++ b/src/shrpx_config_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_downstream.cc b/src/shrpx_downstream.cc
index c9e818ce..c7e6c95f 100644
--- a/src/shrpx_downstream.cc
+++ b/src/shrpx_downstream.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_downstream.h b/src/shrpx_downstream.h
index 0200c129..cd4b83fe 100644
--- a/src/shrpx_downstream.h
+++ b/src/shrpx_downstream.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -79,7 +79,7 @@ public:
   // Returns true if the upgrade is succeded as a result of the call
   // check_upgrade_fulfilled().
   bool get_upgraded() const;
-  // Returns true if the request is HTTP Upgrade for HTTP/2.0
+  // Returns true if the request is HTTP Upgrade for HTTP/2
   bool http2_upgrade_request() const;
   // downstream request API
   const Headers& get_request_headers() const;
diff --git a/src/shrpx_downstream_connection.cc b/src/shrpx_downstream_connection.cc
index 0e09a7f6..0d79fae2 100644
--- a/src/shrpx_downstream_connection.cc
+++ b/src/shrpx_downstream_connection.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_downstream_connection.h b/src/shrpx_downstream_connection.h
index c4b2966b..48b17c94 100644
--- a/src/shrpx_downstream_connection.h
+++ b/src/shrpx_downstream_connection.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_downstream_queue.cc b/src/shrpx_downstream_queue.cc
index 66a84de9..1e7ddc6f 100644
--- a/src/shrpx_downstream_queue.cc
+++ b/src/shrpx_downstream_queue.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_downstream_queue.h b/src/shrpx_downstream_queue.h
index dd4b5c27..68b8ecc4 100644
--- a/src/shrpx_downstream_queue.h
+++ b/src/shrpx_downstream_queue.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_downstream_test.cc b/src/shrpx_downstream_test.cc
index 25b56aaa..4c4b361b 100644
--- a/src/shrpx_downstream_test.cc
+++ b/src/shrpx_downstream_test.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_downstream_test.h b/src/shrpx_downstream_test.h
index 81a916b5..19effd91 100644
--- a/src/shrpx_downstream_test.h
+++ b/src/shrpx_downstream_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_error.h b/src/shrpx_error.h
index 76b704b3..a519f67d 100644
--- a/src/shrpx_error.h
+++ b/src/shrpx_error.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http.cc b/src/shrpx_http.cc
index 5788d09c..8fb0eac2 100644
--- a/src/shrpx_http.cc
+++ b/src/shrpx_http.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http.h b/src/shrpx_http.h
index bd519b16..8c67b2be 100644
--- a/src/shrpx_http.h
+++ b/src/shrpx_http.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http2_downstream_connection.cc b/src/shrpx_http2_downstream_connection.cc
index bd7bc438..4ece3821 100644
--- a/src/shrpx_http2_downstream_connection.cc
+++ b/src/shrpx_http2_downstream_connection.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http2_downstream_connection.h b/src/shrpx_http2_downstream_connection.h
index 088ba5ac..e3353d7c 100644
--- a/src/shrpx_http2_downstream_connection.h
+++ b/src/shrpx_http2_downstream_connection.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http2_session.cc b/src/shrpx_http2_session.cc
index 843d7904..bda23d38 100644
--- a/src/shrpx_http2_session.cc
+++ b/src/shrpx_http2_session.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http2_session.h b/src/shrpx_http2_session.h
index f5beeb57..6b1a9876 100644
--- a/src/shrpx_http2_session.h
+++ b/src/shrpx_http2_session.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http2_upstream.cc b/src/shrpx_http2_upstream.cc
index 47e506c0..1b0ae510 100644
--- a/src/shrpx_http2_upstream.cc
+++ b/src/shrpx_http2_upstream.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http2_upstream.h b/src/shrpx_http2_upstream.h
index ca0cb3c1..bd761297 100644
--- a/src/shrpx_http2_upstream.h
+++ b/src/shrpx_http2_upstream.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -73,7 +73,7 @@ public:
   virtual int on_downstream_body_complete(Downstream *downstream);
 
   bool get_flow_control() const;
-  // Perform HTTP/2.0 upgrade from |upstream|. On success, this object
+  // Perform HTTP/2 upgrade from |upstream|. On success, this object
   // takes ownership of the |upstream|. This function returns 0 if it
   // succeeds, or -1.
   int upgrade_upstream(HttpsUpstream *upstream);
diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream_connection.cc
index f1939bb5..3d2d9ebe 100644
--- a/src/shrpx_http_downstream_connection.cc
+++ b/src/shrpx_http_downstream_connection.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_http_downstream_connection.h b/src/shrpx_http_downstream_connection.h
index 66e9b5e4..df525fa0 100644
--- a/src/shrpx_http_downstream_connection.h
+++ b/src/shrpx_http_downstream_connection.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_https_upstream.cc b/src/shrpx_https_upstream.cc
index 15b75950..5caf45cf 100644
--- a/src/shrpx_https_upstream.cc
+++ b/src/shrpx_https_upstream.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_https_upstream.h b/src/shrpx_https_upstream.h
index 1d752d3b..423ffe8d 100644
--- a/src/shrpx_https_upstream.h
+++ b/src/shrpx_https_upstream.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_io_control.cc b/src/shrpx_io_control.cc
index cb558d39..57fafd1d 100644
--- a/src/shrpx_io_control.cc
+++ b/src/shrpx_io_control.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_io_control.h b/src/shrpx_io_control.h
index aa3e638e..f63b42f8 100644
--- a/src/shrpx_io_control.h
+++ b/src/shrpx_io_control.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_listen_handler.cc b/src/shrpx_listen_handler.cc
index c6d8ccbf..e2b70cfa 100644
--- a/src/shrpx_listen_handler.cc
+++ b/src/shrpx_listen_handler.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_listen_handler.h b/src/shrpx_listen_handler.h
index 2dffb358..c58793c0 100644
--- a/src/shrpx_listen_handler.h
+++ b/src/shrpx_listen_handler.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_log.cc b/src/shrpx_log.cc
index 192786de..d2c45de4 100644
--- a/src/shrpx_log.cc
+++ b/src/shrpx_log.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_log.h b/src/shrpx_log.h
index c9a739fd..dd8e1c54 100644
--- a/src/shrpx_log.h
+++ b/src/shrpx_log.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_spdy_upstream.cc b/src/shrpx_spdy_upstream.cc
index a16095de..800f7fe9 100644
--- a/src/shrpx_spdy_upstream.cc
+++ b/src/shrpx_spdy_upstream.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -351,7 +351,7 @@ void on_unknown_ctrl_recv_callback(spdylay_session *session,
 } // namespace
 
 namespace {
-// Infer upstream RST_STREAM status code from downstream HTTP/2.0
+// Infer upstream RST_STREAM status code from downstream HTTP/2
 // error code.
 uint32_t infer_upstream_rst_stream_status_code
 (nghttp2_error_code downstream_error_code)
diff --git a/src/shrpx_spdy_upstream.h b/src/shrpx_spdy_upstream.h
index fb2d9bd5..bae8360d 100644
--- a/src/shrpx_spdy_upstream.h
+++ b/src/shrpx_spdy_upstream.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_ssl.cc b/src/shrpx_ssl.cc
index 3e95ba2d..a12c7f27 100644
--- a/src/shrpx_ssl.cc
+++ b/src/shrpx_ssl.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_ssl.h b/src/shrpx_ssl.h
index de476a05..1153867f 100644
--- a/src/shrpx_ssl.h
+++ b/src/shrpx_ssl.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_ssl_test.cc b/src/shrpx_ssl_test.cc
index 6fe9e32a..e191d919 100644
--- a/src/shrpx_ssl_test.cc
+++ b/src/shrpx_ssl_test.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_ssl_test.h b/src/shrpx_ssl_test.h
index 1c50c70a..b0ac8ca6 100644
--- a/src/shrpx_ssl_test.h
+++ b/src/shrpx_ssl_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_thread_event_receiver.cc b/src/shrpx_thread_event_receiver.cc
index 6fff21d2..b68ba701 100644
--- a/src/shrpx_thread_event_receiver.cc
+++ b/src/shrpx_thread_event_receiver.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_thread_event_receiver.h b/src/shrpx_thread_event_receiver.h
index 71f3d75a..21ae663d 100644
--- a/src/shrpx_thread_event_receiver.h
+++ b/src/shrpx_thread_event_receiver.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_upstream.h b/src/shrpx_upstream.h
index 03a40417..c524a95e 100644
--- a/src/shrpx_upstream.h
+++ b/src/shrpx_upstream.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_worker.cc b/src/shrpx_worker.cc
index 630782eb..e0fca922 100644
--- a/src/shrpx_worker.cc
+++ b/src/shrpx_worker.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/shrpx_worker.h b/src/shrpx_worker.h
index bac6b8aa..f7b2ce50 100644
--- a/src/shrpx_worker.h
+++ b/src/shrpx_worker.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/ssl.cc b/src/ssl.cc
index 5dcc179c..807378df 100644
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/src/ssl.h b/src/ssl.h
index fb3ae5aa..426c6ece 100644
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/timegm.c b/src/timegm.c
index 43d7e856..ac848d23 100644
--- a/src/timegm.c
+++ b/src/timegm.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/timegm.h b/src/timegm.h
index 2512f0dd..14fbc714 100644
--- a/src/timegm.h
+++ b/src/timegm.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/util.cc b/src/util.cc
index 8bab7321..328872b9 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/util.h b/src/util.h
index 0b40d82f..d4d0ff3c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/src/util_test.cc b/src/util_test.cc
index 6208f7ea..e3b28e73 100644
--- a/src/util_test.cc
+++ b/src/util_test.cc
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/src/util_test.h b/src/util_test.h
index f6638049..918c1ab2 100644
--- a/src/util_test.h
+++ b/src/util_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ad7be67b..77c02a1e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/tests/failmalloc.c b/tests/failmalloc.c
index 80f03574..6cbe2a3d 100644
--- a/tests/failmalloc.c
+++ b/tests/failmalloc.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/failmalloc_test.c b/tests/failmalloc_test.c
index 415b53f5..cdf97ed7 100644
--- a/tests/failmalloc_test.c
+++ b/tests/failmalloc_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/failmalloc_test.h b/tests/failmalloc_test.h
index 52b2ace2..6b377e7c 100644
--- a/tests/failmalloc_test.h
+++ b/tests/failmalloc_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/main.c b/tests/main.c
index 91468adb..c53b4ede 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/malloc_wrapper.c b/tests/malloc_wrapper.c
index 1fa670f6..e5811066 100644
--- a/tests/malloc_wrapper.c
+++ b/tests/malloc_wrapper.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/malloc_wrapper.h b/tests/malloc_wrapper.h
index a45eafdc..95f4efdf 100644
--- a/tests/malloc_wrapper.h
+++ b/tests/malloc_wrapper.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_buf_test.c b/tests/nghttp2_buf_test.c
index 3fb292d0..a39e027f 100644
--- a/tests/nghttp2_buf_test.c
+++ b/tests/nghttp2_buf_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_buf_test.h b/tests/nghttp2_buf_test.h
index 79326580..9b7d5687 100644
--- a/tests/nghttp2_buf_test.h
+++ b/tests/nghttp2_buf_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2014 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_frame_test.c b/tests/nghttp2_frame_test.c
index 57be1d8b..2dbc2a4b 100644
--- a/tests/nghttp2_frame_test.c
+++ b/tests/nghttp2_frame_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_frame_test.h b/tests/nghttp2_frame_test.h
index 9a04c23d..a0ce37b8 100644
--- a/tests/nghttp2_frame_test.h
+++ b/tests/nghttp2_frame_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_gzip_test.c b/tests/nghttp2_gzip_test.c
index 2573febb..0592d1e1 100644
--- a/tests/nghttp2_gzip_test.c
+++ b/tests/nghttp2_gzip_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_gzip_test.h b/tests/nghttp2_gzip_test.h
index 404e3c37..e8e38c7f 100644
--- a/tests/nghttp2_gzip_test.h
+++ b/tests/nghttp2_gzip_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_hd_test.c b/tests/nghttp2_hd_test.c
index 6ec4d85a..03a5e66e 100644
--- a/tests/nghttp2_hd_test.c
+++ b/tests/nghttp2_hd_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_hd_test.h b/tests/nghttp2_hd_test.h
index 1e9b763f..239439ef 100644
--- a/tests/nghttp2_hd_test.h
+++ b/tests/nghttp2_hd_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_helper_test.c b/tests/nghttp2_helper_test.c
index ebe5c135..00b15ac0 100644
--- a/tests/nghttp2_helper_test.c
+++ b/tests/nghttp2_helper_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_helper_test.h b/tests/nghttp2_helper_test.h
index 8cc6f511..173fde60 100644
--- a/tests/nghttp2_helper_test.h
+++ b/tests/nghttp2_helper_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_map_test.c b/tests/nghttp2_map_test.c
index 094d422b..4103640e 100644
--- a/tests/nghttp2_map_test.c
+++ b/tests/nghttp2_map_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_map_test.h b/tests/nghttp2_map_test.h
index 8ac3fa35..f0b723bc 100644
--- a/tests/nghttp2_map_test.h
+++ b/tests/nghttp2_map_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_npn_test.c b/tests/nghttp2_npn_test.c
index d49865fe..7f921516 100644
--- a/tests/nghttp2_npn_test.c
+++ b/tests/nghttp2_npn_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Twist Inc.
  *
diff --git a/tests/nghttp2_npn_test.h b/tests/nghttp2_npn_test.h
index de9a3960..e806f3a9 100644
--- a/tests/nghttp2_npn_test.h
+++ b/tests/nghttp2_npn_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Twist Inc.
  *
diff --git a/tests/nghttp2_pq_test.c b/tests/nghttp2_pq_test.c
index 2d7d6a6f..0f9d89ba 100644
--- a/tests/nghttp2_pq_test.c
+++ b/tests/nghttp2_pq_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_pq_test.h b/tests/nghttp2_pq_test.h
index 1f78cb7e..7818194d 100644
--- a/tests/nghttp2_pq_test.h
+++ b/tests/nghttp2_pq_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_queue_test.c b/tests/nghttp2_queue_test.c
index 4b2ad799..f8f2749f 100644
--- a/tests/nghttp2_queue_test.c
+++ b/tests/nghttp2_queue_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_queue_test.h b/tests/nghttp2_queue_test.h
index 88ec2a69..944697e3 100644
--- a/tests/nghttp2_queue_test.h
+++ b/tests/nghttp2_queue_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_session_test.c b/tests/nghttp2_session_test.c
index 115db74f..290ecc50 100644
--- a/tests/nghttp2_session_test.c
+++ b/tests/nghttp2_session_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_session_test.h b/tests/nghttp2_session_test.h
index 40d8cd85..796af957 100644
--- a/tests/nghttp2_session_test.h
+++ b/tests/nghttp2_session_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_stream_test.c b/tests/nghttp2_stream_test.c
index 0b3f6dd4..9b572d06 100644
--- a/tests/nghttp2_stream_test.c
+++ b/tests/nghttp2_stream_test.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_stream_test.h b/tests/nghttp2_stream_test.h
index 36f6973c..508a8e1c 100644
--- a/tests/nghttp2_stream_test.h
+++ b/tests/nghttp2_stream_test.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_test_helper.c b/tests/nghttp2_test_helper.c
index 979156c3..653b876d 100644
--- a/tests/nghttp2_test_helper.c
+++ b/tests/nghttp2_test_helper.c
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/nghttp2_test_helper.h b/tests/nghttp2_test_helper.h
index 11b96f3f..204b0d9d 100644
--- a/tests/nghttp2_test_helper.h
+++ b/tests/nghttp2_test_helper.h
@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
diff --git a/tests/testdata/Makefile.am b/tests/testdata/Makefile.am
index 0176f40c..ee381133 100644
--- a/tests/testdata/Makefile.am
+++ b/tests/testdata/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index fc42a6ee..7549cd6d 100644
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2014 Tatsuhiro Tsujikawa