diff --git a/_projectCommon.php b/_projectCommon.php
index 761b37b..02e8eb1 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -105,7 +105,7 @@
 	$Menu->setProjectBranding($branding);
 	
 	$Nav->addNavSeparator("Target Management", 	"/tm");
-	$Nav->addCustomNav("About This Project", "http://www.eclipse.org/projects/project_summary.php?projectid=dsdp.tm", "_self", 1);
+	$Nav->addCustomNav("About This Project", "http://www.eclipse.org/projects/project_summary.php?projectid=tools.tm", "_self", 1);
 	#$Nav->addCustomNav("About", "/tm/tm-new/about", "_self", 2);
 	#$Nav->addCustomNav("Team", "/tm/tm-new/team",	"_self", 2);
 	$Nav->addCustomNav("Team", "/tm/development/contributors.php",	"_self", 2);
diff --git a/development/index.php b/development/index.php
index 707bc08..67c5a90 100644
--- a/development/index.php
+++ b/development/index.php
@@ -81,7 +81,7 @@
 						See the instructions, FAQs and help from the Platform-Releng team.</li>
 					<!-- Dashboard is currently not useful.
 					<li><b><a
-						href="http://www.eclipse.org/projects/dashboard/dashboard_detail.php?project=dsdp.tm">Project
+						href="http://www.eclipse.org/projects/dashboard/dashboard_detail.php?project=tools.tm">Project
 						Dashboard</a></b> <br>
 						View generated project statistics.</li>
 					-->
diff --git a/development/relnotes/3.0/readme_tm_3.0.html b/development/relnotes/3.0/readme_tm_3.0.html
index 89cbadb..9af53e4 100644
--- a/development/relnotes/3.0/readme_tm_3.0.html
+++ b/development/relnotes/3.0/readme_tm_3.0.html
@@ -65,7 +65,7 @@
 </p>
 <ul>
   <li>See the <a href="http://www.eclipse.org/tm/development/relnotes/3.0/tm-news-3.0.html">TM 3.0 New & Noteworthy</a> for new features</li> 
-  <li>See the <a href="http://www.eclipse.org/projects/project-plan.php?projectid=dsdp.tm">TM 3.0 Project Plan</a>
+  <li>See the <a href="http://www.eclipse.org/projects/project-plan.php?projectid=tools.tm">TM 3.0 Project Plan</a>
       for supported operating environments</li>
   <li>See the <a href="http://wiki.eclipse.org/TM_3.0_Known_Issues_and_Workarounds">TM 3.0 Known Issues and Workarounds</a> Wiki for known problems</li>
 <!--  <li>See the <a href="">TM 3.0 Migration</a> Wiki for migration info</li> -->
diff --git a/development/relnotes/3.1/readme_tm_3.1.html b/development/relnotes/3.1/readme_tm_3.1.html
index 1a91cfa..3de5402 100644
--- a/development/relnotes/3.1/readme_tm_3.1.html
+++ b/development/relnotes/3.1/readme_tm_3.1.html
@@ -42,7 +42,7 @@
 for new API introduced.
 </p><p>
 See the <a href="http://www.eclipse.org/tm/development/relnotes/3.1/tm-news-3.1.html">TM 3.1 New &amp; Noteworthy</a> for new features<br/> 
-See the <a href="http://www.eclipse.org/projects/project-plan.php?projectid=dsdp.tm">TM 3.1 Project Plan</a>
+See the <a href="http://www.eclipse.org/projects/project-plan.php?projectid=tools.tm">TM 3.1 Project Plan</a>
       for supported operating environments<br/>
 See the <a href="http://wiki.eclipse.org/TM/3.1_Known_Issues_and_Workarounds">TM 3.1 Known Issues and Workarounds</a> Wiki for known problems.<br/>
   <!--  <li>See the <a href="">TM 3.1 Migration</a> Wiki for migration info</li> -->
