diff --git a/editor.shtml b/editor.shtml
index 69b60df1..9e85c7bc 100755
--- a/editor.shtml
+++ b/editor.shtml
@@ -1,9 +1,9 @@
 <html>
 <head>
-<title>XEP Editor</title>
+<title>XMPP Extensions Editor</title>
 <!--#include virtual="/includes/head.txt" -->
-<h2>XEP Editor</h2>
-<p>In accordance with <a href="jep-0001.html">XEP-0001</a>, the XEP Editor is responsible for overall management of the Jabber Software Foundation's standards process and publication of <a href="/extensions/">XMPP Extension Protocols</a>; in particular, the XEP Editor:</p>
+<h2>XMPP Extensions Editor</h2>
+<p>In accordance with <a href="jep-0001.html">XEP-0001</a>, the XMPP Extensions Editor is responsible for overall management of the Jabber Software Foundation's standards process and publication of <a href="/extensions/">XMPP Extension Protocols</a>; in particular, the XMPP Extensions Editor:</p>
 <ul>
 <li>works with XEP authors</li>
 <li>ensures that each XEP is properly formatted</li>
@@ -16,6 +16,6 @@
 <li>gathers and tallies the votes of the <a href="/council/">XMPP Council</a></li>
 <li>fulfills the responsibilities of the <a href="/registrar/">XMPP Registrar</a></li>
 </ul>
-<p>Since the founding of the Jabber Software Foundation in 2001, the XEP Editor has been  <a href="http://www.jabber.org/people/stpeter.shtml">Peter Saint-Andre</a>, who may be contacted via &lt;&#101;&#100;&#105;&#116;&#111;&#114;&#64;&#106;&#97;&#98;&#98;&#101;&#114;&#46;&#111;&#114;&#103&gt;.</p>
+<p>Since the founding of the <a href='http://www.jabber.org/jsf/'>Jabber Software Foundation</a> in 2001, the XMPP Extensions Editor has been  <a href="http://www.jabber.org/people/stpeter.shtml">Peter Saint-Andre</a>, who may be contacted via &lt;&#101;&#100;&#105;&#116;&#111;&#114;&#64;&#106;&#97;&#98;&#98;&#101;&#114;&#46;&#111;&#114;&#103&gt;.</p>
 </div>
 <!--#include virtual="/includes/foot.txt" -->
