diff --git a/templates/index.html b/templates/index.html
index bb3af5e..e02303a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -22,46 +22,46 @@
         <tfoot></tfoot>
         <tbody>
           <tr>
-            <td>IP Address</td><td>{{ ip_address }}</td>
+            <td>IP Address</td><td>{{ .ip }}</td>
           </tr>
           <tr>
-            <td>Remote Host</td><td>{{ remote_host }}</td>
+            <td>Remote Host</td><td>{{ .host }}</td>
           </tr>
           <tr>
-            <td>User Agent</td><td>{{ user_agent }}</td>
+            <td>User Agent</td><td>{{ .ua }}</td>
           </tr>
           <tr>
-            <td>Port</td><td>{{ port }}</td>
+            <td>Port</td><td>{{ .port }}</td>
           </tr>
           <tr>
-            <td>Language</td><td>{{ language }}</td>
+            <td>Language</td><td>{{ .lang }}</td>
           </tr>
           <tr>
-            <td>Referer</td><td>{{ referer }}</td>
+            <td>Referer</td><td>{{ .referer }}</td>
           </tr>
           <tr>
-            <td>Connection</td><td>{{ connection }}</td>
+            <td>Connection</td><td>{{ .connection }}</td>
           </tr>
           <tr>
-            <td>KeepAlive</td><td>{{ keep_alive }}</td>
+            <td>KeepAlive</td><td>{{ .keep_alive }}</td>
           </tr>
           <tr>
-            <td>Method</td><td>{{ method }}</td>
+            <td>Method</td><td>{{ .method }}</td>
           </tr>
           <tr>
-            <td>Encoding</td><td>{{ encoding }}</td>
+            <td>Encoding</td><td>{{ .encoding }}</td>
           </tr>
           <tr>
-            <td>MIME Type</td><td>{{ mime_type }}</td>
+            <td>MIME Type</td><td>{{ .mime_type }}</td>
           </tr>
           <tr>
-            <td>Charset</td><td>{{ charset }}</td>
+            <td>Charset</td><td>{{ .charset }}</td>
           </tr>
           <tr>
-            <td>Via</td><td>{{ via }}</td>
+            <td>Via</td><td>{{ .via }}</td>
           </tr>
           <tr>
-            <td>X-Forwarded-For</td><td>{{ x_forwarded_for }}</td>
+            <td>X-Forwarded-For</td><td>{{ .x_forwarded_for }}</td>
           </tr>
         </tbody>
       </table>
@@ -74,52 +74,52 @@
         <tfoot></tfoot>
         <tbody>
           <tr>
-            <td>$ curl ifconfig.io</td><td>{{ ipaddr }}</td>
+            <td>$ curl ifconfig.io</td><td>{{ .ip }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/ip</td><td>{{ ipaddr }}</td>
+            <td>$ curl ifconfig.io/ip</td><td>{{ .ip }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/host</td><td>{{ hostname }}</td>
+            <td>$ curl ifconfig.io/host</td><td>{{ .host }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/ua</td><td>{{ useragent }}</td>
+            <td>$ curl ifconfig.io/ua</td><td>{{ .ua }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/port</td><td>{{ port }}</td>
+            <td>$ curl ifconfig.io/port</td><td>{{ .port }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/lang</td><td>{{ language }}</td>
+            <td>$ curl ifconfig.io/lang</td><td>{{ .lang }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/keepalive</td><td>{{ keepalive }}</td>
+            <td>$ curl ifconfig.io/keepalive</td><td>{{ .keep_alive }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/connection</td><td>{{ keep_alive }}</td>
+            <td>$ curl ifconfig.io/connection</td><td>{{ .connection }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/encoding</td><td>{{ encoding }}</td>
+            <td>$ curl ifconfig.io/encoding</td><td>{{ .encoding }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/mime</td><td>{{ mime_type }}</td>
+            <td>$ curl ifconfig.io/mime</td><td>{{ .mime_type }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/charset</td><td>{{ charset }}</td>
+            <td>$ curl ifconfig.io/charset</td><td>{{ .charset }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/via</td><td>{{ via }}</td>
+            <td>$ curl ifconfig.io/via</td><td>{{ .via }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/forwarded</td><td>{{ x_forwarded_for }}</td>
+            <td>$ curl ifconfig.io/forwarded</td><td>{{ .x_forwarded_for }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/all</td><td>{{ hash as yaml }}</td>
+            <td>$ curl ifconfig.io/all</td><td>{{ .hash_as_yaml }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/all.xml</td><td>{{ hash as xml }}</td>
+            <td>$ curl ifconfig.io/all.xml</td><td>{{ .hash_as_xml }}</td>
           </tr>
           <tr>
-            <td>$ curl ifconfig.io/all.json</td><td>{{ hash as json }}</td>
+            <td>$ curl ifconfig.io/all.json</td><td>{{ .hash_as_json }}</td>
           </tr>
         </tbody>
       </table>