diff --git a/sandbox/ant/sca/trunk/archetypes/pom.xml b/sandbox/ant/sca/trunk/archetypes/pom.xml
index e36691b7cd..b9a748a34d 100644
--- a/sandbox/ant/sca/trunk/archetypes/pom.xml
+++ b/sandbox/ant/sca/trunk/archetypes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-archetype</artifactId>
diff --git a/sandbox/ant/sca/trunk/archetypes/quickstart-jsf/pom.xml b/sandbox/ant/sca/trunk/archetypes/quickstart-jsf/pom.xml
index 176ae525ed..471787eb8b 100644
--- a/sandbox/ant/sca/trunk/archetypes/quickstart-jsf/pom.xml
+++ b/sandbox/ant/sca/trunk/archetypes/quickstart-jsf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/archetypes/quickstart-stripes/pom.xml b/sandbox/ant/sca/trunk/archetypes/quickstart-stripes/pom.xml
index 8d9db4adfe..fb51dee836 100644
--- a/sandbox/ant/sca/trunk/archetypes/quickstart-stripes/pom.xml
+++ b/sandbox/ant/sca/trunk/archetypes/quickstart-stripes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/archetypes/quickstart/pom.xml b/sandbox/ant/sca/trunk/archetypes/quickstart/pom.xml
index 8cc08261e6..69222d1b43 100644
--- a/sandbox/ant/sca/trunk/archetypes/quickstart/pom.xml
+++ b/sandbox/ant/sca/trunk/archetypes/quickstart/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/distribution/all/pom.xml b/sandbox/ant/sca/trunk/distribution/all/pom.xml
index 227ed0dd8a..ecd4604649 100644
--- a/sandbox/ant/sca/trunk/distribution/all/pom.xml
+++ b/sandbox/ant/sca/trunk/distribution/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,27 +35,27 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-all</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/distribution/pom.xml b/sandbox/ant/sca/trunk/distribution/pom.xml
index 56cb852956..94e27369ba 100644
--- a/sandbox/ant/sca/trunk/distribution/pom.xml
+++ b/sandbox/ant/sca/trunk/distribution/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-distribution</artifactId>
diff --git a/sandbox/ant/sca/trunk/features/all/pom.xml b/sandbox/ant/sca/trunk/features/all/pom.xml
index 07f2146d29..34e99a02ee 100644
--- a/sandbox/ant/sca/trunk/features/all/pom.xml
+++ b/sandbox/ant/sca/trunk/features/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,42 +36,42 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webapp</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-launcher</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/sandbox/ant/sca/trunk/features/api/pom.xml b/sandbox/ant/sca/trunk/features/api/pom.xml
index 1970a614f2..943e8edfcf 100644
--- a/sandbox/ant/sca/trunk/features/api/pom.xml
+++ b/sandbox/ant/sca/trunk/features/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,14 +36,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Node API -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/features/core/pom.xml b/sandbox/ant/sca/trunk/features/core/pom.xml
index 159b995e43..00f32cbdc1 100644
--- a/sandbox/ant/sca/trunk/features/core/pom.xml
+++ b/sandbox/ant/sca/trunk/features/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- SCA API -->
@@ -57,17 +57,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
@@ -81,46 +81,46 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Core runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Data API -->
@@ -134,26 +134,26 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Domain support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Core Extensibility -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <!--  Hosts -->
@@ -166,19 +166,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Implementation types -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
 
@@ -186,34 +186,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Node runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <!--
@@ -229,19 +229,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-security</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -251,19 +251,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- XMLSchema support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/features/ejava/pom.xml b/sandbox/ant/sca/trunk/features/ejava/pom.xml
index b3b5bb994c..7f7657a12e 100644
--- a/sandbox/ant/sca/trunk/features/ejava/pom.xml
+++ b/sandbox/ant/sca/trunk/features/ejava/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,14 +37,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 <!--
         <dependency>
diff --git a/sandbox/ant/sca/trunk/features/pom.xml b/sandbox/ant/sca/trunk/features/pom.xml
index a032d775c1..a54a2b74a1 100644
--- a/sandbox/ant/sca/trunk/features/pom.xml
+++ b/sandbox/ant/sca/trunk/features/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
     <artifactId>tuscany-feature</artifactId>
