Work in progress. Fixed implementation of NodeImpl, now working without dependencies on implementations from other bundles (except RuntimeAssemblyFactory, which will need to be cleaned up too). Started to remove dependencies on host-embedded and port code to NodeFactory and Node, as an interim step to bring them up, before porting them to the OSGi-enabled node launcher.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@703068 13f79535-47bb-0310-9956-ffa450edef68

36 files changed, 343 insertions, 343 deletions

diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
index ba9020811c..927e91a8bc 100644
--- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ b/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
@@ -25,10 +25,10 @@ import java.io.File;
 

 import junit.framework.Assert;

 

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

@@ -40,8 +40,8 @@ import org.junit.Test;
  */

 public class CallableReferenceRemoteTestCase {

     

-    private static SCANode nodeA;

-    private static SCANode nodeB;

+    private static Node nodeA;

+    private static Node nodeB;

    

     private static AComponent acomponent;

 

@@ -52,21 +52,21 @@ public class CallableReferenceRemoteTestCase {
             

             System.out.println("Setting up nodes");

                   

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/nodeA").toURL().toString()));

             

      

-            nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/nodeB").toURL().toString()));

             

             

             nodeA.start();

             nodeB.start();

             

-            acomponent = ((SCAClient)nodeA).getService(AComponent.class, "AComponent/AComponent");

+            acomponent = ((Client)nodeA).getService(AComponent.class, "AComponent/AComponent");

                

         } catch (Throwable ex) {

             System.out.println(ex.toString());

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 9df966ebc2..6c3cbe462c 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
@@ -24,10 +24,10 @@ import java.io.File;
 

 

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.After;

 import org.junit.Assert;

 import org.junit.Before;

@@ -35,20 +35,20 @@ import org.junit.Test;
 

 public class ConversationWSDLTestCase {

 

-    private SCANode node; 

+    private Node node; 

     private ConversationalClient conversationalStatelessClientStatefulService;    

 

     @Before

     public void setUp() throws Exception {

-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-        node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),

-                                         new SCAContribution("TestContribution", 

+        NodeFactory nodeFactory = NodeFactory.newInstance();

+        node = nodeFactory.createNode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),

+                                         new Contribution("TestContribution", 

                                                                      new File("src/main/resources/ConversationalWSDL").toURL().toString()));

                 

          

         node.start();

         

-        conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");

+        conversationalStatelessClientStatefulService = ((Client)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");

         

         

         ConversationalClientStatelessImpl.calls  = new StringBuffer(); 

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index ebd1e55dac..051b6b9fc1 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
@@ -29,17 +29,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class NonConversationalCallbackTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,28 +50,28 @@ public class NonConversationalCallbackTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

     	try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatelessClientStatelessService");

 	

-	    conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatelessClientStatefulService");

 	

-	    conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatefulClientStatelessService");

 	

-	    conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatefulClientStatefulService");

-	    conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatelessClientRequestService");

-	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

 	                                                                          "ConversationalStatefulClientNonConversationalCallbackStatefulService");

 	        

 	    // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index 2c16145f54..b9530c132b 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
@@ -30,17 +30,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class RequestScopeTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -51,28 +51,28 @@ public class RequestScopeTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 4166e6acdf..1e5f6adcf1 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
@@ -29,17 +29,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatefulStatefulTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,28 +50,28 @@ public class StatefulStatefulTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 6023b7cd53..8a110477b5 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
@@ -29,17 +29,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatefulStatelessTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -50,28 +50,28 @@ public class StatefulStatelessTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index fb3a3cec6f..79ac9262c6 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
@@ -28,17 +28,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatelessStatefulTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -49,28 +49,28 @@ public class StatelessStatefulTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 5fbe2c3f69..9aebae9ced 100644
--- a/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
@@ -28,17 +28,17 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

 

 public class StatelessStatelessTestCase {

 

-    private static SCANode node;

+    private static Node node;

     private static ConversationalClient conversationalStatelessClientStatelessService;

     private static ConversationalClient conversationalStatelessClientStatefulService;

     private static ConversationalClient conversationalStatefulClientStatelessService;

@@ -49,28 +49,28 @@ public class StatelessStatelessTestCase {
     @BeforeClass

     public static void setUp() throws Exception {

         try {

-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

+            NodeFactory nodeFactory = NodeFactory.newInstance();

+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

+                                             new Contribution("TestContribution", 

                                                                  new File("src/main/resources/Conversational").toURL().toString()));

                     

              

             node.start();

             

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatelessService");

         

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientStatefulService");

         

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatelessService");

         

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 

+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 

                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");

                 

             // reset the place where we record the sequence of calls passing

diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index da2fc8b108..5c82fe121f 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
@@ -27,9 +27,9 @@ import java.util.Map;
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -39,8 +39,8 @@ import org.junit.Test;
  */
 public class DatabindingTestCase {
 
-    private static SCAClient client;
-    private static SCANode node;
+    private static Client client;
+    private static Node node;
 
     /**
      * Runs once before running the tests
@@ -48,10 +48,10 @@ public class DatabindingTestCase {
     @BeforeClass
     public static void setUp() throws Exception {
         try {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null);
         node.start();
-        client = (SCAClient)node;
+        client = (Client)node;
         }catch(Throwable e) {
             e.printStackTrace();
         }
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index 65b8a5abc3..4a292a8b7a 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
@@ -22,9 +22,9 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.topdown;
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -34,18 +34,18 @@ import org.junit.Test;
  */
 public class PrimitivesDatabindingTestCase {
 
-    private static SCAClient domain;
-    private static SCANode node;
+    private static Client domain;
+    private static Node node;
 
     /**
      * Runs before each test method
      */
     @BeforeClass
     public static void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/primitivesservice.composite", null);
         node.start();
-        domain = (SCAClient)node;
+        domain = (Client)node;
     }
 
     /**
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index dc49f0f407..402ade0852 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
@@ -55,9 +55,9 @@ import org.apache.axiom.attachments.ByteArrayDataSource;
 import org.apache.tuscany.sca.databinding.xml.String2Node;
 import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
 import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -69,18 +69,18 @@ import org.xml.sax.InputSource;
  */
 public class StandardTypesDatabindingTestCase {
 
-    private static SCAClient domain;
-    private static SCANode node;
+    private static Client domain;
+    private static Node node;
 
     /**
      * Runs once before the tests
      */
     @BeforeClass
     public static void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/standard-types-service.composite", null);
         node.start();
-        domain = (SCAClient)node;
+        domain = (Client)node;
     }
 
     /**
diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
index ebe834028d..74e01259e2 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
+++ b/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
@@ -23,10 +23,10 @@ import java.io.File;
 
 import junit.framework.Assert;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -38,9 +38,9 @@ import org.junit.Test;
  */
 public class LateReferenceResolutionTestCase {
 
-    private static SCANode nodeA;
-    private static SCANode nodeB;
-    private static SCANode nodeC;
+    private static Node nodeA;
+    private static Node nodeB;
+    private static Node nodeC;
 
     private static CalculatorService calculatorService;
     
@@ -53,22 +53,22 @@ public class LateReferenceResolutionTestCase {
             System.out.println("Setting up domain");
 
             
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            nodeC = nodeFactory.createSCANode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeC", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            nodeC = nodeFactory.createNode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
+                new Contribution("NodeC", 
                                     new File("src/main/resources/nodeC").toURL().toString()));
-            nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeB", 
+            nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
+                new Contribution("NodeB", 
                                     new File("src/main/resources/nodeB").toURL().toString()));
-            nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeA", 
+            nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
+                new Contribution("NodeA", 
                                     new File("src/main/resources/nodeA").toURL().toString()));
 
             nodeC.start();
             nodeB.start();
             nodeA.start();
             
-            SCAClient client = (SCAClient)nodeA;
+            Client client = (Client)nodeA;
             calculatorService = 
                 client.getService(CalculatorService.class, "CalculatorServiceComponentA");
 
diff --git a/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index c490150ec5..776b6ffdf7 100644
--- a/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
@@ -30,9 +30,9 @@ import junit.framework.Assert;
 import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;

 import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;

 import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;

-import org.apache.tuscany.sca.node.SCAClient;

-import org.apache.tuscany.sca.node.SCANode;

-import org.apache.tuscany.sca.node.SCANodeFactory;

+import org.apache.tuscany.sca.node.Client;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.After;

 import org.junit.Before;

 import org.junit.Test;

@@ -49,7 +49,7 @@ public class OneWayTestCase {
      */

     private static final int MAX_SLEEP_TIME = 10000;

 

-    private SCANode node;

+    private Node node;

     

     /**

      * Initialise the SCADomain.

@@ -59,7 +59,7 @@ public class OneWayTestCase {
     @Before

     public void setUp() throws Exception {

         

-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();

+        NodeFactory nodeFactory = NodeFactory.newInstance();

         node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null);

         node.start();

         

@@ -84,7 +84,7 @@ public class OneWayTestCase {
     @Test

     public void testOneWay() throws Exception {

         OneWayClient client =

-            ((SCAClient)node).getService(OneWayClient.class, "OneWayClientComponent");

+            ((Client)node).getService(OneWayClient.class, "OneWayClientComponent");

 

         int count = 100;

 

@@ -120,7 +120,7 @@ public class OneWayTestCase {
     @Test

     public void testOneWayUsingNonBlockingInterceptorThrowsAnException() {

         OneWayClient client =

-            ((SCAClient)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");

+            ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");

             

         // We need to modify the JDK Logger for the NonBlockingInterceptor so we

         // can check that it logs a message for the @OneWay invocation that throws

diff --git a/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
index b6e0444d2d..10fbac4e20 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
+++ b/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
@@ -24,9 +24,9 @@ import java.io.ByteArrayInputStream;
 import junit.framework.Assert;
 import helloworld.HelloWorldService;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.ws.security.util.Base64;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -39,18 +39,18 @@ import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 
 public class BasicAuthTestCase {
-    private static SCANode node;
+    private static Node node;
     private static HelloWorldService service;
 
     @BeforeClass
     public static void init() throws Exception {
         try {
-            SCANodeFactory factory = SCANodeFactory.newInstance();
+            NodeFactory factory = NodeFactory.newInstance();
             node = factory.createSCANodeFromClassLoader("helloworld.composite", 
                                                         BasicAuthTestCase.class.getClassLoader());
             node.start();
             
-            service = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
+            service = ((Client)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
         } catch (Exception ex) {
             ex.printStackTrace();
         }
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
index 18809f6af2..f4ba8eb4e6 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,13 +39,13 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class ComponentReferenceTargetNotFoundTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/ComponentReferenceTargetNotFound").toURL().toString()));
         
         try {
@@ -54,7 +54,7 @@ public class ComponentReferenceTargetNotFoundTestCase extends TestCase {
             // do nothing - the SCA binding throws and exception here 
             // because the interface for the reference is not remotable
         }
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
index 83d3064381..96d8debd4a 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
@@ -27,22 +27,22 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
  * This shows how to test the Calculator service component.
  */
 public class DuplicateImplementationPropertyNameTestCase extends TestCase {
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationPropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/DuplicateImplementationPropertyName/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/DuplicateImplementationPropertyName").toURL().toString()));
     }
 
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
index 5b59a69f86..7246d6e0a3 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
@@ -27,9 +27,9 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -37,13 +37,13 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
  */
 public class DuplicateImplementationReferenceNameTestCase extends TestCase {
 
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/DuplicateImplementationReferenceName/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/DuplicateImplementationReferenceName").toURL().toString()));
     }
 
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
index 13534d698d..3ffd10f36f 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class DuplicatePropertyNameTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicatePropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/DuplicatePropertyName/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/DuplicatePropertyName").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 627e1e975e..0e0e4cd2bd 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class DuplicateReferenceNameTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/DuplicateReferenceName/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/DuplicateReferenceName").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
index 2f66235684..45c7af3d1f 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class MultipleBindingsForServiceTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/MultipleBindingsForService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/MultipleBindingsForService/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/MultipleBindingsForService").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
index 48c165ab99..ef2d13aaaa 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
@@ -27,9 +27,9 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -38,13 +38,13 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class NoComponentImplementationTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/NoComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/NoComponentImplementation/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/NoComponentImplementation").toURL().toString()));
     }
 
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
index 35789fbd43..9014fb00e5 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class NoCompositeNamespaceTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/NoCompositeNamespace/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/NoCompositeNamespace/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/NoCompositeNamespace").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
index 94d0e50312..69382b0456 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,17 +39,17 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class NoMatchingBindingTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         node =
-            nodeFactory.createSCANode("Calculator.composite", new SCAContribution("TestContribution", new File("src/main/resources/NoMatchingBinding")
+            nodeFactory.createNode("Calculator.composite", new Contribution("TestContribution", new File("src/main/resources/NoMatchingBinding")
                 .toURL().toString()));
 
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
index afd533bcf4..057039b4df 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class PromotedReferenceNotFoundTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PromotedReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/PromotedReferenceNotFound/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/PromotedReferenceNotFound").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
index 6ca4348f26..cda4f9cb57 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class PromotedServiceNotFoundTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PromotedServiceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/PromotedServiceNotFound/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/PromotedServiceNotFound").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
index 616d2743e2..e8475bb865 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class PropertyAttributeMustSupplyNullTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
index c5b3026322..88721a18e2 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class PropertyAttributeTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/PropertyAttribute/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
index a096cfd41c..1a0739eaa5 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class PropertyNotFoundTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/PropertyNotFound/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/PropertyNotFound").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
index 4558bc7df3..c20c551d92 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class PropertyOverrideManyAttributeTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
index cff24f6616..7ae97638ce 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class ReferenceIncompatibleComponentInterfaceTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/ReferenceIncompatibleComponentInterface").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
index c6b4c65235..6e5eb41ba0 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class ReferenceIncompatibleInterfaceTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleInterface/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/ReferenceIncompatibleInterface/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/ReferenceIncompatibleInterface").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
index c4ba0ecbcd..2eec73f815 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class ReferenceIncompatibleMultiplicityTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/ReferenceIncompatibleMultiplicity").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
index c75d2a0e9d..9b5adee7e6 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class ReferenceWithoutTargetsTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceWithoutTargets/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/ReferenceWithoutTargets/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/ReferenceWithoutTargets").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
index 1215ddf06a..1b8116a469 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
@@ -27,10 +27,10 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class ServiceNotFoundForComponentServiceTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ServiceNotFoundForComponentService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/ServiceNotFoundForComponentService/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/ServiceNotFoundForComponentService").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
index 31cf0779b0..c848cbb243 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
@@ -27,9 +27,9 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -38,13 +38,13 @@ import org.apache.tuscany.sca.node.impl.NodeImpl;
 public class UnresolvedComponentImplementationTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/UnresolvedComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/UnresolvedComponentImplementation/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/UnresolvedComponentImplementation").toURL().toString()));
     }
 
diff --git a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
index 60b08764c1..bcd6637a03 100644
--- a/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ b/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
@@ -22,10 +22,10 @@ import java.io.File;
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 /**
  * This shows how to test the Calculator service component.
@@ -33,18 +33,18 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 public class XSDValidationTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
     private Exception startUpException;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         try {
-            node = nodeFactory.createSCANode(new File("src/main/resources/XsdValidation/Calculator.composite").toURL().toString(),
-            		                 new SCAContribution("TestContribution", 
+            node = nodeFactory.createNode(new File("src/main/resources/XsdValidation/Calculator.composite").toURL().toString(),
+            		                 new Contribution("TestContribution", 
             		                                     new File("src/main/resources/XsdValidation").toURL().toString()));
             node.start();
-            calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+            calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
         } catch (Exception ex){
             startUpException = ex;
         }