diff --git a/development/relnotes/3.2/readme_tm_3.2.html b/development/relnotes/3.2/readme_tm_3.2.html
index 6cc56de..93115b2 100644
--- a/development/relnotes/3.2/readme_tm_3.2.html
+++ b/development/relnotes/3.2/readme_tm_3.2.html
@@ -32,7 +32,7 @@
 </p><p>
 See the <a href="http://www.eclipse.org/tm/development/relnotes/3.2/tm-news-3.2.html">TM 3.2 New &amp; Noteworthy</a> for new features<br/> 
 See the <a href="http://wiki.eclipse.org/TM/3.2_Release_Summary">TM 3.2 Release Summary</a> for statistics and interesting data about the project<br/>
-See the <a href="http://www.eclipse.org/projects/project-plan.php?projectid=dsdp.tm">TM 3.2 Project Plan</a>
+See the <a href="http://www.eclipse.org/projects/project-plan.php?projectid=tools.tm">TM 3.2 Project Plan</a>
       for supported operating environments<br/>
 See the <a href="http://wiki.eclipse.org/TM/3.2_Known_Issues_and_Workarounds">TM 3.2 Known Issues and Workarounds</a> Wiki for known problems.<br/>
   <!--  <li>See the <a href="">TM 3.2 Migration</a> Wiki for migration info</li> -->
diff --git a/development/tm_plan_3_0.xml b/development/tm_plan_3_0.xml
index b89783a..39f2d73 100644
--- a/development/tm_plan_3_0.xml
+++ b/development/tm_plan_3_0.xml
Binary files differ
diff --git a/development/tm_plan_3_1.xml b/development/tm_plan_3_1.xml
index 3ab23c7..4976f04 100644
--- a/development/tm_plan_3_1.xml
+++ b/development/tm_plan_3_1.xml
Binary files differ
diff --git a/development/tm_plan_3_2.xml b/development/tm_plan_3_2.xml
index 5cea3ab..970df0f 100644
--- a/development/tm_plan_3_2.xml
+++ b/development/tm_plan_3_2.xml
Binary files differ
diff --git a/development/tm_plan_3_3.xml b/development/tm_plan_3_3.xml
index 90f2f82..23ae9a9 100644
--- a/development/tm_plan_3_3.xml
+++ b/development/tm_plan_3_3.xml
Binary files differ
diff --git a/index.php b/index.php
index 1c39354..cf5bbba 100644
--- a/index.php
+++ b/index.php
@@ -94,7 +94,7 @@
 
 		<p><font size="+2"><b>Upcoming Releases:</b></font>
 		<ul><li><b>TM 3.3:</b> ETA June, 2011 with Eclipse <a href="http://wiki.eclipse.org/Indigo">Indigo</a>
-		        [<a href="http://www.eclipse.org/projects/project_summary.php?projectid=dsdp.tm">Project Plan</a>]</li>
+		        [<a href="http://www.eclipse.org/projects/project_summary.php?projectid=tools.tm">Project Plan</a>]</li>
 		</ul></p>
 
 		<p>
@@ -105,7 +105,7 @@
 			<h3>Quick Links</h3>
 				<ul class="midlist">
 					<li><a href="http://wiki.eclipse.org/TM" target="_blank"><b>Wiki</b></a> | We use the Wiki extensively for collaboration. Find ongoing discussions, meeting notes and other "not so official" stuff there.</li>
