diff --git a/draft-ietf-httpbis-http2.xml b/draft-ietf-httpbis-http2.xml
index dfaa384d..350034c0 100644
--- a/draft-ietf-httpbis-http2.xml
+++ b/draft-ietf-httpbis-http2.xml
@@ -1430,7 +1430,7 @@ HTTP2-Settings    = token68
         </section>
       </section>
 
-      <section title="Error Handling">
+      <section anchor="ErrorHandler" title="Error Handling">
         <t>
           HTTP/2 framing permits two classes of error:
           <list style="symbols">
@@ -3665,7 +3665,7 @@ HTTP2-Settings    = token68
             underlying cipher suite can encipher.
           </t>
           <t>
-            A client MAY use renegotiation to provide confidentiality protection for client
+            An endpoint MAY use renegotiation to provide confidentiality protection for client
             credentials offered in the handshake, but any renegotiation MUST occur prior to sending
             the connection preface.  A server SHOULD request a client certificate if it sees a
             renegotiation request immediately after establishing a connection.
@@ -3673,8 +3673,8 @@ HTTP2-Settings    = token68
           <t>
             This effectively prevents the use of renegotiation in response to a request for a
             specific protected resource.  A future specification might provide a way to support this
-            use case. Alternatively, a server might use a <xref target="ConnectionErrorHandler">
-            connection error</xref> of type <x:ref>HTTP_1_1_REQUIRED</x:ref> to request the client
+            use case. Alternatively, a server might use an <xref target="ErrorHandler">
+            error</xref> of type <x:ref>HTTP_1_1_REQUIRED</x:ref> to request the client
             use a protocol which supports renegotiation.
           </t>
         </section>