diff --git a/src/documentation/content/xdocs/todo.xml b/src/documentation/content/xdocs/todo.xml
index 12e6b1c3a..f86266c92 100644
--- a/src/documentation/content/xdocs/todo.xml
+++ b/src/documentation/content/xdocs/todo.xml
@@ -6,7 +6,7 @@
 
     <devs>
         <!-- in strict alphabetical order -->
-        <person id="AO"  name="Andrew C. Oliver"   email="acoliver2@users.sourceforge.net"/>
+        <person id="AO"  name="Andrew C. Oliver"   email="acoliver@apache.org"/>
         <person id="GS"  name="Glen Stampoultzis"  email="poi-user@jakarta.apache.org"/>
         <person id="MJ"  name="Marc Johnson"       email="mjohnson at apache dot org"/>
         <person id="NKB" name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
diff --git a/src/documentation/content/xdocs/who.xml b/src/documentation/content/xdocs/who.xml
index 57d19892e..ef2f1ff9d 100644
--- a/src/documentation/content/xdocs/who.xml
+++ b/src/documentation/content/xdocs/who.xml
@@ -3,16 +3,15 @@
 
 <document>
  <header>
-  <title>Who we are</title>
+  <title>Jakarta Poi - Who we are</title>
   <authors>
-   <person name="Davanum Srinivas" email="dims@yahoo.com"/>
-   <person name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
+   <person name="Jakarta Poi Documentation Team" email="poi-dev@jakarta.apache.org"/>
    </authors>
  </header>
 
  <body>
 
- <section><title>Who we are</title>
+ <section><title>Jakarta Poi - Who we are</title>
   <p>
     The Poi Project operates on a meritocracy: the more you do, the more
     responsibility you will obtain. This page lists all of the people who have