diff --git a/sandbox/ant/sca/trunk/features/webapp/pom.xml b/sandbox/ant/sca/trunk/features/webapp/pom.xml
index 7ce155b15e..624afaf305 100644
--- a/sandbox/ant/sca/trunk/features/webapp/pom.xml
+++ b/sandbox/ant/sca/trunk/features/webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,14 +35,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Explicitly list the servlet/jsp apis as "provided" dependencies are not transitive -->
diff --git a/sandbox/ant/sca/trunk/features/webservice/pom.xml b/sandbox/ant/sca/trunk/features/webservice/pom.xml
index 734511a735..559c60f2c7 100644
--- a/sandbox/ant/sca/trunk/features/webservice/pom.xml
+++ b/sandbox/ant/sca/trunk/features/webservice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-feature</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -37,7 +37,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Bindings -->
@@ -49,12 +49,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
@@ -85,24 +85,24 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Databindings -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <!--dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -119,14 +119,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- Policy models -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/itest/callback-api/pom.xml b/sandbox/ant/sca/trunk/itest/callback-api/pom.xml
index 4deb295934..bd10d7a4da 100644
--- a/sandbox/ant/sca/trunk/itest/callback-api/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-api</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-basic/pom.xml b/sandbox/ant/sca/trunk/itest/callback-basic/pom.xml
index d4706e591b..190f42894e 100644
--- a/sandbox/ant/sca/trunk/itest/callback-basic/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-basic</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-complex-type/pom.xml b/sandbox/ant/sca/trunk/itest/callback-complex-type/pom.xml
index 2fd6fc59fd..596c02d887 100644
--- a/sandbox/ant/sca/trunk/itest/callback-complex-type/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-complex-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-complex-type</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-id/pom.xml b/sandbox/ant/sca/trunk/itest/callback-id/pom.xml
index a0338986f3..43166bf427 100644
--- a/sandbox/ant/sca/trunk/itest/callback-id/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-id/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-id</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-multiple-wires/pom.xml b/sandbox/ant/sca/trunk/itest/callback-multiple-wires/pom.xml
index a0b1563e89..1dd4c41b06 100644
--- a/sandbox/ant/sca/trunk/itest/callback-multiple-wires/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-multiple-wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-multiple-wires</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-separatethread/pom.xml b/sandbox/ant/sca/trunk/itest/callback-separatethread/pom.xml
index 1d7804cc53..632bff4d5c 100644
--- a/sandbox/ant/sca/trunk/itest/callback-separatethread/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-separatethread/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-separatethread</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-set-callback/pom.xml b/sandbox/ant/sca/trunk/itest/callback-set-callback/pom.xml
index 38010f9f05..e0378db30f 100644
--- a/sandbox/ant/sca/trunk/itest/callback-set-callback/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-set-callback/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-set-callback</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/callback-set-conversation/pom.xml b/sandbox/ant/sca/trunk/itest/callback-set-conversation/pom.xml
index 769d902c54..9c3293caf8 100644
--- a/sandbox/ant/sca/trunk/itest/callback-set-conversation/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/callback-set-conversation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-callback-set-conversation</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/component-type/pom.xml b/sandbox/ant/sca/trunk/itest/component-type/pom.xml
index 17348c4776..fa50662616 100644
--- a/sandbox/ant/sca/trunk/itest/component-type/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/component-type/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-component-type</artifactId>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/itest/conversations/pom.xml b/sandbox/ant/sca/trunk/itest/conversations/pom.xml
index 2f86e9c8c8..112568b177 100644
--- a/sandbox/ant/sca/trunk/itest/conversations/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/conversations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-conversations</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/distribution/bin-distro-unzip/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/bin-distro-unzip/pom.xml
index b879b0227a..07f7c06932 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/bin-distro-unzip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-bin-distro-unzip</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-distribution-all</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/itest/distribution/binding-ws-calculator/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/binding-ws-calculator/pom.xml
index dd5ac156a4..03b9bccf15 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/binding-ws-calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/binding-ws-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-binding-ws-calculator</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
     </dependencies>
     
diff --git a/sandbox/ant/sca/trunk/itest/distribution/calculator-rmi/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/calculator-rmi/pom.xml
index 9fc1edbd88..e673dc0ef5 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/calculator-rmi/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/calculator-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-calculator-rmi</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
     </dependencies>
     
diff --git a/sandbox/ant/sca/trunk/itest/distribution/implementation-java-calculator/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/implementation-java-calculator/pom.xml
index 9bca2ac289..8f628cda3d 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/implementation-java-calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/implementation-java-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-implementation-java-calculator</artifactId>
@@ -33,7 +33,7 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
     </dependencies>
     
diff --git a/sandbox/ant/sca/trunk/itest/distribution/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/pom.xml
index 497e556bbd..b0652f275a 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
index 3de026f192..0c27378e6b 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-webapp-helloworld-jsp</artifactId>
@@ -34,14 +34,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>helloworld-jsp</artifactId>
             <type>war</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld/pom.xml b/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld/pom.xml
index f8df612c51..2e38c602b2 100644
--- a/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/distribution/webapp-helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>itest-distribution</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-distribution-webapp-helloworld</artifactId>
@@ -34,14 +34,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>itest-bin-distro-unzip</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>helloworld</artifactId>
             <type>war</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/itest/exceptions/pom.xml b/sandbox/ant/sca/trunk/itest/exceptions/pom.xml
