diff --git a/trunk/bindings/autogen.sh b/trunk/bindings/autogen.sh
index c005a8cb..f5a9aebd 100644
--- a/trunk/bindings/autogen.sh
+++ b/trunk/bindings/autogen.sh
@@ -1,6 +1,6 @@
 ##### CSharp
 echo "--->CSharp...<---"
-swig -c++ -csharp -outdir csharp -o csharp/tinyWRAP_wrap.cxx csharp/csharp.i
+swig -c++ -csharp -namespace org.doubango.tinyWRAP -outdir csharp -o csharp/tinyWRAP_wrap.cxx csharp/csharp.i
 
 ##### Objective-C
 #echo "--->Objective-C...<---"
diff --git a/trunk/bindings/csharp/ActionConfig.cs b/trunk/bindings/csharp/ActionConfig.cs
index 0cc9b555..26bbd57d 100644
--- a/trunk/bindings/csharp/ActionConfig.cs
+++ b/trunk/bindings/csharp/ActionConfig.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -59,3 +60,5 @@ public class ActionConfig : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/CallSession.cs b/trunk/bindings/csharp/CallSession.cs
index 4822d787..c48e8b6f 100644
--- a/trunk/bindings/csharp/CallSession.cs
+++ b/trunk/bindings/csharp/CallSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -111,3 +112,5 @@ public class CallSession : InviteSession {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/DDebugCallback.cs b/trunk/bindings/csharp/DDebugCallback.cs
index d184e019..83d8a5d8 100644
--- a/trunk/bindings/csharp/DDebugCallback.cs
+++ b/trunk/bindings/csharp/DDebugCallback.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -62,3 +63,5 @@ public class DDebugCallback : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/DialogEvent.cs b/trunk/bindings/csharp/DialogEvent.cs
index 6983e2a9..e8bfc0dc 100644
--- a/trunk/bindings/csharp/DialogEvent.cs
+++ b/trunk/bindings/csharp/DialogEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -38,3 +39,5 @@ public class DialogEvent : SipEvent {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/InviteEvent.cs b/trunk/bindings/csharp/InviteEvent.cs
index b37c9e4e..4c489d69 100644
--- a/trunk/bindings/csharp/InviteEvent.cs
+++ b/trunk/bindings/csharp/InviteEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -66,3 +67,5 @@ public class InviteEvent : SipEvent {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/InviteSession.cs b/trunk/bindings/csharp/InviteSession.cs
index 7c20460c..ba6ce418 100644
--- a/trunk/bindings/csharp/InviteSession.cs
+++ b/trunk/bindings/csharp/InviteSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -71,3 +72,5 @@ public class InviteSession : SipSession {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/MessagingEvent.cs b/trunk/bindings/csharp/MessagingEvent.cs
index b4a52054..6c41de2f 100644
--- a/trunk/bindings/csharp/MessagingEvent.cs
+++ b/trunk/bindings/csharp/MessagingEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -55,3 +56,5 @@ public class MessagingEvent : SipEvent {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/MessagingSession.cs b/trunk/bindings/csharp/MessagingSession.cs
index 90ae93b8..123fad72 100644
--- a/trunk/bindings/csharp/MessagingSession.cs
+++ b/trunk/bindings/csharp/MessagingSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -56,3 +57,5 @@ public class MessagingSession : SipSession {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/MsrpCallback.cs b/trunk/bindings/csharp/MsrpCallback.cs
index aeb2429f..98fd5b3e 100644
--- a/trunk/bindings/csharp/MsrpCallback.cs
+++ b/trunk/bindings/csharp/MsrpCallback.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -69,3 +70,5 @@ public class MsrpCallback : IDisposable {
 
   private static Type[] swigMethodTypes0 = new Type[] { typeof(MsrpEvent) };
 }
+
+}
diff --git a/trunk/bindings/csharp/MsrpEvent.cs b/trunk/bindings/csharp/MsrpEvent.cs
index c015a3b1..92956e3d 100644
--- a/trunk/bindings/csharp/MsrpEvent.cs
+++ b/trunk/bindings/csharp/MsrpEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -56,3 +57,5 @@ public class MsrpEvent : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/MsrpMessage.cs b/trunk/bindings/csharp/MsrpMessage.cs
index 229304b8..13be6f4b 100644
--- a/trunk/bindings/csharp/MsrpMessage.cs
+++ b/trunk/bindings/csharp/MsrpMessage.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -91,3 +92,5 @@ public class MsrpMessage : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/MsrpSession.cs b/trunk/bindings/csharp/MsrpSession.cs
index c236dc76..0ae9d7f6 100644
--- a/trunk/bindings/csharp/MsrpSession.cs
+++ b/trunk/bindings/csharp/MsrpSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -76,3 +77,5 @@ public class MsrpSession : InviteSession {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/OptionsEvent.cs b/trunk/bindings/csharp/OptionsEvent.cs
index 3c15eb59..537e818d 100644
--- a/trunk/bindings/csharp/OptionsEvent.cs
+++ b/trunk/bindings/csharp/OptionsEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -49,3 +50,5 @@ public class OptionsEvent : SipEvent {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/OptionsSession.cs b/trunk/bindings/csharp/OptionsSession.cs
index 0bcbcda6..9b9f2823 100644
--- a/trunk/bindings/csharp/OptionsSession.cs
+++ b/trunk/bindings/csharp/OptionsSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -46,3 +47,5 @@ public class OptionsSession : SipSession {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/ProxyAudioConsumer.cs b/trunk/bindings/csharp/ProxyAudioConsumer.cs
index c076e483..370817b1 100644
--- a/trunk/bindings/csharp/ProxyAudioConsumer.cs
+++ b/trunk/bindings/csharp/ProxyAudioConsumer.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -130,3 +131,5 @@ public class ProxyAudioConsumer : IDisposable {
   private static Type[] swigMethodTypes2 = new Type[] {  };
   private static Type[] swigMethodTypes3 = new Type[] {  };
 }
+
+}
diff --git a/trunk/bindings/csharp/ProxyAudioProducer.cs b/trunk/bindings/csharp/ProxyAudioProducer.cs
index e634b10b..83bcb54a 100644
--- a/trunk/bindings/csharp/ProxyAudioProducer.cs
+++ b/trunk/bindings/csharp/ProxyAudioProducer.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -125,3 +126,5 @@ public class ProxyAudioProducer : IDisposable {
   private static Type[] swigMethodTypes2 = new Type[] {  };
   private static Type[] swigMethodTypes3 = new Type[] {  };
 }
+
+}
diff --git a/trunk/bindings/csharp/ProxyVideoConsumer.cs b/trunk/bindings/csharp/ProxyVideoConsumer.cs
index 566948d3..103c8128 100644
--- a/trunk/bindings/csharp/ProxyVideoConsumer.cs
+++ b/trunk/bindings/csharp/ProxyVideoConsumer.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -139,3 +140,5 @@ public class ProxyVideoConsumer : IDisposable {
   private static Type[] swigMethodTypes3 = new Type[] {  };
   private static Type[] swigMethodTypes4 = new Type[] {  };
 }
+
+}
diff --git a/trunk/bindings/csharp/ProxyVideoFrame.cs b/trunk/bindings/csharp/ProxyVideoFrame.cs
index aa225f9f..48cb7cb8 100644
--- a/trunk/bindings/csharp/ProxyVideoFrame.cs
+++ b/trunk/bindings/csharp/ProxyVideoFrame.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -49,3 +50,5 @@ public class ProxyVideoFrame : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/ProxyVideoProducer.cs b/trunk/bindings/csharp/ProxyVideoProducer.cs
index a0f73a1f..ef47c63d 100644
--- a/trunk/bindings/csharp/ProxyVideoProducer.cs
+++ b/trunk/bindings/csharp/ProxyVideoProducer.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -125,3 +126,5 @@ public class ProxyVideoProducer : IDisposable {
   private static Type[] swigMethodTypes2 = new Type[] {  };
   private static Type[] swigMethodTypes3 = new Type[] {  };
 }
+
+}
diff --git a/trunk/bindings/csharp/PublicationEvent.cs b/trunk/bindings/csharp/PublicationEvent.cs
index 47d61790..55de1e3f 100644
--- a/trunk/bindings/csharp/PublicationEvent.cs
+++ b/trunk/bindings/csharp/PublicationEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -49,3 +50,5 @@ public class PublicationEvent : SipEvent {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/PublicationSession.cs b/trunk/bindings/csharp/PublicationSession.cs
index 1fb19b06..375c8e54 100644
--- a/trunk/bindings/csharp/PublicationSession.cs
+++ b/trunk/bindings/csharp/PublicationSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -51,3 +52,5 @@ public class PublicationSession : SipSession {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/RPMessage.cs b/trunk/bindings/csharp/RPMessage.cs
index 4b990667..c984c070 100644
--- a/trunk/bindings/csharp/RPMessage.cs
+++ b/trunk/bindings/csharp/RPMessage.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -57,3 +58,5 @@ public class RPMessage : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/RegistrationEvent.cs b/trunk/bindings/csharp/RegistrationEvent.cs
index f2580182..88a26a35 100644
--- a/trunk/bindings/csharp/RegistrationEvent.cs
+++ b/trunk/bindings/csharp/RegistrationEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -49,3 +50,5 @@ public class RegistrationEvent : SipEvent {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/RegistrationSession.cs b/trunk/bindings/csharp/RegistrationSession.cs
index 076392cd..41866552 100644
--- a/trunk/bindings/csharp/RegistrationSession.cs
+++ b/trunk/bindings/csharp/RegistrationSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -51,3 +52,5 @@ public class RegistrationSession : SipSession {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SMSData.cs b/trunk/bindings/csharp/SMSData.cs
index 0ca88001..4d17a218 100644
--- a/trunk/bindings/csharp/SMSData.cs
+++ b/trunk/bindings/csharp/SMSData.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -72,3 +73,5 @@ public class SMSData : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SMSEncoder.cs b/trunk/bindings/csharp/SMSEncoder.cs
index d3537ee2..30eaaff2 100644
--- a/trunk/bindings/csharp/SMSEncoder.cs
+++ b/trunk/bindings/csharp/SMSEncoder.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -69,3 +70,5 @@ public class SMSEncoder : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SafeObject.cs b/trunk/bindings/csharp/SafeObject.cs
index faffa622..28217da6 100644
--- a/trunk/bindings/csharp/SafeObject.cs
+++ b/trunk/bindings/csharp/SafeObject.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -52,3 +53,5 @@ public class SafeObject : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SdpMessage.cs b/trunk/bindings/csharp/SdpMessage.cs
index 03ebb21e..2a54b1a5 100644
--- a/trunk/bindings/csharp/SdpMessage.cs
+++ b/trunk/bindings/csharp/SdpMessage.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -57,3 +58,5 @@ public class SdpMessage : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SipCallback.cs b/trunk/bindings/csharp/SipCallback.cs
index 46dbae41..1a5ae0a6 100644
--- a/trunk/bindings/csharp/SipCallback.cs
+++ b/trunk/bindings/csharp/SipCallback.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -167,3 +168,5 @@ public class SipCallback : IDisposable {
   private static Type[] swigMethodTypes6 = new Type[] { typeof(RegistrationEvent) };
   private static Type[] swigMethodTypes7 = new Type[] { typeof(SubscriptionEvent) };
 }
+
+}
diff --git a/trunk/bindings/csharp/SipEvent.cs b/trunk/bindings/csharp/SipEvent.cs
index 172c7f12..f81cc554 100644
--- a/trunk/bindings/csharp/SipEvent.cs
+++ b/trunk/bindings/csharp/SipEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -61,3 +62,5 @@ public class SipEvent : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SipMessage.cs b/trunk/bindings/csharp/SipMessage.cs
index 52c34245..01fde2de 100644
--- a/trunk/bindings/csharp/SipMessage.cs
+++ b/trunk/bindings/csharp/SipMessage.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -88,3 +89,5 @@ public class SipMessage : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SipSession.cs b/trunk/bindings/csharp/SipSession.cs
index fa958b5b..d3d46e77 100644
--- a/trunk/bindings/csharp/SipSession.cs
+++ b/trunk/bindings/csharp/SipSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -107,3 +108,5 @@ public class SipSession : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SipStack.cs b/trunk/bindings/csharp/SipStack.cs
index cbce1cc3..4cfdd8fc 100644
--- a/trunk/bindings/csharp/SipStack.cs
+++ b/trunk/bindings/csharp/SipStack.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -194,3 +195,5 @@ public class SipStack : SafeObject {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SipUri.cs b/trunk/bindings/csharp/SipUri.cs
index 4f7c91e5..0db641ea 100644
--- a/trunk/bindings/csharp/SipUri.cs
+++ b/trunk/bindings/csharp/SipUri.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -87,3 +88,5 @@ public class SipUri : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/StackEvent.cs b/trunk/bindings/csharp/StackEvent.cs
index 861ed15a..e2220426 100644
--- a/trunk/bindings/csharp/StackEvent.cs
+++ b/trunk/bindings/csharp/StackEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -38,3 +39,5 @@ public class StackEvent : SipEvent {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SubscriptionEvent.cs b/trunk/bindings/csharp/SubscriptionEvent.cs
index b1807a79..a00691c4 100644
--- a/trunk/bindings/csharp/SubscriptionEvent.cs
+++ b/trunk/bindings/csharp/SubscriptionEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -49,3 +50,5 @@ public class SubscriptionEvent : SipEvent {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/SubscriptionSession.cs b/trunk/bindings/csharp/SubscriptionSession.cs
index e0cd4930..abefa128 100644
--- a/trunk/bindings/csharp/SubscriptionSession.cs
+++ b/trunk/bindings/csharp/SubscriptionSession.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -51,3 +52,5 @@ public class SubscriptionSession : SipSession {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/XcapCallback.cs b/trunk/bindings/csharp/XcapCallback.cs
index 39b44a9f..29af4217 100644
--- a/trunk/bindings/csharp/XcapCallback.cs
+++ b/trunk/bindings/csharp/XcapCallback.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -69,3 +70,5 @@ public class XcapCallback : IDisposable {
 
   private static Type[] swigMethodTypes0 = new Type[] { typeof(XcapEvent) };
 }
+
+}
diff --git a/trunk/bindings/csharp/XcapEvent.cs b/trunk/bindings/csharp/XcapEvent.cs
index 12f6dfb1..4358aec4 100644
--- a/trunk/bindings/csharp/XcapEvent.cs
+++ b/trunk/bindings/csharp/XcapEvent.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -50,3 +51,5 @@ public class XcapEvent : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/XcapMessage.cs b/trunk/bindings/csharp/XcapMessage.cs
index 62bfdc36..38506448 100644
--- a/trunk/bindings/csharp/XcapMessage.cs
+++ b/trunk/bindings/csharp/XcapMessage.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -82,3 +83,5 @@ public class XcapMessage : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/XcapSelector.cs b/trunk/bindings/csharp/XcapSelector.cs
index 60f6fcbb..bb420a10 100644
--- a/trunk/bindings/csharp/XcapSelector.cs
+++ b/trunk/bindings/csharp/XcapSelector.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -87,3 +88,5 @@ public class XcapSelector : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/XcapStack.cs b/trunk/bindings/csharp/XcapStack.cs
index 5d22342f..ff4dd9cc 100644
--- a/trunk/bindings/csharp/XcapStack.cs
+++ b/trunk/bindings/csharp/XcapStack.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -92,3 +93,5 @@ public class XcapStack : IDisposable {
   }
 
 }
+
+}
diff --git a/trunk/bindings/csharp/tdav_codec_id_t.cs b/trunk/bindings/csharp/tdav_codec_id_t.cs
index 27d660dc..a094d390 100644
--- a/trunk/bindings/csharp/tdav_codec_id_t.cs
+++ b/trunk/bindings/csharp/tdav_codec_id_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tdav_codec_id_t {
   tdav_codec_id_amr_nb_oa = 0x00000001 << 0,
@@ -32,3 +33,5 @@ public enum tdav_codec_id_t {
   tdav_codec_id_h264_bp30 = 0x00010000 << 6,
   tdav_codec_id_theora = 0x00010000 << 7
 }
+
+}
diff --git a/trunk/bindings/csharp/thttp_event_type_t.cs b/trunk/bindings/csharp/thttp_event_type_t.cs
index ee58536b..d268567c 100644
--- a/trunk/bindings/csharp/thttp_event_type_t.cs
+++ b/trunk/bindings/csharp/thttp_event_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum thttp_event_type_t {
   thttp_event_message,
@@ -13,3 +14,5 @@ public enum thttp_event_type_t {
   thttp_event_closed,
   thttp_event_transport_error
 }
+
+}
diff --git a/trunk/bindings/csharp/tinyWRAP.cs b/trunk/bindings/csharp/tinyWRAP.cs
index dc1929ea..9c81dacc 100644
--- a/trunk/bindings/csharp/tinyWRAP.cs
+++ b/trunk/bindings/csharp/tinyWRAP.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -26,3 +27,5 @@ public class tinyWRAP {
   public static readonly int tsip_event_code_stack_failed_to_start = tinyWRAPPINVOKE.tsip_event_code_stack_failed_to_start_get();
   public static readonly int tsip_event_code_stack_failed_to_stop = tinyWRAPPINVOKE.tsip_event_code_stack_failed_to_stop_get();
 }
+
+}
diff --git a/trunk/bindings/csharp/tinyWRAPPINVOKE.cs b/trunk/bindings/csharp/tinyWRAPPINVOKE.cs
index 2b980a94..b7be0561 100644
--- a/trunk/bindings/csharp/tinyWRAPPINVOKE.cs
+++ b/trunk/bindings/csharp/tinyWRAPPINVOKE.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 using System;
 using System.Runtime.InteropServices;
@@ -1270,3 +1271,5 @@ class tinyWRAPPINVOKE {
   [DllImport("tinyWRAP", EntryPoint="CSharp_SipStackUpcast")]
   public static extern IntPtr SipStackUpcast(IntPtr objectRef);
 }
+
+}
diff --git a/trunk/bindings/csharp/tmedia_bandwidth_level_t.cs b/trunk/bindings/csharp/tmedia_bandwidth_level_t.cs
index 559c7573..6e1349bf 100644
--- a/trunk/bindings/csharp/tmedia_bandwidth_level_t.cs
+++ b/trunk/bindings/csharp/tmedia_bandwidth_level_t.cs
@@ -6,9 +6,12 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tmedia_bandwidth_level_t {
   tmedia_bl_low,
   tmedia_bl_medium,
   tmedia_bl_hight
 }
+
+}
diff --git a/trunk/bindings/csharp/tmedia_chroma_t.cs b/trunk/bindings/csharp/tmedia_chroma_t.cs
index bef9dea4..aac13b96 100644
--- a/trunk/bindings/csharp/tmedia_chroma_t.cs
+++ b/trunk/bindings/csharp/tmedia_chroma_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tmedia_chroma_t {
   tmedia_rgb24,
@@ -18,3 +19,5 @@ public enum tmedia_chroma_t {
   tmedia_uyvy422,
   tmedia_yuv420p
 }
+
+}
diff --git a/trunk/bindings/csharp/tmedia_qos_strength_t.cs b/trunk/bindings/csharp/tmedia_qos_strength_t.cs
index c3b4fb3c..6727f16e 100644
--- a/trunk/bindings/csharp/tmedia_qos_strength_t.cs
+++ b/trunk/bindings/csharp/tmedia_qos_strength_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tmedia_qos_strength_t {
   tmedia_qos_strength_none,
@@ -14,3 +15,5 @@ public enum tmedia_qos_strength_t {
   tmedia_qos_strength_optional,
   tmedia_qos_strength_mandatory
 }
+
+}
diff --git a/trunk/bindings/csharp/tmedia_qos_stype_t.cs b/trunk/bindings/csharp/tmedia_qos_stype_t.cs
index 525c9a8a..22d93fac 100644
--- a/trunk/bindings/csharp/tmedia_qos_stype_t.cs
+++ b/trunk/bindings/csharp/tmedia_qos_stype_t.cs
@@ -6,9 +6,12 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tmedia_qos_stype_t {
   tmedia_qos_stype_none,
   tmedia_qos_stype_segmented,
   tmedia_qos_stype_e2e
 }
+
+}
diff --git a/trunk/bindings/csharp/tmsrp_event_type_t.cs b/trunk/bindings/csharp/tmsrp_event_type_t.cs
index 833a78b3..f11ee64a 100644
--- a/trunk/bindings/csharp/tmsrp_event_type_t.cs
+++ b/trunk/bindings/csharp/tmsrp_event_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tmsrp_event_type_t {
   tmsrp_event_type_none,
@@ -13,3 +14,5 @@ public enum tmsrp_event_type_t {
   tmsrp_event_type_disconnected,
   tmsrp_event_type_message
 }
+
+}
diff --git a/trunk/bindings/csharp/tmsrp_request_type_t.cs b/trunk/bindings/csharp/tmsrp_request_type_t.cs
index 99520d39..a3f53cce 100644
--- a/trunk/bindings/csharp/tmsrp_request_type_t.cs
+++ b/trunk/bindings/csharp/tmsrp_request_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tmsrp_request_type_t {
   tmsrp_NONE = 0,
@@ -13,3 +14,5 @@ public enum tmsrp_request_type_t {
   tmsrp_REPORT,
   tmsrp_AUTH
 }
+
+}
diff --git a/trunk/bindings/csharp/tsip_event_type_t.cs b/trunk/bindings/csharp/tsip_event_type_t.cs
index 16321d11..232f02f7 100644
--- a/trunk/bindings/csharp/tsip_event_type_t.cs
+++ b/trunk/bindings/csharp/tsip_event_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tsip_event_type_t {
   tsip_event_invite,
@@ -16,3 +17,5 @@ public enum tsip_event_type_t {
   tsip_event_subscribe,
   tsip_event_dialog
 }
+
+}
diff --git a/trunk/bindings/csharp/tsip_invite_event_type_t.cs b/trunk/bindings/csharp/tsip_invite_event_type_t.cs
index 9f8c9437..0ddd5b69 100644
--- a/trunk/bindings/csharp/tsip_invite_event_type_t.cs
+++ b/trunk/bindings/csharp/tsip_invite_event_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tsip_invite_event_type_t {
   tsip_i_newcall,
@@ -22,3 +23,5 @@ public enum tsip_invite_event_type_t {
   tsip_m_remote_hold,
   tsip_m_remote_resume
 }
+
+}
diff --git a/trunk/bindings/csharp/tsip_message_event_type_t.cs b/trunk/bindings/csharp/tsip_message_event_type_t.cs
index 8ff95512..b4072593 100644
--- a/trunk/bindings/csharp/tsip_message_event_type_t.cs
+++ b/trunk/bindings/csharp/tsip_message_event_type_t.cs
@@ -6,8 +6,11 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tsip_message_event_type_t {
   tsip_i_message,
   tsip_ao_message
 }
+
+}
diff --git a/trunk/bindings/csharp/tsip_options_event_type_t.cs b/trunk/bindings/csharp/tsip_options_event_type_t.cs
index 56ff1a1f..b90d62bf 100644
--- a/trunk/bindings/csharp/tsip_options_event_type_t.cs
+++ b/trunk/bindings/csharp/tsip_options_event_type_t.cs
@@ -6,8 +6,11 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tsip_options_event_type_t {
   tsip_i_options,
   tsip_ao_options
 }
+
+}
diff --git a/trunk/bindings/csharp/tsip_publish_event_type_t.cs b/trunk/bindings/csharp/tsip_publish_event_type_t.cs
index cae8a599..52b850b0 100644
--- a/trunk/bindings/csharp/tsip_publish_event_type_t.cs
+++ b/trunk/bindings/csharp/tsip_publish_event_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tsip_publish_event_type_t {
   tsip_i_publish,
@@ -13,3 +14,5 @@ public enum tsip_publish_event_type_t {
   tsip_i_unpublish,
   tsip_ao_unpublish
 }
+
+}
diff --git a/trunk/bindings/csharp/tsip_register_event_type_t.cs b/trunk/bindings/csharp/tsip_register_event_type_t.cs
index a8992b94..46d53de1 100644
--- a/trunk/bindings/csharp/tsip_register_event_type_t.cs
+++ b/trunk/bindings/csharp/tsip_register_event_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tsip_register_event_type_t {
   tsip_i_register,
@@ -13,3 +14,5 @@ public enum tsip_register_event_type_t {
   tsip_i_unregister,
   tsip_ao_unregister
 }
+
+}
diff --git a/trunk/bindings/csharp/tsip_subscribe_event_type_t.cs b/trunk/bindings/csharp/tsip_subscribe_event_type_t.cs
index a3b825f7..afaa290e 100644
--- a/trunk/bindings/csharp/tsip_subscribe_event_type_t.cs
+++ b/trunk/bindings/csharp/tsip_subscribe_event_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum tsip_subscribe_event_type_t {
   tsip_i_subscribe,
@@ -15,3 +16,5 @@ public enum tsip_subscribe_event_type_t {
   tsip_i_notify,
   tsip_ao_notify
 }
+
+}
diff --git a/trunk/bindings/csharp/twrap_media_type_t.cs b/trunk/bindings/csharp/twrap_media_type_t.cs
index 44d36267..b0f1b404 100644
--- a/trunk/bindings/csharp/twrap_media_type_t.cs
+++ b/trunk/bindings/csharp/twrap_media_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum twrap_media_type_t {
   twrap_media_none,
@@ -14,3 +15,5 @@ public enum twrap_media_type_t {
   twrap_media_audiovideo,
   twrap_media_msrp
 }
+
+}
diff --git a/trunk/bindings/csharp/twrap_rpmessage_type_t.cs b/trunk/bindings/csharp/twrap_rpmessage_type_t.cs
index a61de199..03cde348 100644
--- a/trunk/bindings/csharp/twrap_rpmessage_type_t.cs
+++ b/trunk/bindings/csharp/twrap_rpmessage_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum twrap_rpmessage_type_t {
   twrap_rpmessage_type_sms_none,
@@ -14,3 +15,5 @@ public enum twrap_rpmessage_type_t {
   twrap_rpmessage_type_sms_ack,
   twrap_rpmessage_type_sms_error
 }
+
+}
diff --git a/trunk/bindings/csharp/twrap_sms_type_t.cs b/trunk/bindings/csharp/twrap_sms_type_t.cs
index a9552d86..42980dd1 100644
--- a/trunk/bindings/csharp/twrap_sms_type_t.cs
+++ b/trunk/bindings/csharp/twrap_sms_type_t.cs
@@ -6,6 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
+namespace org.doubango.tinyWRAP {
 
 public enum twrap_sms_type_t {
   twrap_sms_type_none,
@@ -14,3 +15,5 @@ public enum twrap_sms_type_t {
   twrap_sms_type_ack,
   twrap_sms_type_error
 }
+
+}