diff --git a/project-info/plan.xml b/project-info/plan.xml
index 54bf17d..fd69c18 100644
--- a/project-info/plan.xml
+++ b/project-info/plan.xml
@@ -2,19 +2,15 @@
 <?xml-stylesheet type="text/xsl" href="http://www.eclipse.org/projects/project-plan.xsl"?>
 <plan plan-format="1.0" xmlns="http://www.eclipse.org/project/plan" xmlns:html="http://www.w3.org/1999/xhtml"
       name="MDT-UML2">
-   <release projectid="modeling.mdt" version="3.0.0"/>
+   <release projectid="modeling.mdt" version="3.1.0"/>
    <introduction>
      <html:div>
 <html:p>
 This document lays out the feature and API set for the
 next release of the Eclipse UML2 API (MDT UML2)
-Project, version 3.0.0. This project plan inherits from the Modeling
+Project, version 3.1.0. This project plan inherits from the Modeling
 Project Plan, which should be referenced when consulting this
 individual project plan.
-</html:p><html:p>
-<html:i><html:b>Note</html:b> that, the next version of the UML2 API will be based on the latest version of the  UML&#174; 2.2
- specification from the OMG<html:sup>TM</html:sup>.  The changes to the specification involve API breaking changes to the UML2 API
-thereby requiring the major version to be increased to <html:b>3.0.0</html:b></html:i>
 </html:p>
      </html:div>
    </introduction>
@@ -22,7 +18,7 @@
      <html:div>
 The release deliverables have the same form as is found in most Eclipse projects, namely:
 <html:ul>
-<html:li>MDT UML2 source code release, available as versions tagged "R3_0" in the project's CVS repository.</html:li>
+<html:li>MDT UML2 source code release, available as versions tagged "R3_1" in the project's CVS repository.</html:li>
 <html:li>MDT UML2 SDK (includes runtime, sources, examples, and documentation) (downloadable and update site).</html:li>
 <html:li>MDT UML2 runtime binary distribution (downloadable and update site).</html:li>
 <html:li>MDT UML2 stand-alone binary distribution (downloadable).</html:li>
@@ -35,35 +31,39 @@
          <html:div>
 Release milestone occurring at roughly 6 week intervals and follow the
 Platform milestone releases by approximately 1 week; that is, until the
-final 3.5 release of the Platform, upon which MDT UML2 and other projects
+final 3.6 release of the Platform, upon which MDT UML2 and other projects
 will release simultaneously. As MDT UML2 is a dependency of numerous
 other projects, MDT UML2 will deliver its milestones within one week of
 the Eclipse Platform. It is anticipated that MDT UML2 will synchronize its
-milestones with the Galileo milestone schedule.
+milestones with the Helios milestone schedule.
          </html:div>
       </preamble>
-<milestone date="08/13/2008" milestone="M1"></milestone>
-<milestone date="09/24/2008" milestone="M2"></milestone>
-<milestone date="11/05/2008" milestone="M3"></milestone>
-<milestone date="12/17/2008" milestone="M4"></milestone>
-<milestone date="02/03/2009" milestone="M5"></milestone>
-<milestone date="03/16/2009" milestone="M6"><html:div>API freeze</html:div></milestone>
-<milestone date="05/04/2009" milestone="M7"><html:div>Feature Freeze</html:div></milestone>
-<milestone date="05/18/2009" milestone="RC1"></milestone>
-<milestone date="05/25/2009" milestone="RC2"></milestone>
-<milestone date="06/01/2009" milestone="RC3"></milestone>
-<milestone date="06/08/2009" milestone="RC4"></milestone>
-<milestone date="06/15/2009" milestone="RC5"></milestone>
-<milestone date="06/28/2009" milestone="3.0.0"></milestone>
+	<milestone date="08/19/2009" milestone="M1" />
+    <milestone date="09/30/2009" milestone="M2" />
+    <milestone date="11/11/2009" milestone="M3" />
+    <milestone date="12/16/2009" milestone="M4" />
+    <milestone date="02/03/2010" milestone="M5" />
+    <milestone date="03/17/2010" milestone="M6">
+      <html:div>API Freeze</html:div>
+    </milestone>
+    <milestone date="05/05/2010" milestone="M7">
+      <html:div>Feature Freeze</html:div>
+    </milestone>
+    <milestone date="05/19/2010" milestone="RC1" />
+    <milestone date="05/26/2010" milestone="RC2" />
+    <milestone date="06/02/2010" milestone="RC3" />
+    <milestone date="06/09/2010" milestone="RC4" />
+    <milestone date="06/16/2010" milestone="Final" />
+    <milestone date="06/23/2010" milestone="Helios" />
       <postamble><html:div>
-MDT UML2 will produce maintenance releases to align with the Ganymede SR
-releases, that includes the Eclipse Platform 3.4.1 and 3.4.2 releases.
+MDT UML2 will produce maintenance releases to align with the Galileo SR
+releases, that includes the Eclipse Platform 3.5.1 and 3.5.2 releases.
 MDT UML2 may produce interim maintenance releases in addition to these in
 order to satisfy clients requests.
 <html:ul>