index 28eb145c82..5362d9a77f 100644
--- a/sandbox/ant/sca/trunk/itest/exceptions/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/exceptions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-exceptions</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/interfaces/pom.xml b/sandbox/ant/sca/trunk/itest/interfaces/pom.xml
index f5aed20395..ea0b9ab71e 100644
--- a/sandbox/ant/sca/trunk/itest/interfaces/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/interfaces/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-interfaces</artifactId>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/itest/pom.xml b/sandbox/ant/sca/trunk/itest/pom.xml
index a0f9224bfd..7cd28fb22f 100644
--- a/sandbox/ant/sca/trunk/itest/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-itest</artifactId>
diff --git a/sandbox/ant/sca/trunk/itest/recursive-multi-level/pom.xml b/sandbox/ant/sca/trunk/itest/recursive-multi-level/pom.xml
index 6cc124816f..77ba404f78 100644
--- a/sandbox/ant/sca/trunk/itest/recursive-multi-level/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/recursive-multi-level/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <!--relativePath>../pom.xml</relativePath-->
     </parent>
     <artifactId>itest-recursive-multi-level</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/references/pom.xml b/sandbox/ant/sca/trunk/itest/references/pom.xml
index ff73d945bd..d05cf7b943 100644
--- a/sandbox/ant/sca/trunk/itest/references/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/references/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-references</artifactId>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/itest/scopes/pom.xml b/sandbox/ant/sca/trunk/itest/scopes/pom.xml
index 4974bde905..77d0b2a38e 100644
--- a/sandbox/ant/sca/trunk/itest/scopes/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/scopes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Apache Tuscany SCA Scopes Integration Tests</name>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/itest/services/pom.xml b/sandbox/ant/sca/trunk/itest/services/pom.xml
index 0369ee144b..8958b53e33 100644
--- a/sandbox/ant/sca/trunk/itest/services/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/services/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-services</artifactId>
@@ -32,20 +32,20 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/itest/wires/pom.xml b/sandbox/ant/sca/trunk/itest/wires/pom.xml
index 501a5265cb..aa65298b6c 100644
--- a/sandbox/ant/sca/trunk/itest/wires/pom.xml
+++ b/sandbox/ant/sca/trunk/itest/wires/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-wires</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/modules/assembly-xml-osoa/pom.xml b/sandbox/ant/sca/trunk/modules/assembly-xml-osoa/pom.xml
index e66c3db630..dac1fc863c 100644
--- a/sandbox/ant/sca/trunk/modules/assembly-xml-osoa/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly-xml-osoa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xml-osoa</artifactId>
@@ -32,44 +32,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
 
         <!-- 
@@ -103,21 +103,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd-osoa</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/assembly-xml/pom.xml b/sandbox/ant/sca/trunk/modules/assembly-xml/pom.xml
index 7d703879f7..1f1950083d 100644
--- a/sandbox/ant/sca/trunk/modules/assembly-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xml</artifactId>
@@ -32,44 +32,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
 
         <!-- 
@@ -103,21 +103,21 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/assembly-xsd-osoa/pom.xml b/sandbox/ant/sca/trunk/modules/assembly-xsd-osoa/pom.xml
index fa210b8cc9..6d2a157dc5 100644
--- a/sandbox/ant/sca/trunk/modules/assembly-xsd-osoa/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly-xsd-osoa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xsd-osoa</artifactId>
diff --git a/sandbox/ant/sca/trunk/modules/assembly-xsd/pom.xml b/sandbox/ant/sca/trunk/modules/assembly-xsd/pom.xml
index 46ad6db5c4..3c867a5fba 100644
--- a/sandbox/ant/sca/trunk/modules/assembly-xsd/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly-xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly-xsd</artifactId>
diff --git a/sandbox/ant/sca/trunk/modules/assembly/pom.xml b/sandbox/ant/sca/trunk/modules/assembly/pom.xml
index 92fb75a64f..89a1ab9ee8 100644
--- a/sandbox/ant/sca/trunk/modules/assembly/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-assembly</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
 	    <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-dwr/pom.xml b/sandbox/ant/sca/trunk/modules/binding-dwr/pom.xml