-					<li><a href="news://news.eclipse.org/eclipse.tm" target="_blank"><b>Newsgroup</b></a> | For general questions and community discussion (<a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.dsdp.tm">Web access</a>, <a href="http://dev.eclipse.org/newslists/news.eclipse.dsdp.tm/maillist.html">archive</a>).</li>
+					<li><a href="news://news.eclipse.org/eclipse.tm" target="_blank"><b>Newsgroup</b></a> | For general questions and community discussion (<a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.tm">Web access</a>, <a href="http://dev.eclipse.org/newslists/news.eclipse.tm/maillist.html">archive</a>).</li>
 					<li><a href="http://dev.eclipse.org/mailman/listinfo/tm-dev" target="_blank"><b>Mailing List</b></a> | For project development discussions.</li>
 					<li><a href="/tm/development/bug_process.php" target="_blank"><b>Bugs</b></a> 
 					   | View <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&product=Target+Management&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit">all open</a> issues
@@ -135,7 +135,7 @@
 				<li>
 				  <b>March 17-20, 2008</b>: <a href="http://www.eclipsecon.org/2008">EclipseCon 2008</a> - <ul>
 				    <li><a href="http://www.eclipsecon.org/2008/?page=sub/&id=38" target="_blank">
-				         <b>Remote access with the DSDP Target Management Project</b></a>, Tutorial by Martin Oberhuber (Wind River)
+				         <b>Remote access with the Target Management Project</b></a>, Tutorial by Martin Oberhuber (Wind River)
 						(slides:  
 						<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt">PPT</a> 757 KB |
 						<a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.pdf">PDF</a> 639 KB) |
@@ -153,7 +153,7 @@
 				<li>
 				  <b>October 9-11, 2007</b>: Eclipse Summit Europe 2007 -<ul>
 				    <li><a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&id=21" target="_blank">
-				         <b>The DSDP Target Management Project</b></a>, long talk by Martin Oberhuber
+				         <b>The Target Management Project</b></a>, long talk by Martin Oberhuber
 				         (slides:  
 				         <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.ppt">PPT</a> |
 				         <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.pdf">PDF</a>)
diff --git a/news/news.xml b/news/news.xml
index b532d37..778112d 100644
--- a/news/news.xml
+++ b/news/news.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc>
-
-<news date="February 6, 2008" showOn="docs,whatsnew,bleedingedge">
-	<a href="http://wiki.eclipse.org/DSDP/TM">New RSE Build Server</a> is available.
-</news>
-<news date="January 1, 2008" showOn="whatsnew">
-	Since January 2007, there have been over 100,000 downloads of RSE!
-</news>
-
-</doc>
+<?xml version="1.0" encoding="UTF-8"?>
+<doc>
+
+<news date="February 6, 2008" showOn="docs,whatsnew,bleedingedge">
+	<a href="http://wiki.eclipse.org/TM">New RSE Build Server</a> is available.
+</news>
+<news date="January 1, 2008" showOn="whatsnew">
+	Since January 2007, there have been over 100,000 downloads of RSE!
+</news>
+
+</doc>
diff --git a/news/relnotes.php b/news/relnotes.php
index 51d12b5..8e2e7a0 100644
--- a/news/relnotes.php
+++ b/news/relnotes.php
@@ -1,7 +1,7 @@
 <?php
 require_once ("../../includes/buildServer-common.php");
 
-$pageTitle = "Eclipse DSDP - TM - Release Notes";
+$pageTitle = "Eclipse Target Management Release Notes";
 
 if (isset($_GET["project"]) && $_GET["project"] == "xsd")
 {
diff --git a/tm-new/_projectCommon.php b/tm-new/_projectCommon.php
index e68abb2..2c1aa0e 100644
--- a/tm-new/_projectCommon.php
+++ b/tm-new/_projectCommon.php
@@ -24,7 +24,7 @@
 
 	$Menu->setProjectBranding($branding);
 
-	$Nav->addCustomNav("About This Project", "http://www.eclipse.org/projects/project_summary.php?projectid=dsdp.tm", "_self", 1);
+	$Nav->addCustomNav("About This Project", "http://www.eclipse.org/projects/project_summary.php?projectid=tools.tm", "_self", 1);
 	
 	$Nav->addNavSeparator("Target Management", "/tm/tm-new/index.php", "_self", 1);
 	$Nav->addCustomNav("About", "/tm/tm-new/about/index.php", "_self", 1);
@@ -33,7 +33,7 @@
 	$Nav->addCustomNav("Presentations", "/tm/tm-new/presentations/index.php", "_self", 1);
 	$Nav->addCustomNav("Demos", "/tm/tm-new/demos/index.php", "_self", 1);
 	$Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/TM", "_self", 1); 
-	$Nav->addCustomNav("IP Log", "http://www.eclipse.org/projects/ip_log.php?projectid=dsdp.tm", "_self", 1);
+	$Nav->addCustomNav("IP Log", "http://www.eclipse.org/projects/ip_log.php?projectid=tools.tm", "_self", 1);
 
 	$Nav->addNavSeparator("Users", "/tm/tm-new/tutorial/index.php", "_self", 1);
 	$Nav->addCustomNav("Getting Started", "/tm/tm-new/tutorial/index.php", "_self", 1);
diff --git a/tm-new/index.php b/tm-new/index.php
index 45a392b..74b65d6 100644
--- a/tm-new/index.php
+++ b/tm-new/index.php
@@ -111,7 +111,7 @@
 
 		<h2 style="padding-top:20px">Presentations</h2>
 		<p>
-			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=38" target="_blank">Remote access with the DSDP Target Management Project</a>
+			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=38" target="_blank">Remote access with the Target Management Project</a>
 			<br/>Tutorial by Martin Oberhuber (Wind River), TM project lead
 			<br/>Given at EclipseCon 2008
 			<br/>slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt">PPT</a> 757 KB
diff --git a/tm-new/presentations/index.php b/tm-new/presentations/index.php
index 376f37c..37ee9d5 100644
--- a/tm-new/presentations/index.php
+++ b/tm-new/presentations/index.php
@@ -34,14 +34,14 @@
 		<h1>$pageTitle</h1>
 		<h2>March 17-20, 2008: <a href="http://www.eclipsecon.org/2008"> EclipseCon 2008</a></h2> 
 		<p>
-			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=38" target="_blank"> <b> Remote access with the DSDP Target Management Project</b></a>, Tutorial by Martin Oberhuber (Wind River) (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt"> PPT </a> 757 KB | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.pdf"> PDF </a> 639 KB) | (code: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt"> tcf-0.2.0.zip </a> 3.7 MB | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_Econ08_samples.zip"> tmtutorial.zip </a> 465 KB) 
+			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=38" target="_blank"> <b> Remote access with the Target Management Project</b></a>, Tutorial by Martin Oberhuber (Wind River) (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt"> PPT </a> 757 KB | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.pdf"> PDF </a> 639 KB) | (code: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_ECon08.ppt"> tcf-0.2.0.zip </a> 3.7 MB | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Tutorial_Econ08_samples.zip"> tmtutorial.zip </a> 465 KB) 
 		</p>
 		<p>
 			<a href="http://www.eclipsecon.org/2008/?page=sub/&amp;id=39" target="_blank"> <b> Target Management New and Noteworthy</b></a>, Short Talk by Martin Oberhuber (Wind River), TM project lead (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Short_ECon08.ppt"> PPT </a> 707 KB | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/TM_Short_ECon08.pdf"> PDF </a> 581 KB) 
 		</p>
 		<h2>October 9-11, 2007: Eclipse Summit Europe 2007</h2> 
 		<p>
-			<a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&amp;id=21" target="_blank"> <b>The DSDP Target Management Project</b></a>, long talk by Martin Oberhuber (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.ppt">PPT</a> | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.pdf">PDF</a>) 
+			<a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&amp;id=21" target="_blank"> <b>The Target Management Project</b></a>, long talk by Martin Oberhuber (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.ppt">PPT</a> | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.pdf">PDF</a>) 
 		</p>
 		<h2>April 12, 2007: Webinar</h2> 
 		<p>
@@ -53,7 +53,7 @@
 		</p>
 		<h2>October 9-11, 2007</b>: Eclipse Summit Europe 2007</h2> 
 		<p>
-			<a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&amp;id=21" target="_blank"> <b> The DSDP Target Management Project</b></a>, long talk by Martin Oberhuber (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.ppt"> PPT </a> | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.pdf"> PDF</a>) 
+			<a href="http://www.eclipsecon.org/summiteurope2007/index.php?page=detail/&amp;id=21" target="_blank"> <b> The Target Management Project</b></a>, long talk by Martin Oberhuber (slides: <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.ppt"> PPT </a> | <a href="http://www.eclipse.org/downloads/download.php?file=/tm/presentations/2007-10-10_TM_ESE2007.pdf"> PDF</a>) 
 		</p>
 		<h2>March 5-8, 2007</b>: EclipseCon 2007</h2> 
 		<p>