2 files changed, 9 insertions, 9 deletions
diff --git a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
index 0025c85f79..3ff6c8969a 100644
--- a/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
+++ b/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
@@ -20,7 +20,7 @@
 package node;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.launcher.NodeLauncher;
 import org.osoa.sca.ServiceRuntimeException;
 
@@ -29,7 +29,7 @@ import calculator.CalculatorService;
 public class LaunchCalculatorNodeA {
     public static void main(String[] args) throws Exception {
         
-        SCANode2 node = null;
+        SCANode node = null;
         try {
             
             NodeLauncher nodeLauncher = NodeLauncher.newInstance();
diff --git a/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
index 9c3f06ee53..2a6f3af002 100644
--- a/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
+++ b/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
@@ -22,8 +22,8 @@ package calculator;
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -35,10 +35,10 @@ import org.junit.Test;
  */
 public class CalculatorDistributedTestCase {
 
-    private static SCANode2 manager;
-    private static SCANode2 nodeA;
-    private static SCANode2 nodeB;
-    private static SCANode2 nodeC;
+    private static SCANode manager;
+    private static SCANode nodeA;
+    private static SCANode nodeB;
+    private static SCANode nodeC;
 
     private static CalculatorService calculatorService;
     
@@ -53,7 +53,7 @@ public class CalculatorDistributedTestCase {
             manager = managerLauncher.createDomainManager();
             manager.start();
             
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
             nodeC  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeC");
             nodeB  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeB");
             nodeA  = nodeFactory.createSCANodeFromURL("http://localhost:9990/node-config/NodeA");