index fd033d606c..7775573339 100644
--- a/sandbox/ant/sca/trunk/modules/binding-dwr/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-dwr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-dwr</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/binding-jsonp/pom.xml b/sandbox/ant/sca/trunk/modules/binding-jsonp/pom.xml
index a24dd5dc56..7f211230c6 100644
--- a/sandbox/ant/sca/trunk/modules/binding-jsonp/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-jsonp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-jsonp</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/binding-jsonrpc/pom.xml b/sandbox/ant/sca/trunk/modules/binding-jsonrpc/pom.xml
index b3b2fabca1..1916afa0e5 100644
--- a/sandbox/ant/sca/trunk/modules/binding-jsonrpc/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-jsonrpc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/binding-rmi-runtime/pom.xml b/sandbox/ant/sca/trunk/modules/binding-rmi-runtime/pom.xml
index 461a552812..65cc208103 100644
--- a/sandbox/ant/sca/trunk/modules/binding-rmi-runtime/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-rmi-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi-runtime</artifactId>
@@ -33,19 +33,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-rmi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -63,14 +63,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-rmi/pom.xml b/sandbox/ant/sca/trunk/modules/binding-rmi/pom.xml
index 1f9e4376eb..115b0dd890 100644
--- a/sandbox/ant/sca/trunk/modules/binding-rmi/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-rmi</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/binding-sca-xml/pom.xml b/sandbox/ant/sca/trunk/modules/binding-sca-xml/pom.xml
index 483bdbf408..2eed1abce6 100644
--- a/sandbox/ant/sca/trunk/modules/binding-sca-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-sca-xml/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,13 +36,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>      
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>   
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-sca/pom.xml b/sandbox/ant/sca/trunk/modules/binding-sca/pom.xml
index 1e1714f389..f6fc90cc93 100644
--- a/sandbox/ant/sca/trunk/modules/binding-sca/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-sca/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,31 +35,31 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>       
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>    
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws-axis2-policy/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws-axis2-policy/pom.xml
index f384a9ba12..a3bb6aa409 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws-axis2-policy/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws-axis2-policy/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-M6-SNAPSHOT</version>
+		<version>2.0-TB3-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-binding-ws-axis2-policy</artifactId>
@@ -32,19 +32,19 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-contribution</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-policy-security</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>	
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws-axis2/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws-axis2/pom.xml
index 8c15de7989..7d14b8e45d 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws-axis2/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws-axis2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -42,91 +42,91 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>         
 
         <!-- Added by Mike Edwards, 11th December 2008 -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <!-- end of addition -->
 
@@ -325,28 +325,28 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
                
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws-wsdlgen/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws-wsdlgen/pom.xml
index 275e0fc220..753174c7b3 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws-wsdlgen/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws-wsdlgen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
@@ -33,47 +33,47 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws-xml/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws-xml/pom.xml
index f958442139..65c25df2d3 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws-xml</artifactId>
@@ -32,44 +32,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>                
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/binding-ws/pom.xml b/sandbox/ant/sca/trunk/modules/binding-ws/pom.xml
index 02f67331e4..1dc45c539a 100644
--- a/sandbox/ant/sca/trunk/modules/binding-ws/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/binding-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-binding-ws</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
          <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/contribution-java/pom.xml b/sandbox/ant/sca/trunk/modules/contribution-java/pom.xml
index 0de0c0a864..30432fac00 100644
--- a/sandbox/ant/sca/trunk/modules/contribution-java/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/contribution-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-java</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/contribution-namespace/pom.xml b/sandbox/ant/sca/trunk/modules/contribution-namespace/pom.xml
index e523d4017a..bfe6bd2364 100644
--- a/sandbox/ant/sca/trunk/modules/contribution-namespace/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/contribution-namespace/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-namespace</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/contribution-xml/pom.xml b/sandbox/ant/sca/trunk/modules/contribution-xml/pom.xml
index 2a7552a779..e5ed1e797b 100644
--- a/sandbox/ant/sca/trunk/modules/contribution-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/contribution-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution-xml</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/contribution/pom.xml b/sandbox/ant/sca/trunk/modules/contribution/pom.xml
index 2af0d4d2ea..02e864d704 100644
--- a/sandbox/ant/sca/trunk/modules/contribution/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/contribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-contribution</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <!--     	
diff --git a/sandbox/ant/sca/trunk/modules/core-databinding/pom.xml b/sandbox/ant/sca/trunk/modules/core-databinding/pom.xml
index 53b74999ec..4aa5db91c3 100644
--- a/sandbox/ant/sca/trunk/modules/core-databinding/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/core-databinding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/sandbox/ant/sca/trunk/modules/core-spi/pom.xml b/sandbox/ant/sca/trunk/modules/core-spi/pom.xml
index 0c81daa8e9..4be5a3a356 100644
--- a/sandbox/ant/sca/trunk/modules/core-spi/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/core-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core-spi</artifactId>
@@ -32,44 +32,44 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>                        
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/core/pom.xml b/sandbox/ant/sca/trunk/modules/core/pom.xml
index 5fb1e382dc..78732ca6f1 100644
--- a/sandbox/ant/sca/trunk/modules/core/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-core</artifactId>
@@ -32,31 +32,31 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/databinding-axiom/pom.xml b/sandbox/ant/sca/trunk/modules/databinding-axiom/pom.xml
index a3bd77e343..a1c4400be7 100644
--- a/sandbox/ant/sca/trunk/modules/databinding-axiom/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/databinding-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-axiom</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!--
diff --git a/sandbox/ant/sca/trunk/modules/databinding-jaxb-axiom/pom.xml b/sandbox/ant/sca/trunk/modules/databinding-jaxb-axiom/pom.xml
index 3616b21d41..4a20e41378 100644
--- a/sandbox/ant/sca/trunk/modules/databinding-jaxb-axiom/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/databinding-jaxb-axiom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
diff --git a/sandbox/ant/sca/trunk/modules/databinding-jaxb/pom.xml b/sandbox/ant/sca/trunk/modules/databinding-jaxb/pom.xml
index 5697e1140c..83fb37c607 100644
--- a/sandbox/ant/sca/trunk/modules/databinding-jaxb/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/databinding-jaxb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-databinding-jaxb</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <!-- 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/databinding/pom.xml b/sandbox/ant/sca/trunk/modules/databinding/pom.xml
index 1fd8c2d763..0eb2a36ad1 100644
--- a/sandbox/ant/sca/trunk/modules/databinding/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/databinding/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.tuscany.sca</groupId>
 		<artifactId>tuscany-modules</artifactId>
