1 files changed, 21 insertions, 21 deletions
diff --git a/CSharp/Ivy/Ivy/IvyDomain.cs b/CSharp/Ivy/Ivy/IvyDomain.cs
index fe2d3b8..7318875 100644
--- a/CSharp/Ivy/Ivy/IvyDomain.cs
+++ b/CSharp/Ivy/Ivy/IvyDomain.cs
@@ -17,15 +17,15 @@ namespace IvyBus
         [Category("Ivy")]
         public string AppName
         {
-            get { return appname; }
-            set { appname = value; }
+            get { return ivy.AppName; }
+            set { ivy.AppName = value; }
         }
 
         [Category("Ivy")]
         public string AppReadyMessage
         {
-            get { return ready; }
-            set { ready = value; }
+            get { return ivy.ready_message; }
+            set { ivy.ready_message = value; }
         }
 
         [Category("Ivy")]
@@ -35,55 +35,55 @@ namespace IvyBus
             set { ivybus.Text = value; }
         }
         [Category("Ivy")]
-        public event Ivy.ClientConnectedHandler clientConnected
+        public event Ivy.ClientConnectedHandler ClientConnected
         {
         add
         {
-            ivy.clientConnected += value;
+            ivy.ClientConnected += value;
         }
         remove
         {
-            ivy.clientConnected -= value;
+            ivy.ClientConnected -= value;
         }
         }
         [Category("Ivy")]
-        public event Ivy.ClientDisconnectedHandler clientDisconnected
+        public event Ivy.ClientDisconnectedHandler ClientDisconnected
         {
             add
             {
-                ivy.clientDisconnected += value;
+                ivy.ClientDisconnected += value;
             }
             remove
             {
-                ivy.clientDisconnected -= value;
+                ivy.ClientDisconnected -= value;
             }
         }
         [Category("Ivy")]
-        public event Ivy.ClientAddBindingHandler addBinding
+        public event Ivy.ClientAddBindingHandler BindingAdd
         {
             add
             {
-                ivy.addBinding += value;
+                ivy.BindingAdd += value;
             }
             remove
             {
-                ivy.addBinding -= value;
+                ivy.BindingAdd -= value;
             }
         }
         [Category("Ivy")]
-        public event Ivy.ClientRemoveBindingHandler removeBinding
+        public event Ivy.ClientRemoveBindingHandler BindingRemove
         {
             add
             {
-                ivy.removeBinding += value;
+                ivy.BindingRemove += value;
             }
             remove
             {
-                ivy.removeBinding -= value;
+                ivy.BindingRemove -= value;
             }
         }
         [Category("Ivy")]
-        public event Ivy.DieHandler dieReceived
+        public event Ivy.DieHandler DieReceived
         {
             add
             {
@@ -95,15 +95,15 @@ namespace IvyBus
             }
         }
         [Category("Ivy")]
-        public event Ivy.DirectMessageHandler directMessageReceived
+        public event Ivy.DirectMessageHandler DirectMessageReceived
         {
             add
             {
-                ivy.directMessageReceived += value;
+                ivy.DirectMessageReceived += value;
             }
             remove
             {
-                ivy.directMessageReceived -= value;
+                ivy.DirectMessageReceived -= value;
             }
         }
         
@@ -111,6 +111,7 @@ namespace IvyBus
         public IvyDomain()
         {
             InitializeComponent();
+            ivy = new Ivy(this);
         }
 
 
@@ -128,7 +129,6 @@ namespace IvyBus
         private void IvyDomain_Load(object sender, EventArgs e)
         {
             ivybus.Text = Ivy.getDomain(ivybus.Text);
-            ivy = new Ivy(appname, ready, this);
             ivy.start(ivybus.Text);
         }