diff --git a/default.xsl b/default.xsl
index d6ea880..a4ab714 100644
--- a/default.xsl
+++ b/default.xsl
@@ -2,7 +2,7 @@
 <!-- SPDX-License-Identifier: CC0-1.0 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:f="http://www.forester-notes.org">
 
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-public="" doctype-system="" />
+  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-public="" doctype-system="" omit-xml-declaration="yes"/>
   <xsl:strip-space elements="f:author f:contributor"/>
   <xsl:include href="core.xsl" />
   <xsl:include href="metadata.xsl" />
diff --git a/links.xsl b/links.xsl
index a286231..ebb497f 100644
--- a/links.xsl
+++ b/links.xsl
@@ -12,12 +12,12 @@
   <xsl:template match="f:link//node()[not(f:link)]" mode="link-flattening">
     <a href="{ancestor::f:link[1]/@href}">
       <xsl:choose>
-        <xsl:when test="ancestor::f:link[1]/@addr">
+        <xsl:when test="ancestor::f:link[1]/@uri">
           <xsl:attribute name="title">
             <xsl:value-of select="ancestor::f:link[1]/@title" />
             <xsl:text> [</xsl:text>
             <xsl:value-of
-              select="ancestor::f:link[1]/@addr" />
+              select="ancestor::f:link[1]/@uri" />
             <xsl:text>]</xsl:text>
           </xsl:attribute>
         </xsl:when>
diff --git a/tree.xsl b/tree.xsl
index aa4205a..3ea9cf4 100644
--- a/tree.xsl
+++ b/tree.xsl
@@ -4,7 +4,7 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:f="http://www.forester-notes.org">
 
-  <xsl:key name="tree-with-addr" match="/f:tree/f:mainmatter//f:tree" use="f:frontmatter/f:addr/text()" />
+  <xsl:key name="tree-with-uri" match="/f:tree/f:mainmatter//f:tree" use="f:frontmatter/f:uri/text()" />
 
   <xsl:template match="/">
     <html xmlns="http://www.w3.org/1999/xhtml" data-base-url="{/f:tree/@base-url}">
@@ -30,7 +30,7 @@
           <header class="header">
             <nav class="nav">
               <div class="logo">
-                <a href="{/f:tree/@base-url}index.xml" title="Home">
+                <a href="{/f:tree/@base-url}index.html" title="Home">
                   <xsl:text>« Home</xsl:text>
                 </a>
               </div>
@@ -135,14 +135,14 @@
       <xsl:for-each select="f:frontmatter">
         <a class="bullet">
           <xsl:choose>
-            <xsl:when test="f:addr and f:route">
+            <xsl:when test="f:display-uri and f:route">
               <xsl:attribute name="href">
                 <xsl:value-of select="f:route" />
               </xsl:attribute>
               <xsl:attribute name="title">
                 <xsl:value-of select="f:title/@text" />
                 <xsl:text>&#160;[</xsl:text>
-                <xsl:value-of select="f:addr" />
+                <xsl:value-of select="f:display-uri" />
                 <xsl:text>]</xsl:text>
               </xsl:attribute>
             </xsl:when>
@@ -186,7 +186,7 @@
      <xsl:apply-templates />
   </xsl:template>
 
-  <xsl:template match="f:addr[../f:route]">
+  <xsl:template match="f:display-uri[../f:route]">
     <a class="slug" href="{../f:route}">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="." />
@@ -194,7 +194,7 @@
     </a>
   </xsl:template>
 
-  <xsl:template match="f:addr[not(../f:route)]">
+  <xsl:template match="f:display-uri[not(../f:route)]">
   </xsl:template>
 
   <xsl:template match="f:resource">
@@ -226,7 +226,7 @@
 
         <xsl:apply-templates select="f:title" />
         <xsl:text>&#032;</xsl:text>
-        <xsl:apply-templates select="f:addr" />
+        <xsl:apply-templates select="f:display-uri" />
         <xsl:text>&#032;</xsl:text>
         <xsl:apply-templates select="f:source-path" />
       </h1>
@@ -253,7 +253,7 @@
   <xsl:template match="f:ref">
     <xsl:variable name="fallback-number">
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="@addr" />
+      <xsl:value-of select="@uri" />
       <xsl:text>]</xsl:text>
     </xsl:variable>
 
@@ -271,9 +271,9 @@
     <a class="link local">
       <xsl:attribute name="href">
         <xsl:choose>
-          <xsl:when test="key('tree-with-addr',current()/@addr)">
+          <xsl:when test="key('tree-with-uri',current()/@uri)">
             <xsl:text>#</xsl:text>
-            <xsl:value-of select="generate-id(key('tree-with-addr',current()/@addr))" />
+            <xsl:value-of select="generate-id(key('tree-with-uri',current()/@uri))" />
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="@href" />
@@ -282,8 +282,8 @@
       </xsl:attribute>
 
       <xsl:choose>
-        <xsl:when test="key('tree-with-addr', current()/@addr)">
-          <xsl:apply-templates select="key('tree-with-addr', current()/@addr)" mode="tree-taxon-with-number">
+        <xsl:when test="key('tree-with-uri', current()/@uri)">
+          <xsl:apply-templates select="key('tree-with-uri', current()/@uri)" mode="tree-taxon-with-number">
             <xsl:with-param name="in-backmatter" select="boolean(ancestor::f:backmatter)" />
             <xsl:with-param name="number" select="@number" />
             <xsl:with-param name="fallback-number" select="$fallback-number" />
@@ -306,16 +306,16 @@
     </a>
   </xsl:template>
 
-  <xsl:template match="f:contextual-number[@addr]">
+  <xsl:template match="f:contextual-number[@uri]">
     <xsl:variable name="fallback-number">
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="@addr" />
+      <xsl:value-of select="@uri" />
       <xsl:text>]</xsl:text>
     </xsl:variable>
 
     <xsl:choose>
-      <xsl:when test="key('tree-with-addr', current()/@addr)">
-        <xsl:apply-templates select="key('tree-with-addr', current()/@addr)" mode="contextual-number">
+      <xsl:when test="key('tree-with-uri', current()/@uri)">
+        <xsl:apply-templates select="key('tree-with-uri', current()/@uri)" mode="contextual-number">
           <xsl:with-param name="in-backmatter" select="boolean(ancestor::f:backmatter)" />
           <xsl:with-param name="fallback-number" select="$fallback-number" />
         </xsl:apply-templates>