-		<version>2.0-M6-SNAPSHOT</version>
+		<version>2.0-TB3-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-databinding</artifactId>
@@ -32,31 +32,31 @@
 		<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>		
 
         <!-- 
diff --git a/sandbox/ant/sca/trunk/modules/definitions-xml/pom.xml b/sandbox/ant/sca/trunk/modules/definitions-xml/pom.xml
index 71108fcc31..30b278405b 100644
--- a/sandbox/ant/sca/trunk/modules/definitions-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/definitions-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-definitions-xml</artifactId>
@@ -32,32 +32,32 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     	
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/definitions/pom.xml b/sandbox/ant/sca/trunk/modules/definitions/pom.xml
index ef5f41fddc..7d6c5d1736 100644
--- a/sandbox/ant/sca/trunk/modules/definitions/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/definitions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-definitions</artifactId>
@@ -32,19 +32,19 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/endpoint/pom.xml b/sandbox/ant/sca/trunk/modules/endpoint/pom.xml
index 81ca642a78..0c0a3a21d2 100644
--- a/sandbox/ant/sca/trunk/modules/endpoint/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/endpoint/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,52 +35,52 @@
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>  
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>    
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency> 
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>         
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency> 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/extensibility-equinox/pom.xml b/sandbox/ant/sca/trunk/modules/extensibility-equinox/pom.xml
index 04bde27eb9..c2ed822751 100644
--- a/sandbox/ant/sca/trunk/modules/extensibility-equinox/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/extensibility-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility-equinox</artifactId>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/extensibility/pom.xml b/sandbox/ant/sca/trunk/modules/extensibility/pom.xml
index ab2e839587..b8b587b730 100644
--- a/sandbox/ant/sca/trunk/modules/extensibility/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/extensibility/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-extensibility</artifactId>
diff --git a/sandbox/ant/sca/trunk/modules/host-http/pom.xml b/sandbox/ant/sca/trunk/modules/host-http/pom.xml
index 4783683c1c..fdadef66bb 100644
--- a/sandbox/ant/sca/trunk/modules/host-http/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/host-http/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-http</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/host-jetty/pom.xml b/sandbox/ant/sca/trunk/modules/host-jetty/pom.xml
index 09797099bd..f5b6f4b320 100644
--- a/sandbox/ant/sca/trunk/modules/host-jetty/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/host-jetty/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-jetty</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/host-rmi/pom.xml b/sandbox/ant/sca/trunk/modules/host-rmi/pom.xml
index a9a1069f90..98a307b4e9 100644
--- a/sandbox/ant/sca/trunk/modules/host-rmi/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/host-rmi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-host-rmi</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/host-webapp/pom.xml b/sandbox/ant/sca/trunk/modules/host-webapp/pom.xml
index 951a82ed81..5f0c736adf 100644
--- a/sandbox/ant/sca/trunk/modules/host-webapp/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/host-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,38 +33,38 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/implementation-bpel-ode/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-bpel-ode/pom.xml
index c0b26535ba..bff5592123 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-bpel-ode/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-bpel-ode/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-bpel-ode</artifactId>
@@ -31,62 +31,62 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!-- ODE Jars -->
diff --git a/sandbox/ant/sca/trunk/modules/implementation-bpel/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-bpel/pom.xml
index 3556056b59..f1292ac751 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-bpel/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-bpel/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>tuscany-implementation-bpel</artifactId>
@@ -32,43 +32,43 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-java</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-interface-wsdl-xml</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-databinding</artifactId>
-			<version>2.0-M6-SNAPSHOT</version>
+			<version>2.0-TB3-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/sandbox/ant/sca/trunk/modules/implementation-java-runtime/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-java-runtime/pom.xml
index b50017d384..8841e3a225 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-java-runtime/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-java-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-runtime</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/implementation-java-xml/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-java-xml/pom.xml
index 49d28b8301..5ca0dd21f1 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-java-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-java-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java-xml</artifactId>
@@ -33,51 +33,51 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/implementation-java/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-java/pom.xml
index f3d3ff6402..5ba90afcc5 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-java/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-implementation-java</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/implementation-node-runtime/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-node-runtime/pom.xml
index 332fe1c6fa..6b5571d8f3 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-node-runtime/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-node-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,37 +33,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/implementation-node/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-node/pom.xml
index a829999c56..f584eb8d5b 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-node/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-node/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,32 +33,32 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/implementation-web-runtime/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-web-runtime/pom.xml
index 2b4f32cc6f..7240d8f5b5 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-web-runtime/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-web-runtime/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,25 +34,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/modules/implementation-web/pom.xml b/sandbox/ant/sca/trunk/modules/implementation-web/pom.xml
index d5195dbf86..ae62b997db 100644
--- a/sandbox/ant/sca/trunk/modules/implementation-web/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/implementation-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,44 +34,44 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
  
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-monitor</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/modules/interface-java-jaxws/pom.xml b/sandbox/ant/sca/trunk/modules/interface-java-jaxws/pom.xml
index 28c0374ac5..a94e76a890 100644
--- a/sandbox/ant/sca/trunk/modules/interface-java-jaxws/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-java-jaxws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java-jaxws</artifactId>
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/interface-java-xml/pom.xml b/sandbox/ant/sca/trunk/modules/interface-java-xml/pom.xml
index e67e0569fe..9f4199a144 100644
--- a/sandbox/ant/sca/trunk/modules/interface-java-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-java-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java-xml</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/interface-java/pom.xml b/sandbox/ant/sca/trunk/modules/interface-java/pom.xml
index 6727dd00db..d0ed41bb67 100644
--- a/sandbox/ant/sca/trunk/modules/interface-java/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-java</artifactId>
@@ -32,31 +32,31 @@
     	<dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/interface-wsdl-xml/pom.xml b/sandbox/ant/sca/trunk/modules/interface-wsdl-xml/pom.xml