-  <html:li>Friday, September 26, 2008 - MDT UML2 2.2.1 maintenance release (Ganymede Service Release 1)</html:li>
-  <html:li>Friday, February 27, 2009 - MDT UML2 2.2.2 maintenance release (Ganymede Service Release 2)</html:li>
-  <html:li>A list of issues indicated for the 2.2.x maintenance stream can be found in
+  <html:li>Friday, September 30, 2009 - MDT UML2 3.0.1 maintenance release (Galileo Service Release 1)</html:li>
+  <html:li>Friday, February 26, 2010 - MDT UML2 3.0.2 maintenance release (Galileo Service Release 2)</html:li>
+  <html:li>A list of issues indicated for the 3.0.x maintenance stream can be found in
       bugzilla, or by using links on maintenance stream build pages.</html:li>
 </html:ul> 
       </html:div></postamble>
@@ -73,12 +73,12 @@
         In order to remain current, each Eclipse release targets reasonably
         current versions of the underlying operating environments. The Eclipse
         Unified Modeling Language (MDT UML2) project depends upon on the
-        Platform and other projects, which are mostly "pure" Java. The 3.5
+        Platform and other projects, which are mostly "pure" Java. The 3.6
         release of the Eclipse Platform Project is written and compiled
         against version 1.4 of the Java Platform APIs, and targeted to run on
         version 1.4 of the Java Runtime Environment, Standard Edition. MDT UML2
         will target the same Java version as EMF, which currently requires
-        Java 5. Eclipse Platform SDK 3.5 will be tested and validated on a
+        Java 5. Eclipse Platform SDK 3.6 will be tested and validated on a
         number of reference platforms. MDT UML2 will be tested and validated
         against a subset of those listed for the platform.
      </html:div>
@@ -105,8 +105,8 @@
 corresponding milestones for each of these projects, and delivered the
 appropriate offset.
 <html:ul>
-    <html:li>Eclipse Platform SDK version 3.5</html:li>
-    <html:li>Eclipse Modeling Framework (EMF) version 2.5</html:li>
+    <html:li>Eclipse Platform SDK version 3.6</html:li>
+    <html:li>Eclipse Modeling Framework (EMF) version 2.6</html:li>
  </html:ul>
 Therefore, the MDT UML2 initial release will be
 compatible with these versions and will publish binary and source
@@ -125,46 +125,18 @@
 more detailed information on each.
          </html:div>
      </preamble>
-        <theme name="Eclipse 3.5 / EMF 2.5 Compatibility">
+        <theme name="Release Currency">
             <description>
                 <html:div>
 The MDT UML2 project will maintain currency with its
 dependencies, in particular advances in the EMF project.
                 </html:div>
             </description>
-            <committed
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&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&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo%2B">
-            </committed>
-            <proposed
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;target_milestone=3.0.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo%2B">
-            </proposed>
-            <deferred
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-">
-            </deferred>
-        </theme>
-        
-        
-        <theme name="UML 2.2 Compliance">
-            <description>
-                <html:div>
-As an implementation of the OMG's UML 2.2 specification,
-the MDT UML2 project will maintain currency with the revised 2.2
-specification.
-                </html:div>
-            </description>
-
-           <committed
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Compliance&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&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&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo%2B">
-            </committed>
-            <proposed
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Compliance&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;target_milestone=3.0.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo%2B">
-            </proposed>
-            <deferred
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Compliance&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-">
-            </deferred>
-           
-        </theme>     
-   
+            <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&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&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
+      		<proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;target_milestone=Helios&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
+      		<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Release+Currency&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=helios-" />
+         </theme>
+                   
         <theme name="Community Support">
             <description>
                 <html:div>
@@ -172,19 +144,24 @@
                 </html:div>
             </description>
                     
-	    <committed
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Community+Support&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&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&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo%2B">
-            </committed>
-            <proposed
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Community+Support&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;target_milestone=3.0.0&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo%2B">
-            </proposed>
-            <deferred
-                bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Community+Support&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=galileo-">
-            </deferred>
-           
-        </theme>     
+	     	<committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Community+Support&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&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&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
+      		<proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Community+Support&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;target_milestone=Helios&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
+      		<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Community+Support&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=helios-" />
+          </theme>     
   
-
+ 
+        <theme name="Compliance">
+            <description>
+                <html:div>
+The UML2 component is committed to remaining compliant with existing specifications including XMI.
+                </html:div>
+            </description>
+                    
+	  		<committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Compliance&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&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&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
+      		<proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Compliance&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;target_milestone=Helios&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=substring&amp;value0-0-0=helios&amp;field0-1-0=flagtypes.name&amp;type0-1-0=notsubstring&amp;value0-1-0=helios-" />
+      		<deferred bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;status_whiteboard_type=substring&amp;status_whiteboard=Compliance&amp;classification=Modeling&amp;product=MDT&amp;component=UML2&amp;keywords_type=allwords&amp;keywords=plan&amp;field0-0-0=flagtypes.name&amp;type0-0-0=equals&amp;value0-0-0=helios-" />
+        </theme>   
+         
    </themes_and_priorities>
    <appendix name="Legal Notices">
         <html:div>