diff --git a/athena/project-info/plan.xml b/athena/project-info/plan.xml
index 5ed1c0d..f7f914c 100644
--- a/athena/project-info/plan.xml
+++ b/athena/project-info/plan.xml
@@ -20,7 +20,6 @@
     <milestone date="2008-11-24" milestone="M1"><html:p>November milestone</html:p></milestone>
     <milestone date="2009-02-16" milestone="M2"><html:p>February milestone</html:p></milestone>
     <milestone date="2009-05-25" milestone="M3"><html:p>May milestone</html:p></milestone>
-    <milestone date="2009-08-31" milestone="M4"><html:p>August milestone</html:p></milestone>
     <postamble/>
   </release_milestones>
   <target_environments><html:p>The Common Builder runs on the build.eclipse.org server and requires Java 5.0 and Ant 1.7.</html:p>
@@ -49,16 +48,16 @@
 both the user interface and the infrastructure to avoid that.</html:p> 
 		<html:p>
 		<html:ul>
-			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash&amp;component=Common+Builder&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">Open Bugs</html:a></html:li>
-			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash&amp;component=Common+Builder&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;target_milestone=Past&amp;target_milestone=M1&amp;target_milestone=M2&amp;target_milestone=M3&amp;target_milestone=M4&amp;target_milestone=M5&amp;target_milestone=M6&amp;target_milestone=M7&amp;target_milestone=RC">Committed Bugs</html:a></html:li>
-			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash&amp;component=Common+Builder&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;target_milestone=---&amp;target_milestone=Future">Proposed Bugs</html:a></html:li>
-			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash&amp;component=Common+Builder&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED">Closed Bugs</html:a></html:li>
-			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash&amp;component=Common+Builder&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;chfieldfrom=1w&amp;chfieldto=Now">Changed This Week</html:a></html:li>
+			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash+Athena&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">Open Bugs</html:a></html:li>
+			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash+Athena&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;target_milestone=Past&amp;target_milestone=M1&amp;target_milestone=M2&amp;target_milestone=M3&amp;target_milestone=M4&amp;target_milestone=M5&amp;target_milestone=M6&amp;target_milestone=M7&amp;target_milestone=RC">Committed Bugs</html:a></html:li>
+			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash+Athena&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;target_milestone=---&amp;target_milestone=Future">Proposed Bugs</html:a></html:li>
+			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash+Athena&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED">Closed Bugs</html:a></html:li>
+			<html:li><html:a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash+Athena&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;chfieldfrom=1w&amp;chfieldto=Now">Changed This Week</html:a></html:li>
 		</html:ul>
 		</html:p>
       </description>
-      <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash&amp;component=Common+Builder&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;target_milestone=Past&amp;target_milestone=M1&amp;target_milestone=M2&amp;target_milestone=M3&amp;target_milestone=M4&amp;target_milestone=M5&amp;target_milestone=M6&amp;target_milestone=M7&amp;target_milestone=RC"></committed>
-      <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash&amp;component=Common+Builder&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;target_milestone=---&amp;target_milestone=Future"></proposed>
+      <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash+Athena&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;target_milestone=Past&amp;target_milestone=M1&amp;target_milestone=M2&amp;target_milestone=M3&amp;target_milestone=M4&amp;target_milestone=M5&amp;target_milestone=M6&amp;target_milestone=M7&amp;target_milestone=RC"></committed>
+      <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;product=Dash+Athena&amp;order=bugs.target_milestone%2Cbugs.resolution&amp;target_milestone=---&amp;target_milestone=Future"></proposed>
     </theme>
   </themes_and_priorities>
   <appendix/>