index 318587f92a..aee14d7343 100644
--- a/sandbox/ant/sca/trunk/modules/interface-wsdl-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-wsdl-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-wsdl-xml</artifactId>
@@ -32,37 +32,37 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/interface-wsdl/pom.xml b/sandbox/ant/sca/trunk/modules/interface-wsdl/pom.xml
index fcef70a641..75429195e1 100644
--- a/sandbox/ant/sca/trunk/modules/interface-wsdl/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface-wsdl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface-wsdl</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/interface/pom.xml b/sandbox/ant/sca/trunk/modules/interface/pom.xml
index a0cfda06cf..f59e18e705 100644
--- a/sandbox/ant/sca/trunk/modules/interface/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/interface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-interface</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/launcher/pom.xml b/sandbox/ant/sca/trunk/modules/launcher/pom.xml
index df4404858b..607def74b4 100644
--- a/sandbox/ant/sca/trunk/modules/launcher/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/launcher/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/modules/monitor/pom.xml b/sandbox/ant/sca/trunk/modules/monitor/pom.xml
index f16aed30b9..5a56742403 100644
--- a/sandbox/ant/sca/trunk/modules/monitor/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/modules/myfaces/pom.xml b/sandbox/ant/sca/trunk/modules/myfaces/pom.xml
index e0cbcb79af..da87ef925c 100644
--- a/sandbox/ant/sca/trunk/modules/myfaces/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/myfaces/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,13 +34,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/node-api/pom.xml b/sandbox/ant/sca/trunk/modules/node-api/pom.xml
index b700fc7121..da8fc1e423 100644
--- a/sandbox/ant/sca/trunk/modules/node-api/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/node-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/node-impl/pom.xml b/sandbox/ant/sca/trunk/modules/node-impl/pom.xml
index 05575d1b5c..4aa99ce57c 100644
--- a/sandbox/ant/sca/trunk/modules/node-impl/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/node-impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,111 +35,111 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
          <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>  
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>          
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
                 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-endpoint</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency> 
                
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>  
               
