diff --git a/vibed/web-server.md b/vibed/web-server.md
index 7339b60..dd3132b 100644
--- a/vibed/web-server.md
+++ b/vibed/web-server.md
@@ -86,7 +86,7 @@ class WebService
         // ヘッダ情報<li>タグをリクエストの
         // ヘッダのプロパティを調べて生成します
         string[] headers;
-        foreach(key, value; req.headers) {
+        foreach(key, value; req.headers.byKeyValue()) {
             headers ~=
                 "<li>%s: %s</li>"
                 .format(key, value);
@@ -100,7 +100,7 @@ class WebService
         %s
         </ul>
         </body>
-        </html>}.format(username_,
+        </html>}.format(username.value,
                 headers.join("\n"));
 
         res.writeBody(contents,
@@ -116,7 +116,7 @@ class WebService
         </head><body>
         <h1>Your name: %s</h1>
         </body>
-        </html>}.format(username_);
+        </html>}.format(username);
 
         res.writeBody(contents,
                 "text/html; charset=UTF-8");
