5 files changed, 17 insertions, 18 deletions
diff --git a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleDataModel.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomDataModel.cs
index 4d70594..b2ee1de 100644
--- a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleDataModel.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomDataModel.cs
@@ -4,13 +4,13 @@ using System.Linq;
 using System.Text;
 using org.uscxml;
 
-namespace EmbeddedDataModel
+namespace embedding
 {
-    class SampleDataModel : DataModel
+    class CustomDataModel : DataModel
     {
         public override DataModel create(Interpreter interpreter)
         {
-            return new SampleDataModel();
+            return new CustomDataModel();
         }
 
         public override void eval(string scriptElem, string expr)
@@ -54,10 +54,9 @@ namespace EmbeddedDataModel
             return names;
         }
 
-        public override DataNative getStringAsData(string content)
+        public override Data getStringAsData(string content)
         {
-            // DataNative ought to be wrapped by a Data.cs class - used to carry JSONesque structures
-            DataNative data = new DataNative();
+            Data data = new Data();
             return data;
         }
 
diff --git a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleExecutableContent.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomExecutableContent.cs
index a86776f..4789020 100644
--- a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleExecutableContent.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomExecutableContent.cs
@@ -6,7 +6,7 @@ using org.uscxml;
 
 namespace embedding
 {
-    class SampleExecutableContent : ExecutableContent
+    class CustomExecutableContent : ExecutableContent
     {
         public override string getLocalName()
         {
@@ -25,7 +25,7 @@ namespace embedding
 
         public override ExecutableContent create(Interpreter interpreter) 
         {
-            return new SampleExecutableContent();
+            return new CustomExecutableContent();
         }
 
 
diff --git a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleIOProc.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomIOProc.cs
index 5abbf37..0480a34 100644
--- a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleIOProc.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomIOProc.cs
@@ -6,16 +6,16 @@ using org.uscxml;
 
 namespace embedding
 {
-    class SampleIOProc : IOProcessor
+    class CustomIOProc : IOProcessor
     {
         public override IOProcessor create(Interpreter interpreter)
         {
-            return new SampleIOProc();
+            return new CustomIOProc();
         }
 
-        public override DataNative getDataModelVariables()
+        public override Data getDataModelVariables()
         {
-            DataNative data = new DataNative();
+            Data data = new Data();
             return data;
         }
 
diff --git a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleInterpreterMonitor.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomInterpreterMonitor.cs
index 2a2f561..8009aa0 100644
--- a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleInterpreterMonitor.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomInterpreterMonitor.cs
@@ -6,7 +6,7 @@ using org.uscxml;
 
 namespace embedding
 {
-    class SampleInterpreterMonitor : InterpreterMonitor
+    class CustomInterpreterMonitor : InterpreterMonitor
     {
         public override void afterCompletion(Interpreter interpreter) { }
         public override void afterMicroStep(Interpreter interpreter) { }
diff --git a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleInvoker.cs b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomInvoker.cs
index f5fb363..3fd01ce 100644
--- a/embedding/csharp/uSCXMLEmbedding/Extensions/SampleInvoker.cs
+++ b/embedding/csharp/uSCXMLEmbedding/Extensions/CustomInvoker.cs
@@ -4,18 +4,18 @@ using System.Linq;
 using System.Text;
 using org.uscxml;
 
-namespace EmbeddedInvoker
+namespace embedding
 {
-    class SampleInvoker : Invoker
+    class CustomInvoker : Invoker
     {
         public override Invoker create(Interpreter interpreter)
         {
-            return new SampleInvoker();
+            return new CustomInvoker();
         }
 
-        public override DataNative getDataModelVariables()
+        public override Data getDataModelVariables()
         {
-            DataNative data = new DataNative();
+            Data data = new Data();
             return data;
         }