diff --git a/sandbox/ant/sca/trunk/modules/node-launcher-equinox/pom.xml b/sandbox/ant/sca/trunk/modules/node-launcher-equinox/pom.xml
index b4a804e812..bc90b449db 100644
--- a/sandbox/ant/sca/trunk/modules/node-launcher-equinox/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/node-launcher-equinox/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -73,14 +73,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/node-launcher/pom.xml b/sandbox/ant/sca/trunk/modules/node-launcher/pom.xml
index 3fd5f5aa46..b7a0c7dd3d 100644
--- a/sandbox/ant/sca/trunk/modules/node-launcher/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/node-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/ant/sca/trunk/modules/policy-security/pom.xml b/sandbox/ant/sca/trunk/modules/policy-security/pom.xml
index 6eead0f4df..fcd8803f7a 100644
--- a/sandbox/ant/sca/trunk/modules/policy-security/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/policy-security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-security</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/policy-xml-ws/pom.xml b/sandbox/ant/sca/trunk/modules/policy-xml-ws/pom.xml
index 7e1b20da53..5f86760f6e 100644
--- a/sandbox/ant/sca/trunk/modules/policy-xml-ws/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/policy-xml-ws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-xml-ws</artifactId>
@@ -32,19 +32,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 		
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/policy-xml/pom.xml b/sandbox/ant/sca/trunk/modules/policy-xml/pom.xml
index c167a077ee..553b701290 100644
--- a/sandbox/ant/sca/trunk/modules/policy-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/policy-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy-xml</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-policy</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/policy/pom.xml b/sandbox/ant/sca/trunk/modules/policy/pom.xml
index 4378211d7f..893193bf15 100644
--- a/sandbox/ant/sca/trunk/modules/policy/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/policy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-policy</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
    </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/pom.xml b/sandbox/ant/sca/trunk/modules/pom.xml
index 1f392c066d..f1c65924c9 100644
--- a/sandbox/ant/sca/trunk/modules/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-modules</artifactId>
diff --git a/sandbox/ant/sca/trunk/modules/sca-api/pom.xml b/sandbox/ant/sca/trunk/modules/sca-api/pom.xml
index 63db674bbd..8971c0bbdf 100644
--- a/sandbox/ant/sca/trunk/modules/sca-api/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/sca-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sandbox/ant/sca/trunk/modules/stripes/pom.xml b/sandbox/ant/sca/trunk/modules/stripes/pom.xml
index 7774a78f71..816b4a14bd 100644
--- a/sandbox/ant/sca/trunk/modules/stripes/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/stripes/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/workspace-impl/pom.xml b/sandbox/ant/sca/trunk/modules/workspace-impl/pom.xml
index e83c3ba356..cff6dffd86 100644
--- a/sandbox/ant/sca/trunk/modules/workspace-impl/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/workspace-impl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace-impl</artifactId>
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/modules/workspace-xml/pom.xml b/sandbox/ant/sca/trunk/modules/workspace-xml/pom.xml
index 80ec759962..0429200439 100644
--- a/sandbox/ant/sca/trunk/modules/workspace-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/workspace-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace-xml</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-workspace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/modules/workspace/pom.xml b/sandbox/ant/sca/trunk/modules/workspace/pom.xml
index 32891db631..c001f52d79 100644
--- a/sandbox/ant/sca/trunk/modules/workspace/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/workspace/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-workspace</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/sandbox/ant/sca/trunk/modules/xsd-xml/pom.xml b/sandbox/ant/sca/trunk/modules/xsd-xml/pom.xml
index 6789b2468c..f832ef984d 100644
--- a/sandbox/ant/sca/trunk/modules/xsd-xml/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/xsd-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-xsd-xml</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-xsd</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/ant/sca/trunk/modules/xsd/pom.xml b/sandbox/ant/sca/trunk/modules/xsd/pom.xml
index 2c6042a259..d2b9e12a9b 100644
--- a/sandbox/ant/sca/trunk/modules/xsd/pom.xml
+++ b/sandbox/ant/sca/trunk/modules/xsd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-modules</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-xsd</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-assembly</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/sandbox/ant/sca/trunk/pom.xml b/sandbox/ant/sca/trunk/pom.xml
index 42a122c797..03a297d32e 100644
--- a/sandbox/ant/sca/trunk/pom.xml
+++ b/sandbox/ant/sca/trunk/pom.xml
@@ -30,12 +30,12 @@
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Implementation Project (2.x)</name>
     <url>http://tuscany.apache.org</url>
-    <version>2.0-M6-SNAPSHOT</version>
+    <version>2.0-TB3-SNAPSHOT</version>
 
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb2</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb2</developerConnection>
-        <url>https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb2</url>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb4</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb4</developerConnection>
+        <url>https://svn.apache.org/repos/asf/tuscany/sandbox/ant/sca/branches/tb4</url>
     </scm>
 
     <prerequisites>
diff --git a/sandbox/ant/sca/trunk/samples/binding-ws-calculator/pom.xml b/sandbox/ant/sca/trunk/samples/binding-ws-calculator/pom.xml
index 39f528457c..ab0b71f3fa 100644
--- a/sandbox/ant/sca/trunk/samples/binding-ws-calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/binding-ws-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-binding-ws-calculator</artifactId>
@@ -40,28 +40,28 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>        
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/calculator-equinox/pom.xml b/sandbox/ant/sca/trunk/samples/calculator-equinox/pom.xml
index 49c5b77263..b68e771bc7 100644
--- a/sandbox/ant/sca/trunk/samples/calculator-equinox/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator-equinox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-equinox</artifactId>
@@ -39,40 +39,40 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher-equinox</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>   
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-extensibility-equinox</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
diff --git a/sandbox/ant/sca/trunk/samples/calculator-osgi/pom.xml b/sandbox/ant/sca/trunk/samples/calculator-osgi/pom.xml
index 5ab5bf981c..a619337ac5 100644
--- a/sandbox/ant/sca/trunk/samples/calculator-osgi/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator-osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-osgi</artifactId>
@@ -39,14 +39,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/samples/calculator-rmi-reference/pom.xml b/sandbox/ant/sca/trunk/samples/calculator-rmi-reference/pom.xml
index 69955e6ac0..7a540b206a 100644
--- a/sandbox/ant/sca/trunk/samples/calculator-rmi-reference/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator-rmi-reference/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-rmi-reference</artifactId>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/calculator-rmi-service/pom.xml b/sandbox/ant/sca/trunk/samples/calculator-rmi-service/pom.xml
index 47da917c3f..79382987bd 100644
--- a/sandbox/ant/sca/trunk/samples/calculator-rmi-service/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator-rmi-service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator-rmi-service</artifactId>
@@ -32,24 +32,24 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/calculator/pom.xml b/sandbox/ant/sca/trunk/samples/calculator/pom.xml
index de72b53437..0eac10a1f0 100644
--- a/sandbox/ant/sca/trunk/samples/calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-calculator</artifactId>
@@ -32,20 +32,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/samples/helloworld-bpel/pom.xml b/sandbox/ant/sca/trunk/samples/helloworld-bpel/pom.xml
index e6ac9b471d..e3b5073c08 100644
--- a/sandbox/ant/sca/trunk/samples/helloworld-bpel/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/helloworld-bpel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-helloworld-bpel</artifactId>
@@ -39,20 +39,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/samples/implementation-java-calculator/pom.xml b/sandbox/ant/sca/trunk/samples/implementation-java-calculator/pom.xml
index 44c4f6cdd0..bc2ef9a579 100644
--- a/sandbox/ant/sca/trunk/samples/implementation-java-calculator/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/implementation-java-calculator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>sample-implementation-java-calculator</artifactId>
@@ -40,14 +40,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/sandbox/ant/sca/trunk/samples/pom.xml b/sandbox/ant/sca/trunk/samples/pom.xml
index 99722e80dd..bfbe4fcdf9 100644
--- a/sandbox/ant/sca/trunk/samples/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-samples</artifactId>
diff --git a/sandbox/ant/sca/trunk/samples/webapps/helloworld-jsp/pom.xml b/sandbox/ant/sca/trunk/samples/webapps/helloworld-jsp/pom.xml
index 26eb22c709..96430e6f32 100644
--- a/sandbox/ant/sca/trunk/samples/webapps/helloworld-jsp/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/webapps/helloworld-jsp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,14 +35,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/sandbox/ant/sca/trunk/samples/webapps/helloworld-stripes/pom.xml b/sandbox/ant/sca/trunk/samples/webapps/helloworld-stripes/pom.xml
index c3b8bf8dbc..326794fa92 100644
--- a/sandbox/ant/sca/trunk/samples/webapps/helloworld-stripes/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/webapps/helloworld-stripes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -36,12 +36,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
         </dependency>
 
         <!--  Stripes Framework dependencies -->
diff --git a/sandbox/ant/sca/trunk/samples/webapps/helloworld/pom.xml b/sandbox/ant/sca/trunk/samples/webapps/helloworld/pom.xml
index 287e42f4ab..c5d3c1d120 100644
--- a/sandbox/ant/sca/trunk/samples/webapps/helloworld/pom.xml
+++ b/sandbox/ant/sca/trunk/samples/webapps/helloworld/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-M6-SNAPSHOT</version>
+        <version>2.0-TB3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -35,14 +35,14 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-M6-SNAPSHOT</version>
+            <version>2.0-TB3-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>