From f69f2848b4ae05ea2f368add0c202a3fd05f71ad Mon Sep 17 00:00:00 2001
From: "dongsug.song" <dongsug.song@samsung.com>
Date: Thu, 16 Feb 2017 16:31:38 +0900
Subject: [PATCH] Dali C#: version upgrade 1.2.25 sync with tizen branch

Change-Id: Ib4b7f0cf67b7792dcc64cec1c33db7d6149b53be
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
---
 dali-csharp-binder/file.list                   |    1 +
 dali-csharp-binder/src/dali_wrap.cpp           | 9758 +++++++++++++-----------
 dali-csharp-binder/src/dali_wrap.h             |   22 +
 dali-csharp-binder/src/devel-property-wrap.cpp |  211 +
 packaging/dali-csharp-binder.spec              |    4 +-
 5 files changed, 5374 insertions(+), 4622 deletions(-)
 create mode 100644 dali-csharp-binder/src/devel-property-wrap.cpp

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index badac53..7deef5c 100755
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -6,6 +6,7 @@ dali_csharp_binder_src_files = \
   src/dali_wrap.cpp \
   src/callbackbase_wrap.cpp \
   src/keyboard_focus_manager_wrap.cpp \
+  src/devel-property-wrap.cpp \
   src/view-wrapper-impl-wrap.cpp 
 
 dali_csharp_binder_header_files = \
diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index 6392d1d..5b84be0 100644
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -427,6 +427,8 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) {
 #include <dali/public-api/math/matrix3.h>
 #include <dali/public-api/math/viewport.h>
 #include <dali/public-api/object/property-key.h>
+#include <dali/devel-api/object/csharp-type-info.h>
+#include <dali/devel-api/object/csharp-type-registry.h>
 
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/adaptor-framework/window.h>
@@ -447,6 +449,7 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) {
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/devel-api/controls/buttons/toggle-button.h>
 
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
@@ -454,6 +457,8 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) {
 
 #include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
+#include <dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h>
+
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 
 // add here SWIG version check
@@ -633,6 +638,12 @@ SWIGINTERN bool Dali_BaseHandle_IsEqual(Dali::BaseHandle const *self,Dali::BaseH
        return false;
      }
     }
+SWIGINTERN void Dali_TypeRegistration_RegisterControl(std::string const &controlName,Dali::CSharpTypeInfo::CreateFunction createFunc){
+     Dali::CSharpTypeRegistry::RegisterType( controlName, typeid( Dali::Toolkit::Control), createFunc );
+   }
+SWIGINTERN void Dali_TypeRegistration_RegisterProperty(std::string const &controlName,std::string const &propertyName,int index,Dali::Property::Type type,Dali::CSharpTypeInfo::SetPropertyFunction setFunc,Dali::CSharpTypeInfo::GetPropertyFunction getFunc){
+     Dali::CSharpTypeRegistry::RegisterProperty( controlName, propertyName, index, type, setFunc, getFunc );
+   }
 SWIGINTERN std::vector< Dali::TouchPoint > *new_std_vector_Sl_Dali_TouchPoint_Sg___SWIG_2(int capacity){
         std::vector< Dali::TouchPoint >* pv = 0;
         if (capacity >= 0) {
@@ -1359,21 +1370,6 @@ SWIGINTERN void Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP_
 SWIGINTERN bool Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Emit(Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *self,Dali::Toolkit::AccessibilityManager &arg){
           return self->Emit( arg );
       }
-SWIGINTERN bool Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Empty(Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > const *self){
-         return self->Empty();
-      }
-SWIGINTERN std::size_t Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__GetConnectionCount(Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > const *self){
-        return self->GetConnectionCount();
-      }
-SWIGINTERN void Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Connect(Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *self,bool (*func)(Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &)){
-        self->Connect( func );
-      }
-SWIGINTERN void Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Disconnect(Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *self,bool (*func)(Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &)){
-        self->Disconnect( func );
-      }
-SWIGINTERN bool Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Emit(Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *self,Dali::Toolkit::AccessibilityManager &arg1,Dali::TouchEvent const &arg2){
-        return self->Emit( arg1, arg2 );
-      }
 SWIGINTERN bool Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_Dali_Toolkit_AccessibilityManager_FocusOvershotDirection_SP__Sg__Empty(Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > const *self){
          return self->Empty();
       }
@@ -2293,12 +2289,83 @@ void SwigDirector_ViewImpl::swig_init_callbacks() {
   swig_callbackSignalDisconnected = 0;
 }
 
+SwigDirector_ItemFactory::SwigDirector_ItemFactory() : Dali::Toolkit::ItemFactory(), Swig::Director() {
+  swig_init_callbacks();
+}
+
+SwigDirector_ItemFactory::~SwigDirector_ItemFactory() {
+  
+}
+
+
+unsigned int SwigDirector_ItemFactory::GetNumberOfItems() {
+  unsigned int c_result = SwigValueInit< unsigned int >() ;
+  unsigned int jresult = 0 ;
+  
+  if (!swig_callbackGetNumberOfItems) {
+    throw Swig::DirectorPureVirtualException("Dali::Toolkit::ItemFactory::GetNumberOfItems");
+  } else {
+    jresult = (unsigned int) swig_callbackGetNumberOfItems();
+    c_result = (unsigned int)jresult; 
+  }
+  return c_result;
+}
+
+Dali::Actor SwigDirector_ItemFactory::NewItem(unsigned int itemId) {
+  Dali::Actor c_result ;
+  void * jresult = 0 ;
+  unsigned int jitemId  ;
+  
+  if (!swig_callbackNewItem) {
+    throw Swig::DirectorPureVirtualException("Dali::Toolkit::ItemFactory::NewItem");
+  } else {
+    jitemId = itemId;
+    jresult = (void *) swig_callbackNewItem(jitemId);
+    if (!jresult) {
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Unexpected null return for type Dali::Actor", 0);
+      return c_result;
+    }
+    c_result = *(Dali::Actor *)jresult; 
+  }
+  return c_result;
+}
+
+void SwigDirector_ItemFactory::ItemReleased(unsigned int itemId, Dali::Actor actor) {
+  unsigned int jitemId  ;
+  void * jactor  ;
+  
+  if (!swig_callbackItemReleased) {
+    Dali::Toolkit::ItemFactory::ItemReleased(itemId,actor);
+    return;
+  } else {
+    jitemId = itemId;
+    jactor = (void *)new Dali::Actor((const Dali::Actor &)actor); 
+    swig_callbackItemReleased(jitemId, jactor);
+  }
+}
+
+Dali::Toolkit::ItemFactory::Extension *SwigDirector_ItemFactory::GetExtension() {
+  return Dali::Toolkit::ItemFactory::GetExtension();
+}
+
+void SwigDirector_ItemFactory::swig_connect_director(SWIG_Callback0_t callbackGetNumberOfItems, SWIG_Callback1_t callbackNewItem, SWIG_Callback2_t callbackItemReleased) {
+  swig_callbackGetNumberOfItems = callbackGetNumberOfItems;
+  swig_callbackNewItem = callbackNewItem;
+  swig_callbackItemReleased = callbackItemReleased;
+}
+
+void SwigDirector_ItemFactory::swig_init_callbacks() {
+  swig_callbackGetNumberOfItems = 0;
+  swig_callbackNewItem = 0;
+  swig_callbackItemReleased = 0;
+}
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_floatp() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_floatp() {
   void * jresult ;
   floatp *result = 0 ;
   
@@ -2324,7 +2391,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_floatp() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_floatp(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_floatp(void * jarg1) {
   floatp *arg1 = (floatp *) 0 ;
   
   arg1 = (floatp *)jarg1; 
@@ -2348,7 +2415,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_floatp(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_floatp_assign(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_floatp_assign(void * jarg1, float jarg2) {
   floatp *arg1 = (floatp *) 0 ;
   float arg2 ;
   
@@ -2374,7 +2441,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_floatp_assign(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_floatp_value(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_floatp_value(void * jarg1) {
   float jresult ;
   floatp *arg1 = (floatp *) 0 ;
   float result;
@@ -2402,7 +2469,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_floatp_value(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_floatp_cast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_floatp_cast(void * jarg1) {
   void * jresult ;
   floatp *arg1 = (floatp *) 0 ;
   float *result = 0 ;
@@ -2430,7 +2497,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_floatp_cast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_floatp_frompointer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_floatp_frompointer(void * jarg1) {
   void * jresult ;
   float *arg1 = (float *) 0 ;
   floatp *result = 0 ;
@@ -2458,7 +2525,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_floatp_frompointer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_intp() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_intp() {
   void * jresult ;
   intp *result = 0 ;
   
@@ -2484,7 +2551,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_intp() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_intp(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_intp(void * jarg1) {
   intp *arg1 = (intp *) 0 ;
   
   arg1 = (intp *)jarg1; 
@@ -2508,7 +2575,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_intp(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_intp_assign(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_intp_assign(void * jarg1, int jarg2) {
   intp *arg1 = (intp *) 0 ;
   int arg2 ;
   
@@ -2534,7 +2601,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_intp_assign(void * jarg1, int jarg2) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_intp_value(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_intp_value(void * jarg1) {
   int jresult ;
   intp *arg1 = (intp *) 0 ;
   int result;
@@ -2562,7 +2629,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_intp_value(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_intp_cast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_intp_cast(void * jarg1) {
   void * jresult ;
   intp *arg1 = (intp *) 0 ;
   int *result = 0 ;
@@ -2590,7 +2657,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_intp_cast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_intp_frompointer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_intp_frompointer(void * jarg1) {
   void * jresult ;
   int *arg1 = (int *) 0 ;
   intp *result = 0 ;
@@ -2618,7 +2685,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_intp_frompointer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_doublep() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_doublep() {
   void * jresult ;
   doublep *result = 0 ;
   
@@ -2644,7 +2711,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_doublep() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_doublep(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_doublep(void * jarg1) {
   doublep *arg1 = (doublep *) 0 ;
   
   arg1 = (doublep *)jarg1; 
@@ -2668,7 +2735,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_doublep(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_doublep_assign(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_doublep_assign(void * jarg1, double jarg2) {
   doublep *arg1 = (doublep *) 0 ;
   double arg2 ;
   
@@ -2694,7 +2761,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_doublep_assign(void * jarg1, double jarg2
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_doublep_value(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_doublep_value(void * jarg1) {
   double jresult ;
   doublep *arg1 = (doublep *) 0 ;
   double result;
@@ -2722,7 +2789,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_doublep_value(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_doublep_cast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_doublep_cast(void * jarg1) {
   void * jresult ;
   doublep *arg1 = (doublep *) 0 ;
   double *result = 0 ;
@@ -2750,7 +2817,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_doublep_cast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_doublep_frompointer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_doublep_frompointer(void * jarg1) {
   void * jresult ;
   double *arg1 = (double *) 0 ;
   doublep *result = 0 ;
@@ -2778,7 +2845,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_doublep_frompointer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_uintp() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_uintp() {
   void * jresult ;
   uintp *result = 0 ;
   
@@ -2804,7 +2871,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_uintp() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_uintp(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_uintp(void * jarg1) {
   uintp *arg1 = (uintp *) 0 ;
   
   arg1 = (uintp *)jarg1; 
@@ -2828,7 +2895,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_uintp(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_uintp_assign(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_uintp_assign(void * jarg1, unsigned int jarg2) {
   uintp *arg1 = (uintp *) 0 ;
   unsigned int arg2 ;
   
@@ -2854,7 +2921,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_uintp_assign(void * jarg1, unsigned int j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_uintp_value(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_uintp_value(void * jarg1) {
   unsigned int jresult ;
   uintp *arg1 = (uintp *) 0 ;
   unsigned int result;
@@ -2882,7 +2949,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_uintp_value(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_uintp_cast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_uintp_cast(void * jarg1) {
   void * jresult ;
   uintp *arg1 = (uintp *) 0 ;
   unsigned int *result = 0 ;
@@ -2910,7 +2977,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_uintp_cast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_uintp_frompointer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_uintp_frompointer(void * jarg1) {
   void * jresult ;
   unsigned int *arg1 = (unsigned int *) 0 ;
   uintp *result = 0 ;
@@ -2938,7 +3005,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_uintp_frompointer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ushortp() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ushortp() {
   void * jresult ;
   ushortp *result = 0 ;
   
@@ -2964,7 +3031,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ushortp() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ushortp(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ushortp(void * jarg1) {
   ushortp *arg1 = (ushortp *) 0 ;
   
   arg1 = (ushortp *)jarg1; 
@@ -2988,7 +3055,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ushortp(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ushortp_assign(void * jarg1, unsigned short jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ushortp_assign(void * jarg1, unsigned short jarg2) {
   ushortp *arg1 = (ushortp *) 0 ;
   unsigned short arg2 ;
   
@@ -3014,7 +3081,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ushortp_assign(void * jarg1, unsigned sho
 }
 
 
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_ushortp_value(void * jarg1) {
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_Dali_ushortp_value(void * jarg1) {
   unsigned short jresult ;
   ushortp *arg1 = (ushortp *) 0 ;
   unsigned short result;
@@ -3042,7 +3109,7 @@ SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_ushortp_value(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ushortp_cast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ushortp_cast(void * jarg1) {
   void * jresult ;
   ushortp *arg1 = (ushortp *) 0 ;
   unsigned short *result = 0 ;
@@ -3070,7 +3137,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ushortp_cast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ushortp_frompointer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ushortp_frompointer(void * jarg1) {
   void * jresult ;
   unsigned short *arg1 = (unsigned short *) 0 ;
   ushortp *result = 0 ;
@@ -3098,7 +3165,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ushortp_frompointer(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_int_to_uint(int jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_int_to_uint(int jarg1) {
   unsigned int jresult ;
   int arg1 ;
   unsigned int result;
@@ -3126,7 +3193,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_int_to_uint(int jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RefObject_Reference(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RefObject_Reference(void * jarg1) {
   Dali::RefObject *arg1 = (Dali::RefObject *) 0 ;
   
   arg1 = (Dali::RefObject *)jarg1; 
@@ -3150,7 +3217,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RefObject_Reference(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RefObject_Unreference(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RefObject_Unreference(void * jarg1) {
   Dali::RefObject *arg1 = (Dali::RefObject *) 0 ;
   
   arg1 = (Dali::RefObject *)jarg1; 
@@ -3174,7 +3241,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RefObject_Unreference(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RefObject_ReferenceCount(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RefObject_ReferenceCount(void * jarg1) {
   int jresult ;
   Dali::RefObject *arg1 = (Dali::RefObject *) 0 ;
   int result;
@@ -3202,7 +3269,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RefObject_ReferenceCount(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Any__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Any__SWIG_0() {
   void * jresult ;
   Dali::Any *result = 0 ;
   
@@ -3228,7 +3295,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Any__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Any(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Any(void * jarg1) {
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   
   arg1 = (Dali::Any *)jarg1; 
@@ -3252,7 +3319,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Any(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Any_AssertAlways(char * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AssertAlways(char * jarg1) {
   char *arg1 = (char *) 0 ;
   
   arg1 = (char *)jarg1; 
@@ -3276,7 +3343,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Any_AssertAlways(char * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Any__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Any__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Any *arg1 = 0 ;
   Dali::Any *result = 0 ;
@@ -3308,7 +3375,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Any__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   Dali::Any *arg2 = 0 ;
@@ -3342,7 +3409,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_Assign(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_GetType(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_GetType(void * jarg1) {
   void * jresult ;
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   std::type_info *result = 0 ;
@@ -3370,7 +3437,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_GetType(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Any_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Any_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   bool result;
@@ -3398,7 +3465,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Any_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Any_AnyContainerBase(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Any_AnyContainerBase(void * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
   std::type_info *arg1 = 0 ;
   Dali::Any::CloneFunc arg2 = (Dali::Any::CloneFunc) 0 ;
@@ -3434,7 +3501,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Any_AnyContainerBase(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_GetType(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_GetType(void * jarg1) {
   void * jresult ;
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   std::type_info *result = 0 ;
@@ -3462,7 +3529,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_GetType(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mType_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mType_get(void * jarg1) {
   void * jresult ;
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   ::std::type_info *result = 0 ;
@@ -3474,7 +3541,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mType_get(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mCloneFunc_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mCloneFunc_set(void * jarg1, void * jarg2) {
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::CloneFunc arg2 = (Dali::Any::CloneFunc) 0 ;
   
@@ -3484,7 +3551,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mCloneFunc_set(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mCloneFunc_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mCloneFunc_get(void * jarg1) {
   void * jresult ;
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::CloneFunc result;
@@ -3496,7 +3563,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mCloneFunc_get(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mDeleteFunc_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_set(void * jarg1, void * jarg2) {
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::DeleteFunc arg2 = (Dali::Any::DeleteFunc) 0 ;
   
@@ -3506,7 +3573,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mDeleteFunc_set(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mDeleteFunc_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_get(void * jarg1) {
   void * jresult ;
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::DeleteFunc result;
@@ -3518,7 +3585,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_AnyContainerBase_mDeleteFunc_get(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Any_AnyContainerBase(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Any_AnyContainerBase(void * jarg1) {
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   
   arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
@@ -3542,7 +3609,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Any_AnyContainerBase(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Any_mContainer_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_mContainer_set(void * jarg1, void * jarg2) {
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   Dali::Any::AnyContainerBase *arg2 = (Dali::Any::AnyContainerBase *) 0 ;
   
@@ -3552,7 +3619,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Any_mContainer_set(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_mContainer_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_mContainer_get(void * jarg1) {
   void * jresult ;
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   Dali::Any::AnyContainerBase *result = 0 ;
@@ -3564,7 +3631,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Any_mContainer_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_DaliAssertMessage(char * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_DaliAssertMessage(char * jarg1, char * jarg2) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   
@@ -3590,7 +3657,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_DaliAssertMessage(char * jarg1, char * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_DaliException(char * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_DaliException(char * jarg1, char * jarg2) {
   void * jresult ;
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -3620,7 +3687,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_DaliException(char * jarg1, char *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_DaliException_location_set(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_DaliException_location_set(void * jarg1, char * jarg2) {
   Dali::DaliException *arg1 = (Dali::DaliException *) 0 ;
   char *arg2 = (char *) 0 ;
   
@@ -3637,7 +3704,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_DaliException_location_set(void * jarg1,
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_DaliException_location_get(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_DaliException_location_get(void * jarg1) {
   char * jresult ;
   Dali::DaliException *arg1 = (Dali::DaliException *) 0 ;
   char *result = 0 ;
@@ -3649,7 +3716,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_DaliException_location_get(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_DaliException_condition_set(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_DaliException_condition_set(void * jarg1, char * jarg2) {
   Dali::DaliException *arg1 = (Dali::DaliException *) 0 ;
   char *arg2 = (char *) 0 ;
   
@@ -3666,7 +3733,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_DaliException_condition_set(void * jarg1,
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_DaliException_condition_get(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_DaliException_condition_get(void * jarg1) {
   char * jresult ;
   Dali::DaliException *arg1 = (Dali::DaliException *) 0 ;
   char *result = 0 ;
@@ -3678,7 +3745,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_DaliException_condition_get(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_DaliException(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_DaliException(void * jarg1) {
   Dali::DaliException *arg1 = (Dali::DaliException *) 0 ;
   
   arg1 = (Dali::DaliException *)jarg1; 
@@ -3702,7 +3769,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_DaliException(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector2__SWIG_0() {
   void * jresult ;
   Dali::Vector2 *result = 0 ;
   
@@ -3728,7 +3795,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_1(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector2__SWIG_1(float jarg1, float jarg2) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -3758,7 +3825,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_1(float jarg1, float
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_2(float* jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector2__SWIG_2(float* jarg1) {
   void * jresult ;
   float *arg1 = (float *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -3788,7 +3855,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_2(float* jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_3(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector2__SWIG_3(void * jarg1) {
   void * jresult ;
   Dali::Vector3 *arg1 = 0 ;
   Dali::Vector2 *result = 0 ;
@@ -3820,7 +3887,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_3(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_4(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector2__SWIG_4(void * jarg1) {
   void * jresult ;
   Dali::Vector4 *arg1 = 0 ;
   Dali::Vector2 *result = 0 ;
@@ -3852,7 +3919,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector2__SWIG_4(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_ONE_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_ONE_get() {
   void * jresult ;
   Dali::Vector2 *result = 0 ;
   
@@ -3862,7 +3929,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_ONE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_XAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_XAXIS_get() {
   void * jresult ;
   Dali::Vector2 *result = 0 ;
   
@@ -3872,7 +3939,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_XAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_YAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_YAXIS_get() {
   void * jresult ;
   Dali::Vector2 *result = 0 ;
   
@@ -3882,7 +3949,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_YAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_NEGATIVE_XAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_NEGATIVE_XAXIS_get() {
   void * jresult ;
   Dali::Vector2 *result = 0 ;
   
@@ -3892,7 +3959,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_NEGATIVE_XAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_NEGATIVE_YAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_NEGATIVE_YAXIS_get() {
   void * jresult ;
   Dali::Vector2 *result = 0 ;
   
@@ -3902,7 +3969,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_NEGATIVE_YAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_ZERO_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_ZERO_get() {
   void * jresult ;
   Dali::Vector2 *result = 0 ;
   
@@ -3912,7 +3979,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_ZERO_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Assign__SWIG_0(void * jarg1, float* jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Assign__SWIG_0(void * jarg1, float* jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float *arg2 = (float *) 0 ;
@@ -3944,7 +4011,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Assign__SWIG_0(void * jarg1, fl
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Assign__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Assign__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -3978,7 +4045,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Assign__SWIG_1(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Assign__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Assign__SWIG_2(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -4012,7 +4079,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Assign__SWIG_2(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Add(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4046,7 +4113,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Add(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_AddAssign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_AddAssign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4080,7 +4147,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_AddAssign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Subtract__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Subtract__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4114,7 +4181,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Subtract__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_SubtractAssign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_SubtractAssign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4148,7 +4215,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_SubtractAssign(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Multiply__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Multiply__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4182,7 +4249,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Multiply__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Multiply__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Multiply__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float arg2 ;
@@ -4212,7 +4279,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Multiply__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_MultiplyAssign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_MultiplyAssign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4246,7 +4313,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_MultiplyAssign__SWIG_0(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_MultiplyAssign__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_MultiplyAssign__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float arg2 ;
@@ -4276,7 +4343,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_MultiplyAssign__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Divide__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Divide__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4310,7 +4377,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Divide__SWIG_0(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Divide__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Divide__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float arg2 ;
@@ -4340,7 +4407,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Divide__SWIG_1(void * jarg1, fl
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_DivideAssign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_DivideAssign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4374,7 +4441,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_DivideAssign__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_DivideAssign__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_DivideAssign__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float arg2 ;
@@ -4404,7 +4471,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_DivideAssign__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Subtract__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_Subtract__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 result;
@@ -4432,7 +4499,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_Subtract__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector2_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Vector2_EqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4466,7 +4533,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector2_EqualTo(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector2_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Vector2_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4500,7 +4567,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector2_NotEqualTo(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_ValueOfIndex__SWIG_0(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector2_ValueOfIndex__SWIG_0(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   unsigned int arg2 ;
@@ -4530,7 +4597,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_ValueOfIndex__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_Length(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector2_Length(void * jarg1) {
   float jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float result;
@@ -4558,7 +4625,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_Length(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_LengthSquared(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector2_LengthSquared(void * jarg1) {
   float jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float result;
@@ -4586,7 +4653,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_LengthSquared(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Normalize(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector2_Normalize(void * jarg1) {
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   
   arg1 = (Dali::Vector2 *)jarg1; 
@@ -4610,7 +4677,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Normalize(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Clamp(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector2_Clamp(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   Dali::Vector2 *arg3 = 0 ;
@@ -4646,7 +4713,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Clamp(void * jarg1, void * jarg2,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_AsFloat__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector2_AsFloat__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float *result = 0 ;
@@ -4674,7 +4741,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector2_AsFloat__SWIG_0(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_X_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector2_X_set(void * jarg1, float jarg2) {
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float arg2 ;
   
@@ -4684,7 +4751,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_X_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_X_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector2_X_get(void * jarg1) {
   float jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float result;
@@ -4696,7 +4763,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_X_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Width_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector2_Width_set(void * jarg1, float jarg2) {
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float arg2 ;
   
@@ -4706,7 +4773,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Width_set(void * jarg1, float jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_Width_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector2_Width_get(void * jarg1) {
   float jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float result;
@@ -4718,7 +4785,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_Width_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Y_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector2_Y_set(void * jarg1, float jarg2) {
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float arg2 ;
   
@@ -4728,7 +4795,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Y_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_Y_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector2_Y_get(void * jarg1) {
   float jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float result;
@@ -4740,7 +4807,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_Y_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Height_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector2_Height_set(void * jarg1, float jarg2) {
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float arg2 ;
   
@@ -4750,7 +4817,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector2_Height_set(void * jarg1, float ja
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_Height_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector2_Height_get(void * jarg1) {
   float jresult ;
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   float result;
@@ -4762,7 +4829,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector2_Height_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Vector2(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Vector2(void * jarg1) {
   Dali::Vector2 *arg1 = (Dali::Vector2 *) 0 ;
   
   arg1 = (Dali::Vector2 *)jarg1; 
@@ -4786,7 +4853,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Vector2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Min__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Min__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4824,7 +4891,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Min__SWIG_0(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Max__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Max__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -4862,7 +4929,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Max__SWIG_0(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_0(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clamp__SWIG_0(void * jarg1, float jarg2, float jarg3) {
   void * jresult ;
   Dali::Vector2 *arg1 = 0 ;
   float *arg2 = 0 ;
@@ -4902,7 +4969,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_0(void * jarg1, float jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector3__SWIG_0() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -4928,7 +4995,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_1(float jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector3__SWIG_1(float jarg1, float jarg2, float jarg3) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -4960,7 +5027,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_1(float jarg1, float
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_2(float* jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector3__SWIG_2(float* jarg1) {
   void * jresult ;
   float *arg1 = (float *) 0 ;
   Dali::Vector3 *result = 0 ;
@@ -4990,7 +5057,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_2(float* jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_3(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector3__SWIG_3(void * jarg1) {
   void * jresult ;
   Dali::Vector2 *arg1 = 0 ;
   Dali::Vector3 *result = 0 ;
@@ -5022,7 +5089,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_3(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_4(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector3__SWIG_4(void * jarg1) {
   void * jresult ;
   Dali::Vector4 *arg1 = 0 ;
   Dali::Vector3 *result = 0 ;
@@ -5054,7 +5121,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector3__SWIG_4(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_ONE_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_ONE_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -5064,7 +5131,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_ONE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_XAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_XAXIS_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -5074,7 +5141,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_XAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_YAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_YAXIS_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -5084,7 +5151,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_YAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_ZAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_ZAXIS_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -5094,7 +5161,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_ZAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_NEGATIVE_XAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_NEGATIVE_XAXIS_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -5104,7 +5171,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_NEGATIVE_XAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_NEGATIVE_YAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_NEGATIVE_YAXIS_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -5114,7 +5181,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_NEGATIVE_YAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_NEGATIVE_ZAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_NEGATIVE_ZAXIS_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -5124,7 +5191,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_NEGATIVE_ZAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_ZERO_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_ZERO_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -5134,7 +5201,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_ZERO_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Assign__SWIG_0(void * jarg1, float* jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Assign__SWIG_0(void * jarg1, float* jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float *arg2 = (float *) 0 ;
@@ -5166,7 +5233,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Assign__SWIG_0(void * jarg1, fl
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Assign__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Assign__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -5200,7 +5267,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Assign__SWIG_1(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Assign__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Assign__SWIG_2(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -5234,7 +5301,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Assign__SWIG_2(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Add(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5268,7 +5335,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Add(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_AddAssign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_AddAssign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5302,7 +5369,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_AddAssign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Subtract__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Subtract__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5336,7 +5403,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Subtract__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_SubtractAssign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_SubtractAssign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5370,7 +5437,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_SubtractAssign(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Multiply__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Multiply__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5404,7 +5471,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Multiply__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Multiply__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Multiply__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
@@ -5434,7 +5501,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Multiply__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_MultiplyAssign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_MultiplyAssign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5468,7 +5535,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_MultiplyAssign__SWIG_0(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_MultiplyAssign__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_MultiplyAssign__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
@@ -5498,7 +5565,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_MultiplyAssign__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_MultiplyAssign__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_MultiplyAssign__SWIG_2(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -5532,7 +5599,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_MultiplyAssign__SWIG_2(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Divide__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Divide__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5566,7 +5633,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Divide__SWIG_0(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Divide__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Divide__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
@@ -5596,7 +5663,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Divide__SWIG_1(void * jarg1, fl
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_DivideAssign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_DivideAssign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5630,7 +5697,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_DivideAssign__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_DivideAssign__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_DivideAssign__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
@@ -5660,7 +5727,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_DivideAssign__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Subtract__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Subtract__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 result;
@@ -5688,7 +5755,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Subtract__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector3_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Vector3_EqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5722,7 +5789,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector3_EqualTo(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector3_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Vector3_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5756,7 +5823,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector3_NotEqualTo(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_ValueOfIndex__SWIG_0(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_ValueOfIndex__SWIG_0(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   unsigned int arg2 ;
@@ -5786,7 +5853,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_ValueOfIndex__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Dot(void * jarg1, void * jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_Dot(void * jarg1, void * jarg2) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5820,7 +5887,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Dot(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Cross(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_Cross(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -5854,7 +5921,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_Cross(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Length(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_Length(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -5882,7 +5949,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Length(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_LengthSquared(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_LengthSquared(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -5910,7 +5977,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_LengthSquared(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Normalize(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_Normalize(void * jarg1) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   
   arg1 = (Dali::Vector3 *)jarg1; 
@@ -5934,7 +6001,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Normalize(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Clamp(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_Clamp(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -5970,7 +6037,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Clamp(void * jarg1, void * jarg2,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_AsFloat__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_AsFloat__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float *result = 0 ;
@@ -5998,7 +6065,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_AsFloat__SWIG_0(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_GetVectorXY__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_GetVectorXY__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -6026,7 +6093,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_GetVectorXY__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_GetVectorYZ__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector3_GetVectorYZ__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -6054,7 +6121,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector3_GetVectorYZ__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_X_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_X_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6064,7 +6131,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_X_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_X_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_X_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6076,7 +6143,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_X_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Width_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_Width_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6086,7 +6153,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Width_set(void * jarg1, float jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Width_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_Width_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6098,7 +6165,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Width_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_r_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_r_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6108,7 +6175,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_r_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_r_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_r_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6120,7 +6187,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_r_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Y_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_Y_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6130,7 +6197,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Y_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Y_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_Y_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6142,7 +6209,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Y_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Height_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_Height_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6152,7 +6219,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Height_set(void * jarg1, float ja
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Height_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_Height_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6164,7 +6231,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Height_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_g_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_g_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6174,7 +6241,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_g_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_g_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_g_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6186,7 +6253,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_g_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Z_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_Z_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6196,7 +6263,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Z_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Z_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_Z_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6208,7 +6275,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Z_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Depth_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_Depth_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6218,7 +6285,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_Depth_set(void * jarg1, float jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Depth_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_Depth_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6230,7 +6297,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_Depth_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_b_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector3_b_set(void * jarg1, float jarg2) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float arg2 ;
   
@@ -6240,7 +6307,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector3_b_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_b_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector3_b_get(void * jarg1) {
   float jresult ;
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   float result;
@@ -6252,7 +6319,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector3_b_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Vector3(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Vector3(void * jarg1) {
   Dali::Vector3 *arg1 = (Dali::Vector3 *) 0 ;
   
   arg1 = (Dali::Vector3 *)jarg1; 
@@ -6276,7 +6343,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Vector3(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Min__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Min__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -6314,7 +6381,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Min__SWIG_1(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Max__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Max__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -6352,7 +6419,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Max__SWIG_1(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_1(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clamp__SWIG_1(void * jarg1, float jarg2, float jarg3) {
   void * jresult ;
   Dali::Vector3 *arg1 = 0 ;
   float *arg2 = 0 ;
@@ -6392,7 +6459,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_1(void * jarg1, float jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector4__SWIG_0() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -6418,7 +6485,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector4__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -6452,7 +6519,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_1(float jarg1, float
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_2(float* jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector4__SWIG_2(float* jarg1) {
   void * jresult ;
   float *arg1 = (float *) 0 ;
   Dali::Vector4 *result = 0 ;
@@ -6482,7 +6549,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_2(float* jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_3(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector4__SWIG_3(void * jarg1) {
   void * jresult ;
   Dali::Vector2 *arg1 = 0 ;
   Dali::Vector4 *result = 0 ;
@@ -6514,7 +6581,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_3(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_4(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Vector4__SWIG_4(void * jarg1) {
   void * jresult ;
   Dali::Vector3 *arg1 = 0 ;
   Dali::Vector4 *result = 0 ;
@@ -6546,7 +6613,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Vector4__SWIG_4(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_ONE_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_ONE_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -6556,7 +6623,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_ONE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_XAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_XAXIS_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -6566,7 +6633,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_XAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_YAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_YAXIS_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -6576,7 +6643,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_YAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_ZAXIS_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_ZAXIS_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -6586,7 +6653,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_ZAXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_ZERO_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_ZERO_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -6596,7 +6663,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_ZERO_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Assign__SWIG_0(void * jarg1, float* jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Assign__SWIG_0(void * jarg1, float* jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float *arg2 = (float *) 0 ;
@@ -6628,7 +6695,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Assign__SWIG_0(void * jarg1, fl
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Assign__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Assign__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -6662,7 +6729,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Assign__SWIG_1(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Assign__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Assign__SWIG_2(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -6696,7 +6763,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Assign__SWIG_2(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Add(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -6730,7 +6797,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Add(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_AddAssign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_AddAssign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -6764,7 +6831,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_AddAssign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Subtract__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Subtract__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -6798,7 +6865,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Subtract__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_SubtractAssign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_SubtractAssign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -6832,7 +6899,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_SubtractAssign(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Multiply__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Multiply__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -6866,7 +6933,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Multiply__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Multiply__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Multiply__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
@@ -6896,7 +6963,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Multiply__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_MultiplyAssign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_MultiplyAssign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -6930,7 +6997,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_MultiplyAssign__SWIG_0(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_MultiplyAssign__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_MultiplyAssign__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
@@ -6960,7 +7027,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_MultiplyAssign__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Divide__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Divide__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -6994,7 +7061,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Divide__SWIG_0(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Divide__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Divide__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
@@ -7024,7 +7091,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Divide__SWIG_1(void * jarg1, fl
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_DivideAssign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_DivideAssign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -7058,7 +7125,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_DivideAssign__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_DivideAssign__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_DivideAssign__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
@@ -7088,7 +7155,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_DivideAssign__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Subtract__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Subtract__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 result;
@@ -7116,7 +7183,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Subtract__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector4_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Vector4_EqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -7150,7 +7217,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector4_EqualTo(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector4_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Vector4_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -7184,7 +7251,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Vector4_NotEqualTo(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_ValueOfIndex__SWIG_0(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_ValueOfIndex__SWIG_0(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   unsigned int arg2 ;
@@ -7214,7 +7281,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_ValueOfIndex__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Dot__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_Dot__SWIG_0(void * jarg1, void * jarg2) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -7248,7 +7315,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Dot__SWIG_0(void * jarg1, void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Dot__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_Dot__SWIG_1(void * jarg1, void * jarg2) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -7282,7 +7349,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Dot__SWIG_1(void * jarg1, void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Dot4(void * jarg1, void * jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_Dot4(void * jarg1, void * jarg2) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -7316,7 +7383,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Dot4(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Cross(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_Cross(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -7350,7 +7417,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_Cross(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Length(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_Length(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7378,7 +7445,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Length(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_LengthSquared(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_LengthSquared(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7406,7 +7473,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_LengthSquared(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_Normalize(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_Normalize(void * jarg1) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   
   arg1 = (Dali::Vector4 *)jarg1; 
@@ -7430,7 +7497,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_Normalize(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_Clamp(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_Clamp(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
   Dali::Vector4 *arg3 = 0 ;
@@ -7466,7 +7533,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_Clamp(void * jarg1, void * jarg2,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_AsFloat__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Vector4_AsFloat__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float *result = 0 ;
@@ -7494,7 +7561,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Vector4_AsFloat__SWIG_0(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_X_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_X_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7504,7 +7571,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_X_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_X_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_X_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7516,7 +7583,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_X_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_r_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_r_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7526,7 +7593,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_r_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_r_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_r_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7538,7 +7605,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_r_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_s_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_s_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7548,7 +7615,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_s_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_s_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_s_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7560,7 +7627,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_s_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_Y_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_Y_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7570,7 +7637,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_Y_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Y_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_Y_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7582,7 +7649,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Y_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_g_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_g_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7592,7 +7659,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_g_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_g_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_g_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7604,7 +7671,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_g_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_t_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_t_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7614,7 +7681,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_t_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_t_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_t_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7626,7 +7693,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_t_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_Z_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_Z_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7636,7 +7703,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_Z_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Z_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_Z_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7648,7 +7715,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_Z_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_b_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_b_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7658,7 +7725,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_b_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_b_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_b_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7670,7 +7737,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_b_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_p_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_p_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7680,7 +7747,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_p_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_p_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_p_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7692,7 +7759,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_p_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_W_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_W_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7702,7 +7769,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_W_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_W_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_W_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7714,7 +7781,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_W_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_a_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_a_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7724,7 +7791,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_a_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_a_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_a_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7736,7 +7803,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_a_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_q_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Vector4_q_set(void * jarg1, float jarg2) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float arg2 ;
   
@@ -7746,7 +7813,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Vector4_q_set(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_q_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Vector4_q_get(void * jarg1) {
   float jresult ;
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   float result;
@@ -7758,7 +7825,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Vector4_q_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Vector4(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Vector4(void * jarg1) {
   Dali::Vector4 *arg1 = (Dali::Vector4 *) 0 ;
   
   arg1 = (Dali::Vector4 *)jarg1; 
@@ -7782,7 +7849,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Vector4(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Min__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Min__SWIG_2(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -7820,7 +7887,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Min__SWIG_2(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Max__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Max__SWIG_2(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector4 *arg1 = 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -7858,7 +7925,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Max__SWIG_2(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_2(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clamp__SWIG_2(void * jarg1, float jarg2, float jarg3) {
   void * jresult ;
   Dali::Vector4 *arg1 = 0 ;
   float *arg2 = 0 ;
@@ -7898,7 +7965,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_2(void * jarg1, float jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Uint16Pair__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Uint16Pair__SWIG_0() {
   void * jresult ;
   Dali::Uint16Pair *result = 0 ;
   
@@ -7924,7 +7991,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Uint16Pair__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Uint16Pair__SWIG_1(unsigned int jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Uint16Pair__SWIG_1(unsigned int jarg1, unsigned int jarg2) {
   void * jresult ;
   uint32_t arg1 ;
   uint32_t arg2 ;
@@ -7954,7 +8021,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Uint16Pair__SWIG_1(unsigned int jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Uint16Pair__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Uint16Pair__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Uint16Pair *arg1 = 0 ;
   Dali::Uint16Pair *result = 0 ;
@@ -7986,7 +8053,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Uint16Pair__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Uint16Pair_SetWidth(void * jarg1, unsigned short jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Uint16Pair_SetWidth(void * jarg1, unsigned short jarg2) {
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   uint16_t arg2 ;
   
@@ -8012,7 +8079,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Uint16Pair_SetWidth(void * jarg1, unsigne
 }
 
 
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_Uint16Pair_GetWidth(void * jarg1) {
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_Dali_Uint16Pair_GetWidth(void * jarg1) {
   unsigned short jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   uint16_t result;
@@ -8040,7 +8107,7 @@ SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_Uint16Pair_GetWidth(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Uint16Pair_SetHeight(void * jarg1, unsigned short jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Uint16Pair_SetHeight(void * jarg1, unsigned short jarg2) {
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   uint16_t arg2 ;
   
@@ -8066,7 +8133,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Uint16Pair_SetHeight(void * jarg1, unsign
 }
 
 
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_Uint16Pair_GetHeight(void * jarg1) {
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_Dali_Uint16Pair_GetHeight(void * jarg1) {
   unsigned short jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   uint16_t result;
@@ -8094,7 +8161,7 @@ SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_Uint16Pair_GetHeight(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Uint16Pair_SetX(void * jarg1, unsigned short jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Uint16Pair_SetX(void * jarg1, unsigned short jarg2) {
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   uint16_t arg2 ;
   
@@ -8120,7 +8187,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Uint16Pair_SetX(void * jarg1, unsigned sh
 }
 
 
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_Uint16Pair_GetX(void * jarg1) {
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_Dali_Uint16Pair_GetX(void * jarg1) {
   unsigned short jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   uint16_t result;
@@ -8148,7 +8215,7 @@ SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_Uint16Pair_GetX(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Uint16Pair_SetY(void * jarg1, unsigned short jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Uint16Pair_SetY(void * jarg1, unsigned short jarg2) {
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   uint16_t arg2 ;
   
@@ -8174,7 +8241,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Uint16Pair_SetY(void * jarg1, unsigned sh
 }
 
 
-SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_Uint16Pair_GetY(void * jarg1) {
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_Dali_Uint16Pair_GetY(void * jarg1) {
   unsigned short jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   uint16_t result;
@@ -8202,7 +8269,7 @@ SWIGEXPORT unsigned short SWIGSTDCALL CSharp_NUI_Uint16Pair_GetY(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Uint16Pair_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Uint16Pair_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   Dali::Uint16Pair *arg2 = 0 ;
@@ -8236,7 +8303,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Uint16Pair_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Uint16Pair_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Uint16Pair_EqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   Dali::Uint16Pair *arg2 = 0 ;
@@ -8270,7 +8337,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Uint16Pair_EqualTo(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Uint16Pair_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Uint16Pair_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   Dali::Uint16Pair *arg2 = 0 ;
@@ -8304,7 +8371,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Uint16Pair_NotEqualTo(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Uint16Pair_LessThan(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Uint16Pair_LessThan(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   Dali::Uint16Pair *arg2 = 0 ;
@@ -8338,7 +8405,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Uint16Pair_LessThan(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Uint16Pair_GreaterThan(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Uint16Pair_GreaterThan(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   Dali::Uint16Pair *arg2 = 0 ;
@@ -8372,7 +8439,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Uint16Pair_GreaterThan(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Uint16Pair(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Uint16Pair(void * jarg1) {
   Dali::Uint16Pair *arg1 = (Dali::Uint16Pair *) 0 ;
   
   arg1 = (Dali::Uint16Pair *)jarg1; 
@@ -8396,7 +8463,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Uint16Pair(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Degree__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Degree__SWIG_0() {
   void * jresult ;
   Dali::Degree *result = 0 ;
   
@@ -8422,7 +8489,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Degree__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Degree__SWIG_1(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Degree__SWIG_1(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::Degree *result = 0 ;
@@ -8450,7 +8517,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Degree__SWIG_1(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Degree__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Degree__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Radian arg1 ;
   Dali::Radian *argp1 ;
@@ -8484,7 +8551,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Degree__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Degree_degree_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Degree_degree_set(void * jarg1, float jarg2) {
   Dali::Degree *arg1 = (Dali::Degree *) 0 ;
   float arg2 ;
   
@@ -8494,7 +8561,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Degree_degree_set(void * jarg1, float jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Degree_degree_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Degree_degree_get(void * jarg1) {
   float jresult ;
   Dali::Degree *arg1 = (Dali::Degree *) 0 ;
   float result;
@@ -8506,7 +8573,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Degree_degree_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Degree(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Degree(void * jarg1) {
   Dali::Degree *arg1 = (Dali::Degree *) 0 ;
   
   arg1 = (Dali::Degree *)jarg1; 
@@ -8530,7 +8597,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Degree(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_360_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_360_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8540,7 +8607,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_360_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_315_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_315_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8550,7 +8617,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_315_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_270_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_270_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8560,7 +8627,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_270_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_225_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_225_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8570,7 +8637,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_225_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_180_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_180_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8580,7 +8647,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_180_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_135_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_135_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8590,7 +8657,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_135_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_120_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_120_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8600,7 +8667,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_120_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_90_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_90_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8610,7 +8677,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_90_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_60_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_60_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8620,7 +8687,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_60_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_45_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_45_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8630,7 +8697,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_45_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_30_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_30_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8640,7 +8707,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_30_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_0_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ANGLE_0_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8650,7 +8717,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ANGLE_0_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_5(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_5(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Degree *arg1 = 0 ;
   Dali::Degree *arg2 = 0 ;
@@ -8688,7 +8755,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_5(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NotEqualTo__SWIG_4(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NotEqualTo__SWIG_4(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Degree *arg1 = 0 ;
   Dali::Degree *arg2 = 0 ;
@@ -8726,7 +8793,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NotEqualTo__SWIG_4(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3) {
   void * jresult ;
   Dali::Degree arg1 ;
   float arg2 ;
@@ -8764,7 +8831,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_3(void * jarg1, float jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Radian__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_0() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -8790,7 +8857,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Radian__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Radian__SWIG_1(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_1(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::Radian *result = 0 ;
@@ -8818,7 +8885,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Radian__SWIG_1(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Radian__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Radian__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Degree arg1 ;
   Dali::Degree *argp1 ;
@@ -8852,7 +8919,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Radian__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Radian_Assign__SWIG_0(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Radian_Assign__SWIG_0(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Radian *arg1 = (Dali::Radian *) 0 ;
   float arg2 ;
@@ -8882,7 +8949,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Radian_Assign__SWIG_0(void * jarg1, flo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Radian_Assign__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Radian_Assign__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Radian *arg1 = (Dali::Radian *) 0 ;
   Dali::Degree arg2 ;
@@ -8918,7 +8985,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Radian_Assign__SWIG_1(void * jarg1, voi
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Radian_ConvertToFloat(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Radian_ConvertToFloat(void * jarg1) {
   float jresult ;
   Dali::Radian *arg1 = (Dali::Radian *) 0 ;
   float result;
@@ -8946,7 +9013,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Radian_ConvertToFloat(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Radian_radian_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Radian_radian_set(void * jarg1, float jarg2) {
   Dali::Radian *arg1 = (Dali::Radian *) 0 ;
   float arg2 ;
   
@@ -8956,7 +9023,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Radian_radian_set(void * jarg1, float jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Radian_radian_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Radian_radian_get(void * jarg1) {
   float jresult ;
   Dali::Radian *arg1 = (Dali::Radian *) 0 ;
   float result;
@@ -8968,7 +9035,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Radian_radian_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Radian(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Radian(void * jarg1) {
   Dali::Radian *arg1 = (Dali::Radian *) 0 ;
   
   arg1 = (Dali::Radian *)jarg1; 
@@ -8992,7 +9059,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Radian(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_6(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_6(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Radian arg1 ;
   Dali::Radian arg2 ;
@@ -9034,7 +9101,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_6(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NotEqualTo__SWIG_5(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NotEqualTo__SWIG_5(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Radian arg1 ;
   Dali::Radian arg2 ;
@@ -9076,7 +9143,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NotEqualTo__SWIG_5(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_7(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_7(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Radian arg1 ;
   Dali::Degree arg2 ;
@@ -9118,7 +9185,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_7(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NotEqualTo__SWIG_6(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NotEqualTo__SWIG_6(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Radian arg1 ;
   Dali::Degree arg2 ;
@@ -9160,7 +9227,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NotEqualTo__SWIG_6(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_8(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_8(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Degree arg1 ;
   Dali::Radian arg2 ;
@@ -9202,7 +9269,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_8(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NotEqualTo__SWIG_7(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NotEqualTo__SWIG_7(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Degree arg1 ;
   Dali::Radian arg2 ;
@@ -9244,7 +9311,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NotEqualTo__SWIG_7(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GreaterThan__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GreaterThan__SWIG_0(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Radian arg1 ;
   Dali::Radian arg2 ;
@@ -9286,7 +9353,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GreaterThan__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GreaterThan__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GreaterThan__SWIG_1(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Radian arg1 ;
   Dali::Degree arg2 ;
@@ -9328,7 +9395,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GreaterThan__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GreaterThan__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GreaterThan__SWIG_2(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Degree arg1 ;
   Dali::Radian arg2 ;
@@ -9370,7 +9437,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GreaterThan__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LessThan__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LessThan__SWIG_0(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Radian arg1 ;
   Dali::Radian arg2 ;
@@ -9412,7 +9479,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LessThan__SWIG_0(void * jarg1, vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LessThan__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LessThan__SWIG_1(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Radian arg1 ;
   Dali::Degree arg2 ;
@@ -9454,7 +9521,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LessThan__SWIG_1(void * jarg1, vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LessThan__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LessThan__SWIG_2(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Degree arg1 ;
   Dali::Radian arg2 ;
@@ -9496,7 +9563,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LessThan__SWIG_2(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Multiply(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Multiply(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Radian arg1 ;
   float arg2 ;
@@ -9532,7 +9599,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Multiply(void * jarg1, float jarg2) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Subtract(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Subtract(void * jarg1) {
   void * jresult ;
   Dali::Radian arg1 ;
   Dali::Radian *argp1 ;
@@ -9566,7 +9633,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Subtract(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_4(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Clamp__SWIG_4(void * jarg1, float jarg2, float jarg3) {
   void * jresult ;
   Dali::Radian arg1 ;
   float arg2 ;
@@ -9604,7 +9671,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Clamp__SWIG_4(void * jarg1, float jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Quaternion__SWIG_0() {
   void * jresult ;
   Dali::Quaternion *result = 0 ;
   
@@ -9630,7 +9697,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Quaternion__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -9664,7 +9731,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_1(float jarg1, flo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Quaternion__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Vector4 *arg1 = 0 ;
   Dali::Quaternion *result = 0 ;
@@ -9696,7 +9763,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_3(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Quaternion__SWIG_3(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Radian arg1 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -9736,7 +9803,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_3(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Quaternion__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Radian arg1 ;
   Dali::Radian arg2 ;
@@ -9786,7 +9853,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_4(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_5(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Quaternion__SWIG_5(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = 0 ;
   Dali::Quaternion *result = 0 ;
@@ -9818,7 +9885,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_5(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_6(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Quaternion__SWIG_6(void * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Vector3 *arg1 = 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -9862,7 +9929,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_6(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_7(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Quaternion__SWIG_7(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector3 *arg1 = 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -9900,7 +9967,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Quaternion__SWIG_7(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Quaternion(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Quaternion(void * jarg1) {
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   
   arg1 = (Dali::Quaternion *)jarg1; 
@@ -9924,7 +9991,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Quaternion(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_IDENTITY_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_IDENTITY_get() {
   void * jresult ;
   Dali::Quaternion *result = 0 ;
   
@@ -9934,7 +10001,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_IDENTITY_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Quaternion_IsIdentity(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Quaternion_IsIdentity(void * jarg1) {
   unsigned int jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   bool result;
@@ -9962,7 +10029,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Quaternion_IsIdentity(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Quaternion_ToAxisAngle(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Quaternion_ToAxisAngle(void * jarg1, void * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -10002,7 +10069,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Quaternion_ToAxisAngle(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_AsVector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_AsVector(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Vector4 *result = 0 ;
@@ -10030,7 +10097,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_AsVector(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_SetEuler(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Quaternion_SetEuler(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian arg3 ;
@@ -10078,7 +10145,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_SetEuler(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_EulerAngles(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_EulerAngles(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Vector4 result;
@@ -10106,7 +10173,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_EulerAngles(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Add(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10140,7 +10207,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Add(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Subtract__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Subtract__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10174,7 +10241,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Subtract__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Multiply__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Multiply__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10208,7 +10275,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Multiply__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Multiply__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Multiply__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -10242,7 +10309,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Multiply__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Divide__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Divide__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10276,7 +10343,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Divide__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Multiply__SWIG_2(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Multiply__SWIG_2(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   float arg2 ;
@@ -10306,7 +10373,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Multiply__SWIG_2(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Divide__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Divide__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   float arg2 ;
@@ -10336,7 +10403,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Divide__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Subtract__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Subtract__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion result;
@@ -10364,7 +10431,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Subtract__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_AddAssign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_AddAssign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10398,7 +10465,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_AddAssign(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_SubtractAssign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_SubtractAssign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10432,7 +10499,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_SubtractAssign(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_MultiplyAssign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_MultiplyAssign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10466,7 +10533,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_MultiplyAssign__SWIG_0(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_MultiplyAssign__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_MultiplyAssign__SWIG_1(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   float arg2 ;
@@ -10496,7 +10563,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_MultiplyAssign__SWIG_1(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_DivideAssign(void * jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_DivideAssign(void * jarg1, float jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   float arg2 ;
@@ -10526,7 +10593,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_DivideAssign(void * jarg1, f
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Quaternion_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Quaternion_EqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10560,7 +10627,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Quaternion_EqualTo(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Quaternion_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Quaternion_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10594,7 +10661,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Quaternion_NotEqualTo(void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Quaternion_Length(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Quaternion_Length(void * jarg1) {
   float jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   float result;
@@ -10622,7 +10689,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Quaternion_Length(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Quaternion_LengthSquared(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Quaternion_LengthSquared(void * jarg1) {
   float jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   float result;
@@ -10650,7 +10717,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Quaternion_LengthSquared(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_Normalize(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Quaternion_Normalize(void * jarg1) {
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   
   arg1 = (Dali::Quaternion *)jarg1; 
@@ -10674,7 +10741,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_Normalize(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Normalized(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Normalized(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion result;
@@ -10702,7 +10769,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Normalized(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_Conjugate(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Quaternion_Conjugate(void * jarg1) {
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   
   arg1 = (Dali::Quaternion *)jarg1; 
@@ -10726,7 +10793,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_Conjugate(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_Invert(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Quaternion_Invert(void * jarg1) {
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   
   arg1 = (Dali::Quaternion *)jarg1; 
@@ -10750,7 +10817,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_Invert(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Log(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Log(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion result;
@@ -10778,7 +10845,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Log(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Exp(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Exp(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Quaternion result;
@@ -10806,7 +10873,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Exp(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Quaternion_Dot(void * jarg1, void * jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Quaternion_Dot(void * jarg1, void * jarg2) {
   float jresult ;
   Dali::Quaternion *arg1 = 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10844,7 +10911,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Quaternion_Dot(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Lerp(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Lerp(void * jarg1, void * jarg2, float jarg3) {
   void * jresult ;
   Dali::Quaternion *arg1 = 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10884,7 +10951,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Lerp(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Slerp(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Slerp(void * jarg1, void * jarg2, float jarg3) {
   void * jresult ;
   Dali::Quaternion *arg1 = 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10924,7 +10991,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Slerp(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_SlerpNoInvert(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_SlerpNoInvert(void * jarg1, void * jarg2, float jarg3) {
   void * jresult ;
   Dali::Quaternion *arg1 = 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -10964,7 +11031,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_SlerpNoInvert(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Squad(void * jarg1, void * jarg2, void * jarg3, void * jarg4, float jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Squad(void * jarg1, void * jarg2, void * jarg3, void * jarg4, float jarg5) {
   void * jresult ;
   Dali::Quaternion *arg1 = 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -11016,7 +11083,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Squad(void * jarg1, void * j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Quaternion_AngleBetween(void * jarg1, void * jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Quaternion_AngleBetween(void * jarg1, void * jarg2) {
   float jresult ;
   Dali::Quaternion *arg1 = 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -11054,7 +11121,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Quaternion_AngleBetween(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Rotate__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Rotate__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -11088,7 +11155,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Rotate__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Rotate__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_Rotate__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -11122,7 +11189,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_Rotate__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_mVector_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Quaternion_mVector_set(void * jarg1, void * jarg2) {
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Vector4 *arg2 = (Dali::Vector4 *) 0 ;
   
@@ -11132,7 +11199,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Quaternion_mVector_set(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_mVector_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Quaternion_mVector_get(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = (Dali::Quaternion *) 0 ;
   Dali::Vector4 *result = 0 ;
@@ -11144,7 +11211,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Quaternion_mVector_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_0() {
   void * jresult ;
   Dali::Matrix *result = 0 ;
   
@@ -11170,7 +11237,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_1(unsigned int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_1(unsigned int jarg1) {
   void * jresult ;
   bool arg1 ;
   Dali::Matrix *result = 0 ;
@@ -11198,7 +11265,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_1(unsigned int jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_2(float* jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_2(float* jarg1) {
   void * jresult ;
   float *arg1 = (float *) 0 ;
   Dali::Matrix *result = 0 ;
@@ -11228,7 +11295,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_2(float* jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_3(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_3(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = 0 ;
   Dali::Matrix *result = 0 ;
@@ -11260,7 +11327,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_3(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_4(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix__SWIG_4(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = 0 ;
   Dali::Matrix *result = 0 ;
@@ -11292,7 +11359,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix__SWIG_4(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Matrix *arg2 = 0 ;
@@ -11326,7 +11393,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_Assign(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_IDENTITY_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_IDENTITY_get() {
   void * jresult ;
   Dali::Matrix *result = 0 ;
   
@@ -11336,7 +11403,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_IDENTITY_get() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetIdentity(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetIdentity(void * jarg1) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   
   arg1 = (Dali::Matrix *)jarg1; 
@@ -11360,7 +11427,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetIdentity(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetIdentityAndScale(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetIdentityAndScale(void * jarg1, void * jarg2) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -11390,7 +11457,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetIdentityAndScale(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_InvertTransform(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_InvertTransform(void * jarg1, void * jarg2) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Matrix *arg2 = 0 ;
   
@@ -11420,7 +11487,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_InvertTransform(void * jarg1, void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix_Invert(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Matrix_Invert(void * jarg1) {
   unsigned int jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   bool result;
@@ -11448,7 +11515,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix_Invert(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_Transpose(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Transpose(void * jarg1) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   
   arg1 = (Dali::Matrix *)jarg1; 
@@ -11472,7 +11539,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_Transpose(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetXAxis(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetXAxis(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 result;
@@ -11500,7 +11567,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetXAxis(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetYAxis(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetYAxis(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 result;
@@ -11528,7 +11595,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetYAxis(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetZAxis(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetZAxis(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 result;
@@ -11556,7 +11623,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetZAxis(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetXAxis(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetXAxis(void * jarg1, void * jarg2) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -11586,7 +11653,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetXAxis(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetYAxis(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetYAxis(void * jarg1, void * jarg2) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -11616,7 +11683,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetYAxis(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetZAxis(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetZAxis(void * jarg1, void * jarg2) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -11646,7 +11713,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetZAxis(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetTranslation(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetTranslation(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector4 *result = 0 ;
@@ -11674,7 +11741,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetTranslation(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetTranslation3(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_GetTranslation3(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *result = 0 ;
@@ -11702,7 +11769,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_GetTranslation3(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetTranslation__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTranslation__SWIG_0(void * jarg1, void * jarg2) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
   
@@ -11732,7 +11799,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetTranslation__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetTranslation__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTranslation__SWIG_1(void * jarg1, void * jarg2) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -11762,7 +11829,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetTranslation__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_OrthoNormalize(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_OrthoNormalize(void * jarg1) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   
   arg1 = (Dali::Matrix *)jarg1; 
@@ -11786,7 +11853,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_OrthoNormalize(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_AsFloat__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_AsFloat__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   float *result = 0 ;
@@ -11814,7 +11881,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_AsFloat__SWIG_0(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_Multiply__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Matrix *arg1 = 0 ;
   Dali::Matrix *arg2 = 0 ;
   Dali::Matrix *arg3 = 0 ;
@@ -11854,7 +11921,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_Multiply__SWIG_0(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_Multiply__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Matrix *arg1 = 0 ;
   Dali::Matrix *arg2 = 0 ;
   Dali::Quaternion *arg3 = 0 ;
@@ -11894,7 +11961,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_Multiply__SWIG_1(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_Multiply__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix_Multiply__SWIG_2(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -11928,7 +11995,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix_Multiply__SWIG_2(void * jarg1, v
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Matrix_EqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Matrix *arg2 = 0 ;
@@ -11962,7 +12029,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix_EqualTo(void * jarg1, void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Matrix_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Matrix *arg2 = 0 ;
@@ -11996,7 +12063,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix_NotEqualTo(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetTransformComponents(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetTransformComponents(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   Dali::Quaternion *arg3 = 0 ;
@@ -12038,7 +12105,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetTransformComponents(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetInverseTransformComponents__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetInverseTransformComponents__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   Dali::Quaternion *arg3 = 0 ;
@@ -12080,7 +12147,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetInverseTransformComponents__SWI
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetInverseTransformComponents__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_SetInverseTransformComponents__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -12128,7 +12195,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_SetInverseTransformComponents__SWI
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_GetTransformComponents(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix_GetTransformComponents(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   Dali::Quaternion *arg3 = 0 ;
@@ -12170,7 +12237,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix_GetTransformComponents(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Matrix(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Matrix(void * jarg1) {
   Dali::Matrix *arg1 = (Dali::Matrix *) 0 ;
   
   arg1 = (Dali::Matrix *)jarg1; 
@@ -12194,7 +12261,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Matrix(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix3_IDENTITY_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_IDENTITY_get() {
   void * jresult ;
   Dali::Matrix3 *result = 0 ;
   
@@ -12204,7 +12271,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix3_IDENTITY_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix3__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_0() {
   void * jresult ;
   Dali::Matrix3 *result = 0 ;
   
@@ -12230,7 +12297,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix3__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix3__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Matrix3 *arg1 = 0 ;
   Dali::Matrix3 *result = 0 ;
@@ -12262,7 +12329,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix3__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix3__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = 0 ;
   Dali::Matrix3 *result = 0 ;
@@ -12294,7 +12361,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix3__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix3__SWIG_3(float jarg1, float jarg2, float jarg3, float jarg4, float jarg5, float jarg6, float jarg7, float jarg8, float jarg9) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Matrix3__SWIG_3(float jarg1, float jarg2, float jarg3, float jarg4, float jarg5, float jarg6, float jarg7, float jarg8, float jarg9) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -12338,7 +12405,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Matrix3__SWIG_3(float jarg1, float
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix3_Assign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Assign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   Dali::Matrix3 *arg2 = 0 ;
@@ -12372,7 +12439,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix3_Assign__SWIG_0(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix3_Assign__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_Assign__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   Dali::Matrix *arg2 = 0 ;
@@ -12406,7 +12473,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix3_Assign__SWIG_1(void * jarg1, vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Matrix3_EqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   Dali::Matrix3 *arg2 = 0 ;
@@ -12440,7 +12507,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_EqualTo(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Matrix3_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   Dali::Matrix3 *arg2 = 0 ;
@@ -12474,7 +12541,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_NotEqualTo(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Matrix3(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Matrix3(void * jarg1) {
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   
   arg1 = (Dali::Matrix3 *)jarg1; 
@@ -12498,7 +12565,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Matrix3(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix3_SetIdentity(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_SetIdentity(void * jarg1) {
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   
   arg1 = (Dali::Matrix3 *)jarg1; 
@@ -12522,7 +12589,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix3_SetIdentity(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix3_AsFloat__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Matrix3_AsFloat__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   float *result = 0 ;
@@ -12550,7 +12617,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Matrix3_AsFloat__SWIG_0(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_Invert(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Matrix3_Invert(void * jarg1) {
   unsigned int jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   bool result;
@@ -12578,7 +12645,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_Invert(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_Transpose(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Matrix3_Transpose(void * jarg1) {
   unsigned int jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   bool result;
@@ -12606,7 +12673,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_Transpose(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix3_Scale(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_Scale(void * jarg1, float jarg2) {
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   float arg2 ;
   
@@ -12632,7 +12699,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix3_Scale(void * jarg1, float jarg2)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Matrix3_Magnitude(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Matrix3_Magnitude(void * jarg1) {
   float jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   float result;
@@ -12660,7 +12727,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Matrix3_Magnitude(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_ScaledInverseTranspose(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Matrix3_ScaledInverseTranspose(void * jarg1) {
   unsigned int jresult ;
   Dali::Matrix3 *arg1 = (Dali::Matrix3 *) 0 ;
   bool result;
@@ -12688,7 +12755,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Matrix3_ScaledInverseTranspose(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix3_Multiply(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Matrix3_Multiply(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Matrix3 *arg1 = 0 ;
   Dali::Matrix3 *arg2 = 0 ;
   Dali::Matrix3 *arg3 = 0 ;
@@ -12728,7 +12795,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Matrix3_Multiply(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Range(float jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Range(float jarg1, float jarg2) {
   float jresult ;
   float arg1 ;
   float arg2 ;
@@ -12758,7 +12825,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Range(float jarg1, float jarg2) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Axis() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Axis() {
   void * jresult ;
   Dali::Vector4 result;
   
@@ -12784,7 +12851,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Axis() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleAxis__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleAxis__SWIG_0() {
   void * jresult ;
   Dali::AngleAxis *result = 0 ;
   
@@ -12810,7 +12877,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleAxis__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleAxis__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleAxis__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Radian arg1 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -12850,7 +12917,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleAxis__SWIG_1(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AngleAxis_angle_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleAxis_angle_set(void * jarg1, void * jarg2) {
   Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
   Dali::Radian *arg2 = (Dali::Radian *) 0 ;
   
@@ -12860,7 +12927,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AngleAxis_angle_set(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AngleAxis_angle_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleAxis_angle_get(void * jarg1) {
   void * jresult ;
   Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
   Dali::Radian *result = 0 ;
@@ -12872,7 +12939,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AngleAxis_angle_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AngleAxis_axis_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleAxis_axis_set(void * jarg1, void * jarg2) {
   Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
   Dali::Vector3 *arg2 = (Dali::Vector3 *) 0 ;
   
@@ -12882,7 +12949,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AngleAxis_axis_set(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AngleAxis_axis_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleAxis_axis_get(void * jarg1) {
   void * jresult ;
   Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
   Dali::Vector3 *result = 0 ;
@@ -12894,7 +12961,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AngleAxis_axis_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AngleAxis(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AngleAxis(void * jarg1) {
   Dali::AngleAxis *arg1 = (Dali::AngleAxis *) 0 ;
   
   arg1 = (Dali::AngleAxis *)jarg1; 
@@ -12918,7 +12985,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AngleAxis(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_9(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_EqualTo__SWIG_9(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::AngleAxis *arg1 = 0 ;
   Dali::AngleAxis *arg2 = 0 ;
@@ -12956,7 +13023,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_EqualTo__SWIG_9(void * jarg1, voi
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_INVALID_INDEX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_INVALID_INDEX_get() {
   int jresult ;
   int result;
   
@@ -12966,7 +13033,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_INVALID_INDEX_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_INVALID_KEY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_INVALID_KEY_get() {
   int jresult ;
   int result;
   
@@ -12976,7 +13043,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_INVALID_KEY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_INVALID_COMPONENT_INDEX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_INVALID_COMPONENT_INDEX_get() {
   int jresult ;
   int result;
   
@@ -12986,7 +13053,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_INVALID_COMPONENT_INDEX_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property__SWIG_0(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_0(void * jarg1, int jarg2) {
   void * jresult ;
   Dali::Handle *arg1 = 0 ;
   Dali::Property::Index arg2 ;
@@ -13020,7 +13087,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property__SWIG_0(void * jarg1, int
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_1(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
   Dali::Handle *arg1 = 0 ;
   Dali::Property::Index arg2 ;
@@ -13056,7 +13123,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property__SWIG_1(void * jarg1, int
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property__SWIG_2(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_2(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Handle *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -13098,7 +13165,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property__SWIG_2(void * jarg1, char
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property__SWIG_3(void * jarg1, char * jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property__SWIG_3(void * jarg1, char * jarg2, int jarg3) {
   void * jresult ;
   Dali::Handle *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -13142,7 +13209,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property__SWIG_3(void * jarg1, char
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property(void * jarg1) {
   Dali::Property *arg1 = (Dali::Property *) 0 ;
   
   arg1 = (Dali::Property *)jarg1; 
@@ -13166,7 +13233,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property__object_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property__object_set(void * jarg1, void * jarg2) {
   Dali::Property *arg1 = (Dali::Property *) 0 ;
   Dali::Handle *arg2 = 0 ;
   
@@ -13180,7 +13247,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property__object_set(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property__object_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property__object_get(void * jarg1) {
   void * jresult ;
   Dali::Property *arg1 = (Dali::Property *) 0 ;
   Dali::Handle *result = 0 ;
@@ -13192,7 +13259,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property__object_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_propertyIndex_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_propertyIndex_set(void * jarg1, int jarg2) {
   Dali::Property *arg1 = (Dali::Property *) 0 ;
   Dali::Property::Index arg2 ;
   
@@ -13202,7 +13269,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_propertyIndex_set(void * jarg1,
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_propertyIndex_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_propertyIndex_get(void * jarg1) {
   int jresult ;
   Dali::Property *arg1 = (Dali::Property *) 0 ;
   Dali::Property::Index result;
@@ -13214,7 +13281,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_propertyIndex_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_componentIndex_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_componentIndex_set(void * jarg1, int jarg2) {
   Dali::Property *arg1 = (Dali::Property *) 0 ;
   int arg2 ;
   
@@ -13224,7 +13291,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_componentIndex_set(void * jarg1,
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_componentIndex_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_componentIndex_get(void * jarg1) {
   int jresult ;
   Dali::Property *arg1 = (Dali::Property *) 0 ;
   int result;
@@ -13236,7 +13303,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_componentIndex_get(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Array__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Array__SWIG_0() {
   void * jresult ;
   Dali::Property::Array *result = 0 ;
   
@@ -13262,7 +13329,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Array__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Array__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Array__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Property::Array *arg1 = 0 ;
   Dali::Property::Array *result = 0 ;
@@ -13294,7 +13361,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Array__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property_Array(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Array(void * jarg1) {
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   
   arg1 = (Dali::Property::Array *)jarg1; 
@@ -13318,7 +13385,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property_Array(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Property_Array_Size(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Size(void * jarg1) {
   unsigned long jresult ;
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Array::SizeType result;
@@ -13346,7 +13413,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Property_Array_Size(void * jarg1
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Property_Array_Count(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Count(void * jarg1) {
   unsigned long jresult ;
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Array::SizeType result;
@@ -13374,7 +13441,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Property_Array_Count(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Array_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Array_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   bool result;
@@ -13402,7 +13469,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Array_Empty(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Array_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Clear(void * jarg1) {
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   
   arg1 = (Dali::Property::Array *)jarg1; 
@@ -13426,7 +13493,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Array_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Array_Reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Reserve(void * jarg1, unsigned long jarg2) {
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Array::SizeType arg2 ;
   
@@ -13452,7 +13519,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Array_Reserve(void * jarg1, unsi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Array_Resize(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_Resize(void * jarg1, unsigned long jarg2) {
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Array::SizeType arg2 ;
   
@@ -13478,7 +13545,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Array_Resize(void * jarg1, unsig
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Property_Array_Capacity(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Array_Capacity(void * jarg1) {
   unsigned long jresult ;
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Array::SizeType result;
@@ -13506,7 +13573,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Property_Array_Capacity(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Array_PushBack(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Array_PushBack(void * jarg1, void * jarg2) {
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Value *arg2 = 0 ;
   
@@ -13536,7 +13603,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Array_PushBack(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Array_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_Add(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Value *arg2 = 0 ;
@@ -13570,7 +13637,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Array_Add(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Array_GetElementAt__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_GetElementAt__SWIG_0(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Array::SizeType arg2 ;
@@ -13600,7 +13667,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Array_GetElementAt__SWIG_0(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Array_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Array::SizeType arg2 ;
@@ -13630,7 +13697,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Array_ValueOfIndex__SWIG_0(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Array_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Array_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Property::Array *arg1 = (Dali::Property::Array *) 0 ;
   Dali::Property::Array *arg2 = 0 ;
@@ -13664,7 +13731,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Array_Assign(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Key_type_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_type_set(void * jarg1, int jarg2) {
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   enum Dali::Property::Key::Type arg2 ;
   
@@ -13674,7 +13741,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Key_type_set(void * jarg1, int j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_Key_type_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Key_type_get(void * jarg1) {
   int jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   enum Dali::Property::Key::Type result;
@@ -13686,7 +13753,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_Key_type_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Key_indexKey_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_indexKey_set(void * jarg1, int jarg2) {
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   Dali::Property::Index arg2 ;
   
@@ -13696,7 +13763,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Key_indexKey_set(void * jarg1, i
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_Key_indexKey_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Key_indexKey_get(void * jarg1) {
   int jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   Dali::Property::Index result;
@@ -13708,7 +13775,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_Key_indexKey_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Key_stringKey_set(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Key_stringKey_set(void * jarg1, char * jarg2) {
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -13726,7 +13793,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Key_stringKey_set(void * jarg1,
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Property_Key_stringKey_get(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Property_Key_stringKey_get(void * jarg1) {
   char * jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   std::string *result = 0 ;
@@ -13738,7 +13805,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Property_Key_stringKey_get(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Key__SWIG_0(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Key__SWIG_0(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::Property::Key *result = 0 ;
@@ -13774,7 +13841,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Key__SWIG_0(char * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Key__SWIG_1(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Key__SWIG_1(int jarg1) {
   void * jresult ;
   Dali::Property::Index arg1 ;
   Dali::Property::Key *result = 0 ;
@@ -13802,7 +13869,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Key__SWIG_1(int jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_EqualTo__SWIG_0(void * jarg1, char * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_0(void * jarg1, char * jarg2) {
   unsigned int jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   std::string *arg2 = 0 ;
@@ -13840,7 +13907,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_EqualTo__SWIG_0(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_EqualTo__SWIG_1(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_1(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   Dali::Property::Index arg2 ;
@@ -13870,7 +13937,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_EqualTo__SWIG_1(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_EqualTo__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Key_EqualTo__SWIG_2(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   Dali::Property::Key *arg2 = 0 ;
@@ -13904,7 +13971,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_EqualTo__SWIG_2(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_NotEqualTo__SWIG_0(void * jarg1, char * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_0(void * jarg1, char * jarg2) {
   unsigned int jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   std::string *arg2 = 0 ;
@@ -13942,7 +14009,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_NotEqualTo__SWIG_0(v
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_NotEqualTo__SWIG_1(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_1(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   Dali::Property::Index arg2 ;
@@ -13972,7 +14039,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_NotEqualTo__SWIG_1(v
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_NotEqualTo__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Key_NotEqualTo__SWIG_2(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   Dali::Property::Key *arg2 = 0 ;
@@ -14006,7 +14073,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Key_NotEqualTo__SWIG_2(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property_Key(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Key(void * jarg1) {
   Dali::Property::Key *arg1 = (Dali::Property::Key *) 0 ;
   
   arg1 = (Dali::Property::Key *)jarg1; 
@@ -14030,7 +14097,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property_Key(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Map__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Map__SWIG_0() {
   void * jresult ;
   Dali::Property::Map *result = 0 ;
   
@@ -14056,7 +14123,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Map__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Map__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Map__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Property::Map *arg1 = 0 ;
   Dali::Property::Map *result = 0 ;
@@ -14088,7 +14155,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Map__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property_Map(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Map(void * jarg1) {
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   
   arg1 = (Dali::Property::Map *)jarg1; 
@@ -14112,7 +14179,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property_Map(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Property_Map_Count(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Property_Map_Count(void * jarg1) {
   unsigned long jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Map::SizeType result;
@@ -14140,7 +14207,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Property_Map_Count(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Map_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Map_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   bool result;
@@ -14168,7 +14235,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Map_Empty(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Map_Insert__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Insert__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   char *arg2 = (char *) 0 ;
   Dali::Property::Value *arg3 = 0 ;
@@ -14200,7 +14267,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Map_Insert__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Map_Insert__SWIG_2(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Insert__SWIG_2(void * jarg1, int jarg2, void * jarg3) {
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Index arg2 ;
   Dali::Property::Value *arg3 = 0 ;
@@ -14232,7 +14299,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Map_Insert__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Add__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Add__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -14268,7 +14335,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Add__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Add__SWIG_2(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Add__SWIG_2(void * jarg1, int jarg2, void * jarg3) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Index arg2 ;
@@ -14304,7 +14371,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Add__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_GetValue(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_GetValue(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Map::SizeType arg2 ;
@@ -14334,7 +14401,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_GetValue(void * jarg1, uns
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Property_Map_GetKey(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Property_Map_GetKey(void * jarg1, unsigned long jarg2) {
   char * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Map::SizeType arg2 ;
@@ -14364,7 +14431,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Property_Map_GetKey(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_GetKeyAt(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_GetKeyAt(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Map::SizeType arg2 ;
@@ -14394,7 +14461,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_GetKeyAt(void * jarg1, uns
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_GetPair(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_GetPair(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Map::SizeType arg2 ;
@@ -14424,7 +14491,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_GetPair(void * jarg1, unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_0(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_0(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -14454,7 +14521,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_2(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_2(void * jarg1, int jarg2) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Index arg2 ;
@@ -14484,7 +14551,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_3(void * jarg1, int jarg2, char * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_3(void * jarg1, int jarg2, char * jarg3) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Index arg2 ;
@@ -14524,7 +14591,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_3(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_4(void * jarg1, char * jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_4(void * jarg1, char * jarg2, int jarg3) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   std::string *arg2 = 0 ;
@@ -14564,7 +14631,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_4(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_5(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Find__SWIG_5(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Index arg2 ;
@@ -14596,7 +14663,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Find__SWIG_5(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Map_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Clear(void * jarg1) {
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   
   arg1 = (Dali::Property::Map *)jarg1; 
@@ -14620,7 +14687,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Map_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Map_Merge(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Property_Map_Merge(void * jarg1, void * jarg2) {
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
   
@@ -14650,7 +14717,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Property_Map_Merge(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_ValueOfIndex__SWIG_0(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_ValueOfIndex__SWIG_0(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   std::string *arg2 = 0 ;
@@ -14688,7 +14755,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_ValueOfIndex__SWIG_0(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_ValueOfIndex__SWIG_2(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_ValueOfIndex__SWIG_2(void * jarg1, int jarg2) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Index arg2 ;
@@ -14718,7 +14785,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_ValueOfIndex__SWIG_2(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Map_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Property::Map *arg1 = (Dali::Property::Map *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
@@ -14752,7 +14819,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Map_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_0() {
   void * jresult ;
   Dali::Property::Value *result = 0 ;
   
@@ -14778,7 +14845,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_1(unsigned int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_1(unsigned int jarg1) {
   void * jresult ;
   bool arg1 ;
   Dali::Property::Value *result = 0 ;
@@ -14806,7 +14873,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_1(unsigned int
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_2(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_2(int jarg1) {
   void * jresult ;
   int arg1 ;
   Dali::Property::Value *result = 0 ;
@@ -14834,7 +14901,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_2(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_3(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_3(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::Property::Value *result = 0 ;
@@ -14862,7 +14929,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_3(float jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_4(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_4(void * jarg1) {
   void * jresult ;
   Dali::Vector2 *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -14894,7 +14961,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_4(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_5(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_5(void * jarg1) {
   void * jresult ;
   Dali::Vector3 *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -14926,7 +14993,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_5(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_6(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_6(void * jarg1) {
   void * jresult ;
   Dali::Vector4 *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -14958,7 +15025,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_6(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_7(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_7(void * jarg1) {
   void * jresult ;
   Dali::Matrix3 *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -14990,7 +15057,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_7(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_8(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_8(void * jarg1) {
   void * jresult ;
   Dali::Matrix *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -15022,7 +15089,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_8(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_9(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_9(void * jarg1) {
   void * jresult ;
   Dali::Rect< int > *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -15054,7 +15121,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_9(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_10(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_10(void * jarg1) {
   void * jresult ;
   Dali::AngleAxis *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -15086,7 +15153,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_10(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_11(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_11(void * jarg1) {
   void * jresult ;
   Dali::Quaternion *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -15118,7 +15185,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_11(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_12(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_12(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -15154,7 +15221,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_12(char * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_14(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_14(void * jarg1) {
   void * jresult ;
   Dali::Property::Array *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -15186,7 +15253,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_14(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_15(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_15(void * jarg1) {
   void * jresult ;
   Dali::Property::Map *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -15218,7 +15285,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_15(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_16(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_16(int jarg1) {
   void * jresult ;
   Dali::Property::Type arg1 ;
   Dali::Property::Value *result = 0 ;
@@ -15246,7 +15313,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_16(int jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_17(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Property_Value__SWIG_17(void * jarg1) {
   void * jresult ;
   Dali::Property::Value *arg1 = 0 ;
   Dali::Property::Value *result = 0 ;
@@ -15278,7 +15345,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Property_Value__SWIG_17(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Value_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Value_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Property::Value *arg2 = 0 ;
@@ -15312,7 +15379,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Value_Assign(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property_Value(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Property_Value(void * jarg1) {
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   
   arg1 = (Dali::Property::Value *)jarg1; 
@@ -15336,7 +15403,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Property_Value(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_Value_GetType(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Property_Value_GetType(void * jarg1) {
   int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Property::Type result;
@@ -15364,7 +15431,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Property_Value_GetType(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_1(void * jarg1, unsigned int * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_1(void * jarg1, unsigned int * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   bool *arg2 = 0 ;
@@ -15394,7 +15461,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_1(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_2(void * jarg1, float * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_2(void * jarg1, float * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   float *arg2 = 0 ;
@@ -15424,7 +15491,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_2(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_3(void * jarg1, int * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_3(void * jarg1, int * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   int *arg2 = 0 ;
@@ -15454,7 +15521,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_3(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_4(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_4(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Rect< int > *arg2 = 0 ;
@@ -15488,7 +15555,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_4(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_5(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_5(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -15522,7 +15589,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_5(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_6(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_6(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -15556,7 +15623,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_6(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_7(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_7(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
@@ -15590,7 +15657,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_7(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_8(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_8(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Matrix3 *arg2 = 0 ;
@@ -15624,7 +15691,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_8(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_9(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_9(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Matrix *arg2 = 0 ;
@@ -15658,7 +15725,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_9(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_10(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_10(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::AngleAxis *arg2 = 0 ;
@@ -15692,7 +15759,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_10(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_11(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_11(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
@@ -15726,7 +15793,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_11(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_12(void * jarg1, char** jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_12(void * jarg1, char** jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   std::string *arg2 = 0 ;
@@ -15765,7 +15832,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_12(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_13(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_13(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Property::Array *arg2 = 0 ;
@@ -15799,7 +15866,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_13(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_14(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Property_Value_Get__SWIG_14(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
@@ -15833,7 +15900,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Property_Value_Get__SWIG_14(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Value_GetArray(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Value_GetArray(void * jarg1) {
   void * jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Property::Array *result = 0 ;
@@ -15861,7 +15928,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Value_GetArray(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Value_GetMap(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Property_Value_GetMap(void * jarg1) {
   void * jresult ;
   Dali::Property::Value *arg1 = (Dali::Property::Value *) 0 ;
   Dali::Property::Map *result = 0 ;
@@ -15889,7 +15956,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Property_Value_GetMap(void * jarg1) {
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_GetName(int jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetName(int jarg1) {
   char * jresult ;
   Dali::Property::Type arg1 ;
   char *result = 0 ;
@@ -15917,7 +15984,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_GetName(int jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseObject_DoAction(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseObject_DoAction(void * jarg1, char * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
   std::string *arg2 = 0 ;
@@ -15961,7 +16028,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseObject_DoAction(void * jarg1,
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_BaseObject_GetTypeName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_BaseObject_GetTypeName(void * jarg1) {
   char * jresult ;
   Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
   std::string *result = 0 ;
@@ -15989,7 +16056,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_BaseObject_GetTypeName(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseObject_GetTypeInfo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseObject_GetTypeInfo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
   Dali::TypeInfo *arg2 = 0 ;
@@ -16023,7 +16090,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseObject_GetTypeInfo(void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseObject_DoConnectSignal(void * jarg1, void * jarg2, char * jarg3, void * jarg4) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseObject_DoConnectSignal(void * jarg1, void * jarg2, char * jarg3, void * jarg4) {
   unsigned int jresult ;
   Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
   ConnectionTrackerInterface *arg2 = (ConnectionTrackerInterface *) 0 ;
@@ -16065,7 +16132,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseObject_DoConnectSignal(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GetImplementation(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetImplementation(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle *arg1 = 0 ;
   Dali::BaseObject *result = 0 ;
@@ -16097,7 +16164,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GetImplementation(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BaseHandle__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::BaseObject *arg1 = (Dali::BaseObject *) 0 ;
   Dali::BaseHandle *result = 0 ;
@@ -16125,7 +16192,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BaseHandle__SWIG_0(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BaseHandle__SWIG_1() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_1() {
   void * jresult ;
   Dali::BaseHandle *result = 0 ;
   
@@ -16151,7 +16218,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BaseHandle__SWIG_1() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_BaseHandle(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_BaseHandle(void * jarg1) {
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   
   arg1 = (Dali::BaseHandle *)jarg1; 
@@ -16175,7 +16242,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_BaseHandle(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BaseHandle__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BaseHandle__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle *arg1 = 0 ;
   Dali::BaseHandle *result = 0 ;
@@ -16207,7 +16274,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BaseHandle__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BaseHandle_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   Dali::BaseHandle *arg2 = 0 ;
@@ -16241,7 +16308,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BaseHandle_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_DoAction(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseHandle_DoAction(void * jarg1, char * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   std::string *arg2 = 0 ;
@@ -16285,7 +16352,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_DoAction(void * jarg1,
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_BaseHandle_GetTypeName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_BaseHandle_GetTypeName(void * jarg1) {
   char * jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   std::string *result = 0 ;
@@ -16313,7 +16380,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_BaseHandle_GetTypeName(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_GetTypeInfo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseHandle_GetTypeInfo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   Dali::TypeInfo *arg2 = 0 ;
@@ -16347,7 +16414,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_GetTypeInfo(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BaseHandle_GetBaseObject__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_GetBaseObject__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   Dali::BaseObject *result = 0 ;
@@ -16375,7 +16442,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BaseHandle_GetBaseObject__SWIG_0(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BaseHandle_Reset(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BaseHandle_Reset(void * jarg1) {
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   
   arg1 = (Dali::BaseHandle *)jarg1; 
@@ -16399,7 +16466,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BaseHandle_Reset(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_EqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseHandle_EqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   Dali::BaseHandle *arg2 = 0 ;
@@ -16433,7 +16500,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_EqualTo(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_NotEqualTo(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseHandle_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   Dali::BaseHandle *arg2 = 0 ;
@@ -16467,7 +16534,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_NotEqualTo(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BaseHandle_GetObjectPtr(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BaseHandle_GetObjectPtr(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   Dali::RefObject *result = 0 ;
@@ -16495,7 +16562,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BaseHandle_GetObjectPtr(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_HasBody(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseHandle_HasBody(void * jarg1) {
   unsigned int jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   bool result;
@@ -16523,7 +16590,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_HasBody(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_IsEqual(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BaseHandle_IsEqual(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::BaseHandle *arg1 = (Dali::BaseHandle *) 0 ;
   Dali::BaseHandle *arg2 = 0 ;
@@ -16557,7 +16624,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BaseHandle_IsEqual(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LessThan__SWIG_3(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LessThan__SWIG_3(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::BaseHandle *arg1 = 0 ;
   Dali::BaseHandle *arg2 = 0 ;
@@ -16595,7 +16662,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LessThan__SWIG_3(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ConnectionTrackerInterface(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ConnectionTrackerInterface(void * jarg1) {
   Dali::ConnectionTrackerInterface *arg1 = (Dali::ConnectionTrackerInterface *) 0 ;
   
   arg1 = (Dali::ConnectionTrackerInterface *)jarg1; 
@@ -16619,7 +16686,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ConnectionTrackerInterface(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ConnectionTrackerInterface_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTrackerInterface_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
   Dali::ConnectionTrackerInterface *arg1 = (Dali::ConnectionTrackerInterface *) 0 ;
   SlotObserver *arg2 = (SlotObserver *) 0 ;
   CallbackBase *arg3 = (CallbackBase *) 0 ;
@@ -16647,7 +16714,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ConnectionTrackerInterface_SignalConnecte
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SignalObserver(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SignalObserver(void * jarg1) {
   Dali::SignalObserver *arg1 = (Dali::SignalObserver *) 0 ;
   
   arg1 = (Dali::SignalObserver *)jarg1; 
@@ -16671,7 +16738,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SignalObserver(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SignalObserver_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SignalObserver_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
   Dali::SignalObserver *arg1 = (Dali::SignalObserver *) 0 ;
   Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
   Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
@@ -16699,7 +16766,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SignalObserver_SignalDisconnected(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SlotObserver(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SlotObserver(void * jarg1) {
   Dali::SlotObserver *arg1 = (Dali::SlotObserver *) 0 ;
   
   arg1 = (Dali::SlotObserver *)jarg1; 
@@ -16723,7 +16790,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SlotObserver(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SlotObserver_SlotDisconnected(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SlotObserver_SlotDisconnected(void * jarg1, void * jarg2) {
   Dali::SlotObserver *arg1 = (Dali::SlotObserver *) 0 ;
   Dali::CallbackBase *arg2 = (Dali::CallbackBase *) 0 ;
   
@@ -16749,7 +16816,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SlotObserver_SlotDisconnected(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ConnectionTracker(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ConnectionTracker(void * jarg1) {
   Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
   
   arg1 = (Dali::ConnectionTracker *)jarg1; 
@@ -16773,7 +16840,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ConnectionTracker(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ConnectionTracker_DisconnectAll(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_DisconnectAll(void * jarg1) {
   Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
   
   arg1 = (Dali::ConnectionTracker *)jarg1; 
@@ -16797,7 +16864,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ConnectionTracker_DisconnectAll(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ConnectionTracker_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
   Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
   Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
   Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
@@ -16825,7 +16892,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ConnectionTracker_SignalConnected(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ConnectionTracker_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ConnectionTracker_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
   Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
   Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
   Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
@@ -16853,7 +16920,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ConnectionTracker_SignalDisconnected(void
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ConnectionTracker_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ConnectionTracker_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::ConnectionTracker *arg1 = (Dali::ConnectionTracker *) 0 ;
   std::size_t result;
@@ -16881,7 +16948,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ConnectionTracker_GetConnectionC
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ObjectRegistry__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectRegistry__SWIG_0() {
   void * jresult ;
   Dali::ObjectRegistry *result = 0 ;
   
@@ -16907,7 +16974,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ObjectRegistry__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ObjectRegistry(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ObjectRegistry(void * jarg1) {
   Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
   
   arg1 = (Dali::ObjectRegistry *)jarg1; 
@@ -16931,7 +16998,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ObjectRegistry(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ObjectRegistry__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectRegistry__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::ObjectRegistry *arg1 = 0 ;
   Dali::ObjectRegistry *result = 0 ;
@@ -16963,7 +17030,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ObjectRegistry__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ObjectRegistry_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
   Dali::ObjectRegistry *arg2 = 0 ;
@@ -16997,7 +17064,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ObjectRegistry_Assign(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ObjectRegistry_ObjectCreatedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_ObjectCreatedSignal(void * jarg1) {
   void * jresult ;
   Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
   Dali::ObjectRegistry::ObjectCreatedSignalType *result = 0 ;
@@ -17025,7 +17092,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ObjectRegistry_ObjectCreatedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ObjectRegistry_ObjectDestroyedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ObjectRegistry_ObjectDestroyedSignal(void * jarg1) {
   void * jresult ;
   Dali::ObjectRegistry *arg1 = (Dali::ObjectRegistry *) 0 ;
   Dali::ObjectRegistry::ObjectDestroyedSignalType *result = 0 ;
@@ -17053,7 +17120,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ObjectRegistry_ObjectDestroyedSignal(vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyCondition__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyCondition__SWIG_0() {
   void * jresult ;
   Dali::PropertyCondition *result = 0 ;
   
@@ -17079,7 +17146,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyCondition__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyCondition(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyCondition(void * jarg1) {
   Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
   
   arg1 = (Dali::PropertyCondition *)jarg1; 
@@ -17103,7 +17170,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyCondition(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyCondition__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyCondition__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::PropertyCondition *arg1 = 0 ;
   Dali::PropertyCondition *result = 0 ;
@@ -17135,7 +17202,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyCondition__SWIG_1(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyCondition_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyCondition_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
   Dali::PropertyCondition *arg2 = 0 ;
@@ -17169,7 +17236,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyCondition_Assign(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PropertyCondition_GetArgumentCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PropertyCondition_GetArgumentCount(void * jarg1) {
   unsigned long jresult ;
   Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
   std::size_t result;
@@ -17197,7 +17264,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PropertyCondition_GetArgumentCou
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PropertyCondition_GetArgument(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PropertyCondition_GetArgument(void * jarg1, unsigned long jarg2) {
   float jresult ;
   Dali::PropertyCondition *arg1 = (Dali::PropertyCondition *) 0 ;
   std::size_t arg2 ;
@@ -17227,7 +17294,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PropertyCondition_GetArgument(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LessThanCondition(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LessThanCondition(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::PropertyCondition result;
@@ -17255,7 +17322,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LessThanCondition(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GreaterThanCondition(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GreaterThanCondition(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::PropertyCondition result;
@@ -17283,7 +17350,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GreaterThanCondition(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_InsideCondition(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_InsideCondition(float jarg1, float jarg2) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -17313,7 +17380,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_InsideCondition(float jarg1, float jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_OutsideCondition(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_OutsideCondition(float jarg1, float jarg2) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -17343,7 +17410,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_OutsideCondition(float jarg1, float jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StepCondition__SWIG_0(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StepCondition__SWIG_0(float jarg1, float jarg2) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -17373,7 +17440,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StepCondition__SWIG_0(float jarg1, floa
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StepCondition__SWIG_1(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StepCondition__SWIG_1(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::PropertyCondition result;
@@ -17401,7 +17468,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StepCondition__SWIG_1(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VariableStepCondition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VariableStepCondition(void * jarg1) {
   void * jresult ;
   Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > *arg1 = 0 ;
   Dali::PropertyCondition result;
@@ -17433,7 +17500,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VariableStepCondition(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyNotification__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotification__SWIG_0() {
   void * jresult ;
   Dali::PropertyNotification *result = 0 ;
   
@@ -17459,7 +17526,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyNotification__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -17493,7 +17560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_DownCast(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyNotification(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyNotification(void * jarg1) {
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   
   arg1 = (Dali::PropertyNotification *)jarg1; 
@@ -17517,7 +17584,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyNotification(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyNotification__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotification__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::PropertyNotification *arg1 = 0 ;
   Dali::PropertyNotification *result = 0 ;
@@ -17549,7 +17616,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyNotification__SWIG_1(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   Dali::PropertyNotification *arg2 = 0 ;
@@ -17583,7 +17650,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_Assign(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_GetCondition__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_GetCondition__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   Dali::PropertyCondition result;
@@ -17611,7 +17678,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_GetCondition__SWIG
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_GetTarget(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_GetTarget(void * jarg1) {
   void * jresult ;
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   Dali::Handle result;
@@ -17639,7 +17706,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_GetTarget(void * j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PropertyNotification_GetTargetProperty(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PropertyNotification_GetTargetProperty(void * jarg1) {
   int jresult ;
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   Dali::Property::Index result;
@@ -17667,7 +17734,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PropertyNotification_GetTargetProperty(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyNotification_SetNotifyMode(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotification_SetNotifyMode(void * jarg1, int jarg2) {
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   Dali::PropertyNotification::NotifyMode arg2 ;
   
@@ -17693,7 +17760,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyNotification_SetNotifyMode(void *
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PropertyNotification_GetNotifyMode(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PropertyNotification_GetNotifyMode(void * jarg1) {
   int jresult ;
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   Dali::PropertyNotification::NotifyMode result;
@@ -17721,7 +17788,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PropertyNotification_GetNotifyMode(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PropertyNotification_GetNotifyResult(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PropertyNotification_GetNotifyResult(void * jarg1) {
   unsigned int jresult ;
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   bool result;
@@ -17749,7 +17816,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PropertyNotification_GetNotifyRes
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_NotifySignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyNotification_NotifySignal(void * jarg1) {
   void * jresult ;
   Dali::PropertyNotification *arg1 = (Dali::PropertyNotification *) 0 ;
   Dali::PropertyNotifySignalType *result = 0 ;
@@ -17777,7 +17844,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyNotification_NotifySignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Handle__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Handle__SWIG_0() {
   void * jresult ;
   Dali::Handle *result = 0 ;
   
@@ -17803,7 +17870,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Handle__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_New() {
   void * jresult ;
   Dali::Handle result;
   
@@ -17829,7 +17896,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_New() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Handle(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Handle(void * jarg1) {
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   
   arg1 = (Dali::Handle *)jarg1; 
@@ -17853,7 +17920,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Handle(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Handle__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Handle__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Handle *arg1 = 0 ;
   Dali::Handle *result = 0 ;
@@ -17885,7 +17952,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Handle__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Handle *arg2 = 0 ;
@@ -17919,7 +17986,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_Assign(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -17953,7 +18020,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_Supports(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Handle_Supports(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Handle::Capability arg2 ;
@@ -17983,7 +18050,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_Supports(void * jarg1, int
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_GetPropertyCount(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyCount(void * jarg1) {
   unsigned int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   unsigned int result;
@@ -18011,7 +18078,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_GetPropertyCount(void * ja
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Handle_GetPropertyName(void * jarg1, int jarg2) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Handle_GetPropertyName(void * jarg1, int jarg2) {
   char * jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
@@ -18041,7 +18108,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Handle_GetPropertyName(void * jarg1, in
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Handle_GetPropertyIndex(void * jarg1, char * jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyIndex(void * jarg1, char * jarg2) {
   int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   std::string *arg2 = 0 ;
@@ -18079,7 +18146,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Handle_GetPropertyIndex(void * jarg1, char
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_IsPropertyWritable(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Handle_IsPropertyWritable(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
@@ -18109,7 +18176,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_IsPropertyWritable(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_IsPropertyAnimatable(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Handle_IsPropertyAnimatable(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
@@ -18139,7 +18206,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_IsPropertyAnimatable(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_IsPropertyAConstraintInput(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Handle_IsPropertyAConstraintInput(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
@@ -18169,7 +18236,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Handle_IsPropertyAConstraintInput
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Handle_GetPropertyType(void * jarg1, int jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_GetPropertyType(void * jarg1, int jarg2) {
   int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
@@ -18199,7 +18266,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Handle_GetPropertyType(void * jarg1, int j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_SetProperty(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_SetProperty(void * jarg1, int jarg2, void * jarg3) {
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
   Dali::Property::Value *arg3 = 0 ;
@@ -18231,7 +18298,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_SetProperty(void * jarg1, int jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Handle_RegisterProperty__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_RegisterProperty__SWIG_0(void * jarg1, char * jarg2, void * jarg3) {
   int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   std::string *arg2 = 0 ;
@@ -18275,7 +18342,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Handle_RegisterProperty__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Handle_RegisterProperty__SWIG_1(void * jarg1, char * jarg2, void * jarg3, int jarg4) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Handle_RegisterProperty__SWIG_1(void * jarg1, char * jarg2, void * jarg3, int jarg4) {
   int jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   std::string *arg2 = 0 ;
@@ -18321,7 +18388,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Handle_RegisterProperty__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_GetProperty(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_GetProperty(void * jarg1, int jarg2) {
   void * jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
@@ -18351,7 +18418,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_GetProperty(void * jarg1, int ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_GetPropertyIndices(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_GetPropertyIndices(void * jarg1, void * jarg2) {
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::IndexContainer *arg2 = 0 ;
   
@@ -18381,7 +18448,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_GetPropertyIndices(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_AddPropertyNotification__SWIG_0(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_AddPropertyNotification__SWIG_0(void * jarg1, int jarg2, void * jarg3) {
   void * jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
@@ -18417,7 +18484,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_AddPropertyNotification__SWIG_0(
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_AddPropertyNotification__SWIG_1(void * jarg1, int jarg2, int jarg3, void * jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Handle_AddPropertyNotification__SWIG_1(void * jarg1, int jarg2, int jarg3, void * jarg4) {
   void * jresult ;
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::Property::Index arg2 ;
@@ -18455,7 +18522,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Handle_AddPropertyNotification__SWIG_1(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_RemovePropertyNotification(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemovePropertyNotification(void * jarg1, void * jarg2) {
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   Dali::PropertyNotification arg2 ;
   Dali::PropertyNotification *argp2 ;
@@ -18487,7 +18554,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_RemovePropertyNotification(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_RemovePropertyNotifications(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemovePropertyNotifications(void * jarg1) {
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   
   arg1 = (Dali::Handle *)jarg1; 
@@ -18511,7 +18578,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_RemovePropertyNotifications(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_RemoveConstraints__SWIG_0(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemoveConstraints__SWIG_0(void * jarg1) {
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   
   arg1 = (Dali::Handle *)jarg1; 
@@ -18535,7 +18602,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_RemoveConstraints__SWIG_0(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_RemoveConstraints__SWIG_1(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Handle_RemoveConstraints__SWIG_1(void * jarg1, unsigned int jarg2) {
   Dali::Handle *arg1 = (Dali::Handle *) 0 ;
   unsigned int arg2 ;
   
@@ -18561,7 +18628,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Handle_RemoveConstraints__SWIG_1(void * j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_WEIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_WEIGHT_get() {
   int jresult ;
   Dali::Property::Index result;
   
@@ -18571,7 +18638,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_WEIGHT_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_New() {
   void * jresult ;
   Dali::Handle result;
   
@@ -18597,7 +18664,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeInfo__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeInfo__SWIG_0() {
   void * jresult ;
   Dali::TypeInfo *result = 0 ;
   
@@ -18623,7 +18690,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeInfo__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TypeInfo(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeInfo(void * jarg1) {
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   
   arg1 = (Dali::TypeInfo *)jarg1; 
@@ -18647,7 +18714,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TypeInfo(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeInfo__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeInfo__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::TypeInfo *arg1 = 0 ;
   Dali::TypeInfo *result = 0 ;
@@ -18679,7 +18746,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeInfo__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeInfo_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeInfo_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   Dali::TypeInfo *arg2 = 0 ;
@@ -18713,7 +18780,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeInfo_Assign(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetName(void * jarg1) {
   char * jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   std::string *result = 0 ;
@@ -18741,7 +18808,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetName(void * jarg1) {
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetBaseName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetBaseName(void * jarg1) {
   char * jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   std::string *result = 0 ;
@@ -18769,7 +18836,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetBaseName(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeInfo_CreateInstance(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeInfo_CreateInstance(void * jarg1) {
   void * jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   Dali::BaseHandle result;
@@ -18797,35 +18864,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeInfo_CreateInstance(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeInfo_GetCreator(void * jarg1) {
-  void * jresult ;
-  Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
-  Dali::TypeInfo::CreateFunction result;
-  
-  arg1 = (Dali::TypeInfo *)jarg1; 
-  {
-    try {
-      result = (Dali::TypeInfo::CreateFunction)((Dali::TypeInfo const *)arg1)->GetCreator();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TypeInfo_GetActionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeInfo_GetActionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   size_t result;
@@ -18853,7 +18892,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TypeInfo_GetActionCount(void * j
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetActionName(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetActionName(void * jarg1, unsigned long jarg2) {
   char * jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   size_t arg2 ;
@@ -18883,7 +18922,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetActionName(void * jarg1, un
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TypeInfo_GetSignalCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeInfo_GetSignalCount(void * jarg1) {
   unsigned long jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   size_t result;
@@ -18911,7 +18950,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TypeInfo_GetSignalCount(void * j
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetSignalName(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetSignalName(void * jarg1, unsigned long jarg2) {
   char * jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   size_t arg2 ;
@@ -18941,7 +18980,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetSignalName(void * jarg1, un
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TypeInfo_GetPropertyCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeInfo_GetPropertyCount(void * jarg1) {
   unsigned long jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   size_t result;
@@ -18969,7 +19008,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TypeInfo_GetPropertyCount(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TypeInfo_GetPropertyIndices(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TypeInfo_GetPropertyIndices(void * jarg1, void * jarg2) {
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   Dali::Property::IndexContainer *arg2 = 0 ;
   
@@ -18999,7 +19038,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TypeInfo_GetPropertyIndices(void * jarg1,
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetPropertyName(void * jarg1, int jarg2) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeInfo_GetPropertyName(void * jarg1, int jarg2) {
   char * jresult ;
   Dali::TypeInfo *arg1 = (Dali::TypeInfo *) 0 ;
   Dali::Property::Index arg2 ;
@@ -19029,7 +19068,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeInfo_GetPropertyName(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeRegistry_Get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_Get() {
   void * jresult ;
   Dali::TypeRegistry result;
   
@@ -19055,7 +19094,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeRegistry_Get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistry__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistry__SWIG_0() {
   void * jresult ;
   Dali::TypeRegistry *result = 0 ;
   
@@ -19081,7 +19120,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistry__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TypeRegistry(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeRegistry(void * jarg1) {
   Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
   
   arg1 = (Dali::TypeRegistry *)jarg1; 
@@ -19105,7 +19144,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TypeRegistry(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistry__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistry__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::TypeRegistry *arg1 = 0 ;
   Dali::TypeRegistry *result = 0 ;
@@ -19137,7 +19176,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistry__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeRegistry_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
   Dali::TypeRegistry *arg2 = 0 ;
@@ -19171,7 +19210,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeRegistry_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeRegistry_GetTypeInfo__SWIG_0(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeInfo__SWIG_0(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
   std::string *arg2 = 0 ;
@@ -19209,7 +19248,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeRegistry_GetTypeInfo__SWIG_0(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeRegistry_GetTypeInfo__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeInfo__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
   std::type_info *arg2 = 0 ;
@@ -19243,7 +19282,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TypeRegistry_GetTypeInfo__SWIG_1(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TypeRegistry_GetTypeNameCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeNameCount(void * jarg1) {
   unsigned long jresult ;
   Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
   size_t result;
@@ -19271,7 +19310,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TypeRegistry_GetTypeNameCount(vo
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeRegistry_GetTypeName(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeRegistry_GetTypeName(void * jarg1, unsigned long jarg2) {
   char * jresult ;
   Dali::TypeRegistry *arg1 = (Dali::TypeRegistry *) 0 ;
   size_t arg2 ;
@@ -19301,7 +19340,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeRegistry_GetTypeName(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistry__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistry__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Internal::TypeRegistry *arg1 = (Dali::Internal::TypeRegistry *) 0 ;
   Dali::TypeRegistry *result = 0 ;
@@ -19329,7 +19368,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistry__SWIG_2(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistration__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
   std::type_info *arg1 = 0 ;
   std::type_info *arg2 = 0 ;
@@ -19369,7 +19408,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistration__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistration__SWIG_1(void * jarg1, void * jarg2, void * jarg3, unsigned int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_1(void * jarg1, void * jarg2, void * jarg3, unsigned int jarg4) {
   void * jresult ;
   std::type_info *arg1 = 0 ;
   std::type_info *arg2 = 0 ;
@@ -19411,7 +19450,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistration__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistration__SWIG_2(char * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeRegistration__SWIG_2(char * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
   std::string *arg1 = 0 ;
   std::type_info *arg2 = 0 ;
@@ -19455,7 +19494,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeRegistration__SWIG_2(char * jar
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeRegistration_RegisteredName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisteredName(void * jarg1) {
   char * jresult ;
   Dali::TypeRegistration *arg1 = (Dali::TypeRegistration *) 0 ;
   std::string result;
@@ -19483,81 +19522,20 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_TypeRegistration_RegisteredName(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TypeRegistration(void * jarg1) {
-  Dali::TypeRegistration *arg1 = (Dali::TypeRegistration *) 0 ;
-  
-  arg1 = (Dali::TypeRegistration *)jarg1; 
-  {
-    try {
-      delete arg1;
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_SignalConnectorType(void * jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::TypeInfo::SignalConnectorFunction arg3 = (Dali::TypeInfo::SignalConnectorFunction) 0 ;
-  Dali::SignalConnectorType *result = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisterControl(char * jarg1, void * jarg2) {
+  std::string *arg1 = 0 ;
+  Dali::CSharpTypeInfo::CreateFunction arg2 = (Dali::CSharpTypeInfo::CreateFunction) 0 ;
   
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  } 
-  if (!jarg2) {
+  if (!jarg1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str; 
-  arg3 = (Dali::TypeInfo::SignalConnectorFunction)jarg3; 
-  {
-    try {
-      result = (Dali::SignalConnectorType *)new Dali::SignalConnectorType(*arg1,(std::string const &)*arg2,arg3);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
+    return ;
   }
-  jresult = (void *)result; 
-  
-  //argout typemap for const std::string&
-  
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SignalConnectorType(void * jarg1) {
-  Dali::SignalConnectorType *arg1 = (Dali::SignalConnectorType *) 0 ;
-  
-  arg1 = (Dali::SignalConnectorType *)jarg1; 
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str; 
+  arg2 = (Dali::CSharpTypeInfo::CreateFunction)jarg2; 
   {
     try {
-      delete arg1;
+      Dali_TypeRegistration_RegisterControl((std::string const &)*arg1,arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
@@ -19572,131 +19550,66 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SignalConnectorType(void * jarg1)
       };
     }
   }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TypeAction(void * jarg1, char * jarg2, void * jarg3) {
-  void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
-  std::string *arg2 = 0 ;
-  Dali::TypeInfo::ActionFunction arg3 = (Dali::TypeInfo::ActionFunction) 0 ;
-  Dali::TypeAction *result = 0 ;
-  
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  } 
-  if (!jarg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
-  }
-  std::string arg2_str(jarg2);
-  arg2 = &arg2_str; 
-  arg3 = (Dali::TypeInfo::ActionFunction)jarg3; 
-  {
-    try {
-      result = (Dali::TypeAction *)new Dali::TypeAction(*arg1,(std::string const &)*arg2,arg3);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
   
   //argout typemap for const std::string&
   
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TypeAction(void * jarg1) {
-  Dali::TypeAction *arg1 = (Dali::TypeAction *) 0 ;
-  
-  arg1 = (Dali::TypeAction *)jarg1; 
-  {
-    try {
-      delete arg1;
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
-  void * jresult ;
-  Dali::TypeRegistration *arg1 = 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TypeRegistration_RegisterProperty(char * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
+  std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
-  Dali::Property::Index arg3 ;
+  int arg3 ;
   Dali::Property::Type arg4 ;
-  Dali::TypeInfo::SetPropertyFunction arg5 = (Dali::TypeInfo::SetPropertyFunction) 0 ;
-  Dali::TypeInfo::GetPropertyFunction arg6 = (Dali::TypeInfo::GetPropertyFunction) 0 ;
-  Dali::PropertyRegistration *result = 0 ;
+  Dali::CSharpTypeInfo::SetPropertyFunction arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction) 0 ;
+  Dali::CSharpTypeInfo::GetPropertyFunction arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction) 0 ;
   
-  arg1 = (Dali::TypeRegistration *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
-    return 0;
-  } 
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return ;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str; 
   if (!jarg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
-    return 0;
+    return ;
   }
   std::string arg2_str(jarg2);
   arg2 = &arg2_str; 
-  arg3 = (Dali::Property::Index)jarg3; 
+  arg3 = (int)jarg3; 
   arg4 = (Dali::Property::Type)jarg4; 
-  arg5 = (Dali::TypeInfo::SetPropertyFunction)jarg5; 
-  arg6 = (Dali::TypeInfo::GetPropertyFunction)jarg6; 
+  arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction)jarg5; 
+  arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction)jarg6; 
   {
     try {
-      result = (Dali::PropertyRegistration *)new Dali::PropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
+      Dali_TypeRegistration_RegisterProperty((std::string const &)*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
     } catch (std::out_of_range& e) {
       {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
       };
     } catch (std::exception& e) {
       {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
       };
     } catch (...) {
       {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
       };
     }
   }
-  jresult = (void *)result; 
   
   //argout typemap for const std::string&
   
-  return jresult;
+  
+  //argout typemap for const std::string&
+  
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyRegistration(void * jarg1) {
-  Dali::PropertyRegistration *arg1 = (Dali::PropertyRegistration *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeRegistration(void * jarg1) {
+  Dali::TypeRegistration *arg1 = (Dali::TypeRegistration *) 0 ;
   
-  arg1 = (Dali::PropertyRegistration *)jarg1; 
+  arg1 = (Dali::TypeRegistration *)jarg1; 
   {
     try {
       delete arg1;
@@ -19717,13 +19630,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyRegistration(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimatablePropertyRegistration__SWIG_0(void * jarg1, char * jarg2, int jarg3, int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_SignalConnectorType(void * jarg1, char * jarg2, void * jarg3) {
   void * jresult ;
   Dali::TypeRegistration *arg1 = 0 ;
   std::string *arg2 = 0 ;
-  Dali::Property::Index arg3 ;
-  Dali::Property::Type arg4 ;
-  Dali::AnimatablePropertyRegistration *result = 0 ;
+  Dali::TypeInfo::SignalConnectorFunction arg3 = (Dali::TypeInfo::SignalConnectorFunction) 0 ;
+  Dali::SignalConnectorType *result = 0 ;
   
   arg1 = (Dali::TypeRegistration *)jarg1;
   if (!arg1) {
@@ -19736,11 +19648,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimatablePropertyRegistration__SWI
   }
   std::string arg2_str(jarg2);
   arg2 = &arg2_str; 
-  arg3 = (Dali::Property::Index)jarg3; 
-  arg4 = (Dali::Property::Type)jarg4; 
+  arg3 = (Dali::TypeInfo::SignalConnectorFunction)jarg3; 
   {
     try {
-      result = (Dali::AnimatablePropertyRegistration *)new Dali::AnimatablePropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4);
+      result = (Dali::SignalConnectorType *)new Dali::SignalConnectorType(*arg1,(std::string const &)*arg2,arg3);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -19763,7 +19674,219 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimatablePropertyRegistration__SWI
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimatablePropertyRegistration__SWIG_1(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SignalConnectorType(void * jarg1) {
+  Dali::SignalConnectorType *arg1 = (Dali::SignalConnectorType *) 0 ;
+  
+  arg1 = (Dali::SignalConnectorType *)jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
+      };
+    }
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TypeAction(void * jarg1, char * jarg2, void * jarg3) {
+  void * jresult ;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::TypeInfo::ActionFunction arg3 = (Dali::TypeInfo::ActionFunction) 0 ;
+  Dali::TypeAction *result = 0 ;
+  
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
+  } 
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str; 
+  arg3 = (Dali::TypeInfo::ActionFunction)jarg3; 
+  {
+    try {
+      result = (Dali::TypeAction *)new Dali::TypeAction(*arg1,(std::string const &)*arg2,arg3);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  
+  //argout typemap for const std::string&
+  
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TypeAction(void * jarg1) {
+  Dali::TypeAction *arg1 = (Dali::TypeAction *) 0 ;
+  
+  arg1 = (Dali::TypeAction *)jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
+      };
+    }
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
+  void * jresult ;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Type arg4 ;
+  Dali::TypeInfo::SetPropertyFunction arg5 = (Dali::TypeInfo::SetPropertyFunction) 0 ;
+  Dali::TypeInfo::GetPropertyFunction arg6 = (Dali::TypeInfo::GetPropertyFunction) 0 ;
+  Dali::PropertyRegistration *result = 0 ;
+  
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
+  } 
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str; 
+  arg3 = (Dali::Property::Index)jarg3; 
+  arg4 = (Dali::Property::Type)jarg4; 
+  arg5 = (Dali::TypeInfo::SetPropertyFunction)jarg5; 
+  arg6 = (Dali::TypeInfo::GetPropertyFunction)jarg6; 
+  {
+    try {
+      result = (Dali::PropertyRegistration *)new Dali::PropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  
+  //argout typemap for const std::string&
+  
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyRegistration(void * jarg1) {
+  Dali::PropertyRegistration *arg1 = (Dali::PropertyRegistration *) 0 ;
+  
+  arg1 = (Dali::PropertyRegistration *)jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
+      };
+    }
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyRegistration__SWIG_0(void * jarg1, char * jarg2, int jarg3, int jarg4) {
+  void * jresult ;
+  Dali::TypeRegistration *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Type arg4 ;
+  Dali::AnimatablePropertyRegistration *result = 0 ;
+  
+  arg1 = (Dali::TypeRegistration *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TypeRegistration & type is null", 0);
+    return 0;
+  } 
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str; 
+  arg3 = (Dali::Property::Index)jarg3; 
+  arg4 = (Dali::Property::Type)jarg4; 
+  {
+    try {
+      result = (Dali::AnimatablePropertyRegistration *)new Dali::AnimatablePropertyRegistration(*arg1,(std::string const &)*arg2,arg3,arg4);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  
+  //argout typemap for const std::string&
+  
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyRegistration__SWIG_1(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
   void * jresult ;
   Dali::TypeRegistration *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -19813,7 +19936,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimatablePropertyRegistration__SWI
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AnimatablePropertyRegistration(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AnimatablePropertyRegistration(void * jarg1) {
   Dali::AnimatablePropertyRegistration *arg1 = (Dali::AnimatablePropertyRegistration *) 0 ;
   
   arg1 = (Dali::AnimatablePropertyRegistration *)jarg1; 
@@ -19837,7 +19960,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AnimatablePropertyRegistration(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimatablePropertyComponentRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4, unsigned int jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimatablePropertyComponentRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4, unsigned int jarg5) {
   void * jresult ;
   Dali::TypeRegistration *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -19885,7 +20008,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimatablePropertyComponentRegistra
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AnimatablePropertyComponentRegistration(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AnimatablePropertyComponentRegistration(void * jarg1) {
   Dali::AnimatablePropertyComponentRegistration *arg1 = (Dali::AnimatablePropertyComponentRegistration *) 0 ;
   
   arg1 = (Dali::AnimatablePropertyComponentRegistration *)jarg1; 
@@ -19909,7 +20032,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AnimatablePropertyComponentRegistr
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ChildPropertyRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ChildPropertyRegistration(void * jarg1, char * jarg2, int jarg3, int jarg4) {
   void * jresult ;
   Dali::TypeRegistration *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -19955,7 +20078,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ChildPropertyRegistration(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ChildPropertyRegistration(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ChildPropertyRegistration(void * jarg1) {
   Dali::ChildPropertyRegistration *arg1 = (Dali::ChildPropertyRegistration *) 0 ;
   
   arg1 = (Dali::ChildPropertyRegistration *)jarg1; 
@@ -19979,7 +20102,105 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ChildPropertyRegistration(void * j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginTop_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RegisterType(char * jarg1, void * jarg2, void * jarg3) {
+  unsigned int jresult ;
+  std::string *arg1 = 0 ;
+  std::type_info *arg2 = 0 ;
+  Dali::CSharpTypeInfo::CreateFunction arg3 = (Dali::CSharpTypeInfo::CreateFunction) 0 ;
+  bool result;
+  
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str; 
+  arg2 = (std::type_info *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
+    return 0;
+  } 
+  arg3 = (Dali::CSharpTypeInfo::CreateFunction)jarg3; 
+  {
+    try {
+      result = (bool)Dali::CSharpTypeRegistry::RegisterType((std::string const &)*arg1,(std::type_info const &)*arg2,arg3);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = result; 
+  
+  //argout typemap for const std::string&
+  
+  return jresult;
+}
+
+
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RegisterProperty(char * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5, void * jarg6) {
+  unsigned int jresult ;
+  std::string *arg1 = 0 ;
+  std::string *arg2 = 0 ;
+  Dali::Property::Index arg3 ;
+  Dali::Property::Type arg4 ;
+  Dali::CSharpTypeInfo::SetPropertyFunction arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction) 0 ;
+  Dali::CSharpTypeInfo::GetPropertyFunction arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction) 0 ;
+  bool result;
+  
+  if (!jarg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg1_str(jarg1);
+  arg1 = &arg1_str; 
+  if (!jarg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
+    return 0;
+  }
+  std::string arg2_str(jarg2);
+  arg2 = &arg2_str; 
+  arg3 = (Dali::Property::Index)jarg3; 
+  arg4 = (Dali::Property::Type)jarg4; 
+  arg5 = (Dali::CSharpTypeInfo::SetPropertyFunction)jarg5; 
+  arg6 = (Dali::CSharpTypeInfo::GetPropertyFunction)jarg6; 
+  {
+    try {
+      result = (bool)Dali::CSharpTypeRegistry::RegisterProperty((std::string const &)*arg1,(std::string const &)*arg2,arg3,arg4,arg5,arg6);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = result; 
+  
+  //argout typemap for const std::string&
+  
+  
+  //argout typemap for const std::string&
+  
+  return jresult;
+}
+
+
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ParentOriginTop_get() {
   float jresult ;
   float result;
   
@@ -19989,7 +20210,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginTop_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginBottom_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ParentOriginBottom_get() {
   float jresult ;
   float result;
   
@@ -19999,7 +20220,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginBottom_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginLeft_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ParentOriginLeft_get() {
   float jresult ;
   float result;
   
@@ -20009,7 +20230,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginLeft_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginRight_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ParentOriginRight_get() {
   float jresult ;
   float result;
   
@@ -20019,7 +20240,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginRight_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginMiddle_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ParentOriginMiddle_get() {
   float jresult ;
   float result;
   
@@ -20029,7 +20250,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ParentOriginMiddle_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginTopLeft_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginTopLeft_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20039,7 +20260,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginTopLeft_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginTopCenter_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginTopCenter_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20049,7 +20270,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginTopCenter_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginTopRight_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginTopRight_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20059,7 +20280,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginTopRight_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginCenterLeft_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginCenterLeft_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20069,7 +20290,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginCenterLeft_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginCenter_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginCenter_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20079,7 +20300,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginCenter_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginCenterRight_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginCenterRight_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20089,7 +20310,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginCenterRight_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginBottomLeft_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginBottomLeft_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20099,7 +20320,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginBottomLeft_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginBottomCenter_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginBottomCenter_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20109,7 +20330,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginBottomCenter_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginBottomRight_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ParentOriginBottomRight_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20119,7 +20340,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ParentOriginBottomRight_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointTop_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_AnchorPointTop_get() {
   float jresult ;
   float result;
   
@@ -20129,7 +20350,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointTop_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointBottom_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_AnchorPointBottom_get() {
   float jresult ;
   float result;
   
@@ -20139,7 +20360,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointBottom_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointLeft_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_AnchorPointLeft_get() {
   float jresult ;
   float result;
   
@@ -20149,7 +20370,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointLeft_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointRight_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_AnchorPointRight_get() {
   float jresult ;
   float result;
   
@@ -20159,7 +20380,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointRight_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointMiddle_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_AnchorPointMiddle_get() {
   float jresult ;
   float result;
   
@@ -20169,7 +20390,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_AnchorPointMiddle_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointTopLeft_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointTopLeft_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20179,7 +20400,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointTopLeft_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointTopCenter_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointTopCenter_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20189,7 +20410,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointTopCenter_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointTopRight_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointTopRight_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20199,7 +20420,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointTopRight_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointCenterLeft_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointCenterLeft_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20209,7 +20430,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointCenterLeft_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointCenter_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointCenter_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20219,7 +20440,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointCenter_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointCenterRight_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointCenterRight_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20229,7 +20450,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointCenterRight_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointBottomLeft_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointBottomLeft_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20239,7 +20460,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointBottomLeft_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointBottomCenter_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointBottomCenter_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20249,7 +20470,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointBottomCenter_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointBottomRight_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AnchorPointBottomRight_get() {
   void * jresult ;
   Dali::Vector3 *result = 0 ;
   
@@ -20259,7 +20480,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AnchorPointBottomRight_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BLACK_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BLACK_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20269,7 +20490,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BLACK_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_WHITE_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_WHITE_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20279,7 +20500,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_WHITE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RED_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RED_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20289,7 +20510,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RED_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GREEN_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GREEN_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20299,7 +20520,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GREEN_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BLUE_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BLUE_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20309,7 +20530,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BLUE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_YELLOW_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_YELLOW_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20319,7 +20540,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_YELLOW_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_MAGENTA_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_MAGENTA_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20329,7 +20550,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_MAGENTA_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CYAN_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CYAN_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20339,7 +20560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CYAN_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TRANSPARENT_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TRANSPARENT_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -20349,7 +20570,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TRANSPARENT_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_0_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_MACHINE_EPSILON_0_get() {
   float jresult ;
   float result;
   
@@ -20359,7 +20580,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_0_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_1_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_MACHINE_EPSILON_1_get() {
   float jresult ;
   float result;
   
@@ -20369,7 +20590,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_1_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_10_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_MACHINE_EPSILON_10_get() {
   float jresult ;
   float result;
   
@@ -20379,7 +20600,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_10_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_100_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_MACHINE_EPSILON_100_get() {
   float jresult ;
   float result;
   
@@ -20389,7 +20610,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_100_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_1000_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_MACHINE_EPSILON_1000_get() {
   float jresult ;
   float result;
   
@@ -20399,7 +20620,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_1000_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_10000_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_MACHINE_EPSILON_10000_get() {
   float jresult ;
   float result;
   
@@ -20409,7 +20630,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_MACHINE_EPSILON_10000_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PI_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PI_get() {
   float jresult ;
   float result;
   
@@ -20419,7 +20640,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PI_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PI_2_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PI_2_get() {
   float jresult ;
   float result;
   
@@ -20429,7 +20650,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PI_2_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PI_4_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PI_4_get() {
   float jresult ;
   float result;
   
@@ -20439,7 +20660,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PI_4_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PI_OVER_180_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PI_OVER_180_get() {
   float jresult ;
   float result;
   
@@ -20449,7 +20670,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PI_OVER_180_get() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ONE80_OVER_PI_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ONE80_OVER_PI_get() {
   float jresult ;
   float result;
   
@@ -20459,7 +20680,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ONE80_OVER_PI_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ResizePolicyDefault_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ResizePolicyDefault_get() {
   int jresult ;
   Dali::ResizePolicy::Type result;
   
@@ -20469,7 +20690,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ResizePolicyDefault_get() {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VectorBase_Count(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Count(void * jarg1) {
   unsigned long jresult ;
   Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
   Dali::VectorBase::SizeType result;
@@ -20497,7 +20718,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VectorBase_Count(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VectorBase_Size(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Size(void * jarg1) {
   unsigned long jresult ;
   Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
   Dali::VectorBase::SizeType result;
@@ -20525,7 +20746,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VectorBase_Size(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_VectorBase_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_VectorBase_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
   bool result;
@@ -20553,7 +20774,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_VectorBase_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VectorBase_Capacity(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VectorBase_Capacity(void * jarg1) {
   unsigned long jresult ;
   Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
   Dali::VectorBase::SizeType result;
@@ -20581,7 +20802,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VectorBase_Capacity(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorBase_Release(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorBase_Release(void * jarg1) {
   Dali::VectorBase *arg1 = (Dali::VectorBase *) 0 ;
   
   arg1 = (Dali::VectorBase *)jarg1; 
@@ -20605,7 +20826,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorBase_Release(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Image__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Image__SWIG_0() {
   void * jresult ;
   Dali::Image *result = 0 ;
   
@@ -20631,7 +20852,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Image__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Image(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Image(void * jarg1) {
   Dali::Image *arg1 = (Dali::Image *) 0 ;
   
   arg1 = (Dali::Image *)jarg1; 
@@ -20655,7 +20876,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Image(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Image__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Image__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Image *arg1 = 0 ;
   Dali::Image *result = 0 ;
@@ -20687,7 +20908,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Image__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Image_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Image_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Image *arg1 = (Dali::Image *) 0 ;
   Dali::Image *arg2 = 0 ;
@@ -20721,7 +20942,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Image_Assign(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Image_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Image_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -20755,7 +20976,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Image_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Image_GetWidth(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Image_GetWidth(void * jarg1) {
   unsigned int jresult ;
   Dali::Image *arg1 = (Dali::Image *) 0 ;
   unsigned int result;
@@ -20783,7 +21004,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Image_GetWidth(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Image_GetHeight(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Image_GetHeight(void * jarg1) {
   unsigned int jresult ;
   Dali::Image *arg1 = (Dali::Image *) 0 ;
   unsigned int result;
@@ -20811,7 +21032,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Image_GetHeight(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Image_UploadedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Image_UploadedSignal(void * jarg1) {
   void * jresult ;
   Dali::Image *arg1 = (Dali::Image *) 0 ;
   Dali::Image::ImageSignalType *result = 0 ;
@@ -20839,7 +21060,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Image_UploadedSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FIRST_VALID_PIXEL_FORMAT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FIRST_VALID_PIXEL_FORMAT_get() {
   int jresult ;
   Dali::Pixel::Format result;
   
@@ -20849,7 +21070,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FIRST_VALID_PIXEL_FORMAT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_LAST_VALID_PIXEL_FORMAT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LAST_VALID_PIXEL_FORMAT_get() {
   int jresult ;
   Dali::Pixel::Format result;
   
@@ -20859,7 +21080,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_LAST_VALID_PIXEL_FORMAT_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_HasAlpha(int jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_HasAlpha(int jarg1) {
   unsigned int jresult ;
   Dali::Pixel::Format arg1 ;
   bool result;
@@ -20887,7 +21108,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_HasAlpha(int jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GetBytesPerPixel(int jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GetBytesPerPixel(int jarg1) {
   unsigned int jresult ;
   Dali::Pixel::Format arg1 ;
   unsigned int result;
@@ -20915,7 +21136,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GetBytesPerPixel(int jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GetAlphaOffsetAndMask(int jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GetAlphaOffsetAndMask(int jarg1, void * jarg2, void * jarg3) {
   Dali::Pixel::Format arg1 ;
   int *arg2 = 0 ;
   int *arg3 = 0 ;
@@ -20951,7 +21172,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GetAlphaOffsetAndMask(int jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PixelData_New(unsigned char* jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4, int jarg5, int jarg6) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelData_New(unsigned char* jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4, int jarg5, int jarg6) {
   void * jresult ;
   unsigned char *arg1 = (unsigned char *) 0 ;
   unsigned int arg2 ;
@@ -20991,7 +21212,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PixelData_New(unsigned char* jarg1, uns
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PixelData__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PixelData__SWIG_0() {
   void * jresult ;
   Dali::PixelData *result = 0 ;
   
@@ -21017,7 +21238,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PixelData__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PixelData(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PixelData(void * jarg1) {
   Dali::PixelData *arg1 = (Dali::PixelData *) 0 ;
   
   arg1 = (Dali::PixelData *)jarg1; 
@@ -21041,7 +21262,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PixelData(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PixelData__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PixelData__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::PixelData *arg1 = 0 ;
   Dali::PixelData *result = 0 ;
@@ -21073,7 +21294,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PixelData__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PixelData_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelData_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PixelData *arg1 = (Dali::PixelData *) 0 ;
   Dali::PixelData *arg2 = 0 ;
@@ -21107,7 +21328,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PixelData_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PixelData_GetWidth(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PixelData_GetWidth(void * jarg1) {
   unsigned int jresult ;
   Dali::PixelData *arg1 = (Dali::PixelData *) 0 ;
   unsigned int result;
@@ -21135,7 +21356,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PixelData_GetWidth(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PixelData_GetHeight(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PixelData_GetHeight(void * jarg1) {
   unsigned int jresult ;
   Dali::PixelData *arg1 = (Dali::PixelData *) 0 ;
   unsigned int result;
@@ -21163,7 +21384,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PixelData_GetHeight(void * jarg1)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PixelData_GetPixelFormat(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PixelData_GetPixelFormat(void * jarg1) {
   int jresult ;
   Dali::PixelData *arg1 = (Dali::PixelData *) 0 ;
   Dali::Pixel::Format result;
@@ -21191,7 +21412,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PixelData_GetPixelFormat(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_POSITIVE_X_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_X_get() {
   unsigned int jresult ;
   unsigned int result;
   
@@ -21201,7 +21422,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_POSITIVE_X_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NEGATIVE_X_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_X_get() {
   unsigned int jresult ;
   unsigned int result;
   
@@ -21211,7 +21432,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NEGATIVE_X_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_POSITIVE_Y_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_Y_get() {
   unsigned int jresult ;
   unsigned int result;
   
@@ -21221,7 +21442,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_POSITIVE_Y_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NEGATIVE_Y_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_Y_get() {
   unsigned int jresult ;
   unsigned int result;
   
@@ -21231,7 +21452,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NEGATIVE_Y_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_POSITIVE_Z_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_POSITIVE_Z_get() {
   unsigned int jresult ;
   unsigned int result;
   
@@ -21241,7 +21462,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_POSITIVE_Z_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NEGATIVE_Z_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NEGATIVE_Z_get() {
   unsigned int jresult ;
   unsigned int result;
   
@@ -21251,7 +21472,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NEGATIVE_Z_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Texture_New__SWIG_0(int jarg1, int jarg2, unsigned int jarg3, unsigned int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_New__SWIG_0(int jarg1, int jarg2, unsigned int jarg3, unsigned int jarg4) {
   void * jresult ;
   Dali::TextureType::Type arg1 ;
   Dali::Pixel::Format arg2 ;
@@ -21285,7 +21506,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Texture_New__SWIG_0(int jarg1, int jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Texture_New__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_New__SWIG_1(void * jarg1) {
   void * jresult ;
   NativeImageInterface *arg1 = 0 ;
   Dali::Texture result;
@@ -21317,7 +21538,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Texture_New__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Texture__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Texture__SWIG_0() {
   void * jresult ;
   Dali::Texture *result = 0 ;
   
@@ -21343,7 +21564,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Texture__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Texture(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Texture(void * jarg1) {
   Dali::Texture *arg1 = (Dali::Texture *) 0 ;
   
   arg1 = (Dali::Texture *)jarg1; 
@@ -21367,7 +21588,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Texture(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Texture__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Texture__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Texture *arg1 = 0 ;
   Dali::Texture *result = 0 ;
@@ -21399,7 +21620,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Texture__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Texture_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -21433,7 +21654,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Texture_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Texture_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Texture_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Texture *arg1 = (Dali::Texture *) 0 ;
   Dali::Texture *arg2 = 0 ;
@@ -21467,7 +21688,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Texture_Assign(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Texture_Upload__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_Upload__SWIG_0(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Texture *arg1 = (Dali::Texture *) 0 ;
   Dali::PixelData arg2 ;
@@ -21503,7 +21724,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Texture_Upload__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Texture_Upload__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4, unsigned int jarg5, unsigned int jarg6, unsigned int jarg7, unsigned int jarg8) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_Upload__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4, unsigned int jarg5, unsigned int jarg6, unsigned int jarg7, unsigned int jarg8) {
   unsigned int jresult ;
   Dali::Texture *arg1 = (Dali::Texture *) 0 ;
   Dali::PixelData arg2 ;
@@ -21551,7 +21772,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Texture_Upload__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Texture_GenerateMipmaps(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Texture_GenerateMipmaps(void * jarg1) {
   Dali::Texture *arg1 = (Dali::Texture *) 0 ;
   
   arg1 = (Dali::Texture *)jarg1; 
@@ -21575,7 +21796,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Texture_GenerateMipmaps(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Texture_GetWidth(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_GetWidth(void * jarg1) {
   unsigned int jresult ;
   Dali::Texture *arg1 = (Dali::Texture *) 0 ;
   unsigned int result;
@@ -21603,7 +21824,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Texture_GetWidth(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Texture_GetHeight(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_GetHeight(void * jarg1) {
   unsigned int jresult ;
   Dali::Texture *arg1 = (Dali::Texture *) 0 ;
   unsigned int result;
@@ -21631,7 +21852,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Texture_GetHeight(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Sampler_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Sampler_New() {
   void * jresult ;
   Dali::Sampler result;
   
@@ -21657,7 +21878,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Sampler_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Sampler__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Sampler__SWIG_0() {
   void * jresult ;
   Dali::Sampler *result = 0 ;
   
@@ -21683,7 +21904,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Sampler__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Sampler(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Sampler(void * jarg1) {
   Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
   
   arg1 = (Dali::Sampler *)jarg1; 
@@ -21707,7 +21928,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Sampler(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Sampler__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Sampler__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Sampler *arg1 = 0 ;
   Dali::Sampler *result = 0 ;
@@ -21739,7 +21960,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Sampler__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Sampler_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Sampler_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -21773,7 +21994,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Sampler_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Sampler_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Sampler_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
   Dali::Sampler *arg2 = 0 ;
@@ -21807,7 +22028,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Sampler_Assign(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Sampler_SetFilterMode(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetFilterMode(void * jarg1, int jarg2, int jarg3) {
   Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
   Dali::FilterMode::Type arg2 ;
   Dali::FilterMode::Type arg3 ;
@@ -21835,7 +22056,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Sampler_SetFilterMode(void * jarg1, int j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Sampler_SetWrapMode__SWIG_0(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetWrapMode__SWIG_0(void * jarg1, int jarg2, int jarg3) {
   Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
   Dali::WrapMode::Type arg2 ;
   Dali::WrapMode::Type arg3 ;
@@ -21863,7 +22084,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Sampler_SetWrapMode__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Sampler_SetWrapMode__SWIG_1(void * jarg1, int jarg2, int jarg3, int jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Sampler_SetWrapMode__SWIG_1(void * jarg1, int jarg2, int jarg3, int jarg4) {
   Dali::Sampler *arg1 = (Dali::Sampler *) 0 ;
   Dali::WrapMode::Type arg2 ;
   Dali::WrapMode::Type arg3 ;
@@ -21893,7 +22114,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Sampler_SetWrapMode__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_New() {
   void * jresult ;
   Dali::TextureSet result;
   
@@ -21919,7 +22140,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextureSet__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextureSet__SWIG_0() {
   void * jresult ;
   Dali::TextureSet *result = 0 ;
   
@@ -21945,7 +22166,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextureSet__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextureSet(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextureSet(void * jarg1) {
   Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
   
   arg1 = (Dali::TextureSet *)jarg1; 
@@ -21969,7 +22190,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextureSet(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextureSet__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextureSet__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::TextureSet *arg1 = 0 ;
   Dali::TextureSet *result = 0 ;
@@ -22001,7 +22222,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextureSet__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -22035,7 +22256,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
   Dali::TextureSet *arg2 = 0 ;
@@ -22069,7 +22290,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextureSet_SetTexture(void * jarg1, unsigned long jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextureSet_SetTexture(void * jarg1, unsigned long jarg2, void * jarg3) {
   Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
   size_t arg2 ;
   Dali::Texture arg3 ;
@@ -22103,7 +22324,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextureSet_SetTexture(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_GetTexture(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_GetTexture(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
   size_t arg2 ;
@@ -22133,7 +22354,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_GetTexture(void * jarg1, uns
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextureSet_SetSampler(void * jarg1, unsigned long jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextureSet_SetSampler(void * jarg1, unsigned long jarg2, void * jarg3) {
   Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
   size_t arg2 ;
   Dali::Sampler arg3 ;
@@ -22167,7 +22388,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextureSet_SetSampler(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_GetSampler(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextureSet_GetSampler(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
   size_t arg2 ;
@@ -22197,7 +22418,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextureSet_GetSampler(void * jarg1, uns
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TextureSet_GetTextureCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TextureSet_GetTextureCount(void * jarg1) {
   unsigned long jresult ;
   Dali::TextureSet *arg1 = (Dali::TextureSet *) 0 ;
   size_t result;
@@ -22225,7 +22446,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TextureSet_GetTextureCount(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyBuffer_New(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyBuffer_New(void * jarg1) {
   void * jresult ;
   Dali::Property::Map *arg1 = 0 ;
   Dali::PropertyBuffer result;
@@ -22257,7 +22478,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyBuffer_New(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyBuffer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyBuffer__SWIG_0() {
   void * jresult ;
   Dali::PropertyBuffer *result = 0 ;
   
@@ -22283,7 +22504,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyBuffer__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyBuffer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyBuffer(void * jarg1) {
   Dali::PropertyBuffer *arg1 = (Dali::PropertyBuffer *) 0 ;
   
   arg1 = (Dali::PropertyBuffer *)jarg1; 
@@ -22307,7 +22528,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyBuffer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyBuffer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyBuffer__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::PropertyBuffer *arg1 = 0 ;
   Dali::PropertyBuffer *result = 0 ;
@@ -22339,7 +22560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyBuffer__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyBuffer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyBuffer_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -22373,7 +22594,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyBuffer_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyBuffer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PropertyBuffer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PropertyBuffer *arg1 = (Dali::PropertyBuffer *) 0 ;
   Dali::PropertyBuffer *arg2 = 0 ;
@@ -22407,7 +22628,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PropertyBuffer_Assign(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyBuffer_SetData(void * jarg1, void * jarg2, unsigned long jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyBuffer_SetData(void * jarg1, void * jarg2, unsigned long jarg3) {
   Dali::PropertyBuffer *arg1 = (Dali::PropertyBuffer *) 0 ;
   void *arg2 = (void *) 0 ;
   std::size_t arg3 ;
@@ -22435,7 +22656,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyBuffer_SetData(void * jarg1, void
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PropertyBuffer_GetSize(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PropertyBuffer_GetSize(void * jarg1) {
   unsigned long jresult ;
   Dali::PropertyBuffer *arg1 = (Dali::PropertyBuffer *) 0 ;
   std::size_t result;
@@ -22463,7 +22684,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PropertyBuffer_GetSize(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Geometry_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Geometry_New() {
   void * jresult ;
   Dali::Geometry result;
   
@@ -22489,7 +22710,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Geometry_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Geometry__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Geometry__SWIG_0() {
   void * jresult ;
   Dali::Geometry *result = 0 ;
   
@@ -22515,7 +22736,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Geometry__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Geometry(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Geometry(void * jarg1) {
   Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
   
   arg1 = (Dali::Geometry *)jarg1; 
@@ -22539,7 +22760,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Geometry(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Geometry__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Geometry__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Geometry *arg1 = 0 ;
   Dali::Geometry *result = 0 ;
@@ -22571,7 +22792,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Geometry__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Geometry_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Geometry_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -22605,7 +22826,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Geometry_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Geometry_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Geometry_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
   Dali::Geometry *arg2 = 0 ;
@@ -22639,7 +22860,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Geometry_Assign(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Geometry_AddVertexBuffer(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Geometry_AddVertexBuffer(void * jarg1, void * jarg2) {
   unsigned long jresult ;
   Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
   Dali::PropertyBuffer *arg2 = 0 ;
@@ -22673,7 +22894,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Geometry_AddVertexBuffer(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Geometry_GetNumberOfVertexBuffers(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Geometry_GetNumberOfVertexBuffers(void * jarg1) {
   unsigned long jresult ;
   Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
   std::size_t result;
@@ -22701,7 +22922,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Geometry_GetNumberOfVertexBuffer
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Geometry_RemoveVertexBuffer(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_RemoveVertexBuffer(void * jarg1, unsigned long jarg2) {
   Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
   std::size_t arg2 ;
   
@@ -22727,7 +22948,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Geometry_RemoveVertexBuffer(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Geometry_SetIndexBuffer(void * jarg1, unsigned short* jarg2, unsigned long jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_SetIndexBuffer(void * jarg1, unsigned short* jarg2, unsigned long jarg3) {
   Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
   unsigned short *arg2 = (unsigned short *) 0 ;
   size_t arg3 ;
@@ -22757,7 +22978,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Geometry_SetIndexBuffer(void * jarg1, uns
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Geometry_SetType(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Geometry_SetType(void * jarg1, int jarg2) {
   Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
   Dali::Geometry::Type arg2 ;
   
@@ -22783,7 +23004,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Geometry_SetType(void * jarg1, int jarg2)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Geometry_GetType(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Geometry_GetType(void * jarg1) {
   int jresult ;
   Dali::Geometry *arg1 = (Dali::Geometry *) 0 ;
   Dali::Geometry::Type result;
@@ -22811,7 +23032,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Geometry_GetType(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Shader_Hint() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Shader_Hint() {
   void * jresult ;
   Dali::Shader::Hint *result = 0 ;
   
@@ -22837,7 +23058,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Shader_Hint() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Shader_Hint(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Shader_Hint(void * jarg1) {
   Dali::Shader::Hint *arg1 = (Dali::Shader::Hint *) 0 ;
   
   arg1 = (Dali::Shader::Hint *)jarg1; 
@@ -22861,7 +23082,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Shader_Hint(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Shader_Property_PROGRAM_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Shader_Property_PROGRAM_get() {
   int jresult ;
   int result;
   
@@ -22871,7 +23092,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Shader_Property_PROGRAM_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Shader_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Shader_Property() {
   void * jresult ;
   Dali::Shader::Property *result = 0 ;
   
@@ -22897,7 +23118,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Shader_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Shader_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Shader_Property(void * jarg1) {
   Dali::Shader::Property *arg1 = (Dali::Shader::Property *) 0 ;
   
   arg1 = (Dali::Shader::Property *)jarg1; 
@@ -22921,7 +23142,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Shader_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Shader_New__SWIG_0(char * jarg1, char * jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_New__SWIG_0(char * jarg1, char * jarg2, int jarg3) {
   void * jresult ;
   std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -22969,7 +23190,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Shader_New__SWIG_0(char * jarg1, char *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Shader_New__SWIG_1(char * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_New__SWIG_1(char * jarg1, char * jarg2) {
   void * jresult ;
   std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -23015,7 +23236,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Shader_New__SWIG_1(char * jarg1, char *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Shader__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Shader__SWIG_0() {
   void * jresult ;
   Dali::Shader *result = 0 ;
   
@@ -23041,7 +23262,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Shader__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Shader(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Shader(void * jarg1) {
   Dali::Shader *arg1 = (Dali::Shader *) 0 ;
   
   arg1 = (Dali::Shader *)jarg1; 
@@ -23065,7 +23286,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Shader(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Shader__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Shader__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Shader *arg1 = 0 ;
   Dali::Shader *result = 0 ;
@@ -23097,7 +23318,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Shader__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Shader_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -23131,7 +23352,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Shader_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Shader_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Shader_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Shader *arg1 = (Dali::Shader *) 0 ;
   Dali::Shader *arg2 = 0 ;
@@ -23165,7 +23386,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Shader_Assign(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_DEPTH_INDEX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_INDEX_get() {
   int jresult ;
   int result;
   
@@ -23175,7 +23396,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_DEPTH_INDEX_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_FACE_CULLING_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_FACE_CULLING_MODE_get() {
   int jresult ;
   int result;
   
@@ -23185,7 +23406,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_FACE_CULLING_MODE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_MODE_get() {
   int jresult ;
   int result;
   
@@ -23195,7 +23416,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_EQUATION_RGB_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_EQUATION_RGB_get() {
   int jresult ;
   int result;
   
@@ -23205,7 +23426,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_EQUATION_RGB_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_EQUATION_ALPHA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_EQUATION_ALPHA_get() {
   int jresult ;
   int result;
   
@@ -23215,7 +23436,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_EQUATION_ALPHA_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_FACTOR_SRC_RGB_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_SRC_RGB_get() {
   int jresult ;
   int result;
   
@@ -23225,7 +23446,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_FACTOR_SRC_RGB_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_FACTOR_DEST_RGB_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_DEST_RGB_get() {
   int jresult ;
   int result;
   
@@ -23235,7 +23456,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_FACTOR_DEST_RGB_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_FACTOR_SRC_ALPHA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_SRC_ALPHA_get() {
   int jresult ;
   int result;
   
@@ -23245,7 +23466,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_FACTOR_SRC_ALPHA_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_FACTOR_DEST_ALPHA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_FACTOR_DEST_ALPHA_get() {
   int jresult ;
   int result;
   
@@ -23255,7 +23476,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_FACTOR_DEST_ALPHA_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_COLOR_get() {
   int jresult ;
   int result;
   
@@ -23265,7 +23486,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_PRE_MULTIPLIED_ALPHA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_BLEND_PRE_MULTIPLIED_ALPHA_get() {
   int jresult ;
   int result;
   
@@ -23275,7 +23496,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_BLEND_PRE_MULTIPLIED_ALP
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_INDEX_RANGE_FIRST_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_INDEX_RANGE_FIRST_get() {
   int jresult ;
   int result;
   
@@ -23285,7 +23506,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_INDEX_RANGE_FIRST_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_INDEX_RANGE_COUNT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_INDEX_RANGE_COUNT_get() {
   int jresult ;
   int result;
   
@@ -23295,7 +23516,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_INDEX_RANGE_COUNT_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_DEPTH_WRITE_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_WRITE_MODE_get() {
   int jresult ;
   int result;
   
@@ -23305,7 +23526,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_DEPTH_WRITE_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_DEPTH_FUNCTION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_FUNCTION_get() {
   int jresult ;
   int result;
   
@@ -23315,7 +23536,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_DEPTH_FUNCTION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_DEPTH_TEST_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_DEPTH_TEST_MODE_get() {
   int jresult ;
   int result;
   
@@ -23325,7 +23546,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_DEPTH_TEST_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_RENDER_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_RENDER_MODE_get() {
   int jresult ;
   int result;
   
@@ -23335,7 +23556,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_RENDER_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_FUNCTION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_get() {
   int jresult ;
   int result;
   
@@ -23345,7 +23566,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_FUNCTION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_FUNCTION_MASK_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_MASK_get() {
   int jresult ;
   int result;
   
@@ -23355,7 +23576,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_FUNCTION_MASK_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_FUNCTION_REFERENCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_FUNCTION_REFERENCE_get() {
   int jresult ;
   int result;
   
@@ -23365,7 +23586,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_FUNCTION_REFEREN
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_MASK_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_MASK_get() {
   int jresult ;
   int result;
   
@@ -23375,7 +23596,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_MASK_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_OPERATION_ON_FAIL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_FAIL_get() {
   int jresult ;
   int result;
   
@@ -23385,7 +23606,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_OPERATION_ON_FAI
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_OPERATION_ON_Z_FAIL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_Z_FAIL_get() {
   int jresult ;
   int result;
   
@@ -23395,7 +23616,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_OPERATION_ON_Z_F
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_OPERATION_ON_Z_PASS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Renderer_Property_STENCIL_OPERATION_ON_Z_PASS_get() {
   int jresult ;
   int result;
   
@@ -23405,7 +23626,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Renderer_Property_STENCIL_OPERATION_ON_Z_P
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Renderer_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Renderer_Property() {
   void * jresult ;
   Dali::Renderer::Property *result = 0 ;
   
@@ -23431,7 +23652,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Renderer_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Renderer_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Renderer_Property(void * jarg1) {
   Dali::Renderer::Property *arg1 = (Dali::Renderer::Property *) 0 ;
   
   arg1 = (Dali::Renderer::Property *)jarg1; 
@@ -23455,7 +23676,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Renderer_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_New(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_New(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Geometry *arg1 = 0 ;
   Dali::Shader *arg2 = 0 ;
@@ -23493,7 +23714,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_New(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Renderer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Renderer__SWIG_0() {
   void * jresult ;
   Dali::Renderer *result = 0 ;
   
@@ -23519,7 +23740,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Renderer__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Renderer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Renderer(void * jarg1) {
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   
   arg1 = (Dali::Renderer *)jarg1; 
@@ -23543,7 +23764,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Renderer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Renderer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Renderer__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Renderer *arg1 = 0 ;
   Dali::Renderer *result = 0 ;
@@ -23575,7 +23796,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Renderer__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -23609,7 +23830,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   Dali::Renderer *arg2 = 0 ;
@@ -23643,7 +23864,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_Assign(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Renderer_SetGeometry(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetGeometry(void * jarg1, void * jarg2) {
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   Dali::Geometry *arg2 = 0 ;
   
@@ -23673,7 +23894,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Renderer_SetGeometry(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_GetGeometry(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_GetGeometry(void * jarg1) {
   void * jresult ;
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   Dali::Geometry result;
@@ -23701,7 +23922,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_GetGeometry(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Renderer_SetIndexRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetIndexRange(void * jarg1, int jarg2, int jarg3) {
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -23729,7 +23950,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Renderer_SetIndexRange(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Renderer_SetTextures(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetTextures(void * jarg1, void * jarg2) {
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   Dali::TextureSet *arg2 = 0 ;
   
@@ -23759,7 +23980,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Renderer_SetTextures(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_GetTextures(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_GetTextures(void * jarg1) {
   void * jresult ;
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   Dali::TextureSet result;
@@ -23787,7 +24008,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_GetTextures(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Renderer_SetShader(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Renderer_SetShader(void * jarg1, void * jarg2) {
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   Dali::Shader *arg2 = 0 ;
   
@@ -23817,7 +24038,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Renderer_SetShader(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_GetShader(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Renderer_GetShader(void * jarg1) {
   void * jresult ;
   Dali::Renderer *arg1 = (Dali::Renderer *) 0 ;
   Dali::Shader result;
@@ -23845,7 +24066,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Renderer_GetShader(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBuffer_Attachment() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBuffer_Attachment() {
   void * jresult ;
   Dali::FrameBuffer::Attachment *result = 0 ;
   
@@ -23871,7 +24092,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBuffer_Attachment() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FrameBuffer_Attachment(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FrameBuffer_Attachment(void * jarg1) {
   Dali::FrameBuffer::Attachment *arg1 = (Dali::FrameBuffer::Attachment *) 0 ;
   
   arg1 = (Dali::FrameBuffer::Attachment *)jarg1; 
@@ -23895,7 +24116,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FrameBuffer_Attachment(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBuffer_New(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_New(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -23927,7 +24148,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBuffer_New(unsigned int jarg1, uns
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBuffer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBuffer__SWIG_0() {
   void * jresult ;
   Dali::FrameBuffer *result = 0 ;
   
@@ -23953,7 +24174,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBuffer__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FrameBuffer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FrameBuffer(void * jarg1) {
   Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
   
   arg1 = (Dali::FrameBuffer *)jarg1; 
@@ -23977,7 +24198,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FrameBuffer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBuffer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBuffer__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::FrameBuffer *arg1 = 0 ;
   Dali::FrameBuffer *result = 0 ;
@@ -24009,7 +24230,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBuffer__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBuffer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -24043,7 +24264,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBuffer_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBuffer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
   Dali::FrameBuffer *arg2 = 0 ;
@@ -24077,7 +24298,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBuffer_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FrameBuffer_AttachColorTexture__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameBuffer_AttachColorTexture__SWIG_0(void * jarg1, void * jarg2) {
   Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
   Dali::Texture *arg2 = 0 ;
   
@@ -24107,7 +24328,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FrameBuffer_AttachColorTexture__SWIG_0(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FrameBuffer_AttachColorTexture__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FrameBuffer_AttachColorTexture__SWIG_1(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4) {
   Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
   Dali::Texture *arg2 = 0 ;
   unsigned int arg3 ;
@@ -24141,7 +24362,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FrameBuffer_AttachColorTexture__SWIG_1(vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBuffer_GetColorTexture(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBuffer_GetColorTexture(void * jarg1) {
   void * jresult ;
   Dali::FrameBuffer *arg1 = (Dali::FrameBuffer *) 0 ;
   Dali::Texture result;
@@ -24169,7 +24390,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBuffer_GetColorTexture(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTaskList__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskList__SWIG_0() {
   void * jresult ;
   Dali::RenderTaskList *result = 0 ;
   
@@ -24195,7 +24416,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTaskList__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTaskList_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -24229,7 +24450,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTaskList_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RenderTaskList(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTaskList(void * jarg1) {
   Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
   
   arg1 = (Dali::RenderTaskList *)jarg1; 
@@ -24253,7 +24474,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RenderTaskList(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTaskList__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskList__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::RenderTaskList *arg1 = 0 ;
   Dali::RenderTaskList *result = 0 ;
@@ -24285,7 +24506,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTaskList__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTaskList_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
   Dali::RenderTaskList *arg2 = 0 ;
@@ -24319,7 +24540,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTaskList_Assign(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTaskList_CreateTask(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_CreateTask(void * jarg1) {
   void * jresult ;
   Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
   Dali::RenderTask result;
@@ -24347,7 +24568,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTaskList_CreateTask(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTaskList_RemoveTask(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTaskList_RemoveTask(void * jarg1, void * jarg2) {
   Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
   Dali::RenderTask arg2 ;
   Dali::RenderTask *argp2 ;
@@ -24379,7 +24600,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTaskList_RemoveTask(void * jarg1, v
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTaskList_GetTaskCount(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTaskList_GetTaskCount(void * jarg1) {
   unsigned int jresult ;
   Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
   unsigned int result;
@@ -24407,7 +24628,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTaskList_GetTaskCount(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTaskList_GetTask(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTaskList_GetTask(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::RenderTaskList *arg1 = (Dali::RenderTaskList *) 0 ;
   unsigned int arg2 ;
@@ -24437,7 +24658,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTaskList_GetTask(void * jarg1, un
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RenderTask_Property_VIEWPORT_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_VIEWPORT_POSITION_get() {
   int jresult ;
   int result;
   
@@ -24447,7 +24668,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RenderTask_Property_VIEWPORT_POSITION_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RenderTask_Property_VIEWPORT_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_VIEWPORT_SIZE_get() {
   int jresult ;
   int result;
   
@@ -24457,7 +24678,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RenderTask_Property_VIEWPORT_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RenderTask_Property_CLEAR_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_CLEAR_COLOR_get() {
   int jresult ;
   int result;
   
@@ -24467,7 +24688,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RenderTask_Property_CLEAR_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RenderTask_Property_REQUIRES_SYNC_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RenderTask_Property_REQUIRES_SYNC_get() {
   int jresult ;
   int result;
   
@@ -24477,7 +24698,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RenderTask_Property_REQUIRES_SYNC_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTask_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask_Property() {
   void * jresult ;
   Dali::RenderTask::Property *result = 0 ;
   
@@ -24503,7 +24724,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTask_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RenderTask_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTask_Property(void * jarg1) {
   Dali::RenderTask::Property *arg1 = (Dali::RenderTask::Property *) 0 ;
   
   arg1 = (Dali::RenderTask::Property *)jarg1; 
@@ -24527,7 +24748,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RenderTask_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION_get() {
   void * jresult ;
   bool (*result)(Dali::Vector2 &) = 0 ;
   
@@ -24537,7 +24758,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_SCREEN_TO_FRAMEBUFFE
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_FULLSCREEN_FRAMEBUFFER_FUNCTION_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_FULLSCREEN_FRAMEBUFFER_FUNCTION_get() {
   void * jresult ;
   bool (*result)(Dali::Vector2 &) = 0 ;
   
@@ -24547,7 +24768,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_FULLSCREEN_FRAMEBUFFER_FUNCT
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_EXCLUSIVE_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_EXCLUSIVE_get() {
   unsigned int jresult ;
   bool result;
   
@@ -24557,7 +24778,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_EXCLUSIVE_get(
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_INPUT_ENABLED_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_INPUT_ENABLED_get() {
   unsigned int jresult ;
   bool result;
   
@@ -24567,7 +24788,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_INPUT_ENABLED_
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_CLEAR_COLOR_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CLEAR_COLOR_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -24577,7 +24798,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_CLEAR_COLOR_get() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_CLEAR_ENABLED_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CLEAR_ENABLED_get() {
   unsigned int jresult ;
   bool result;
   
@@ -24587,7 +24808,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_CLEAR_ENABLED_
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_CULL_MODE_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_CULL_MODE_get() {
   unsigned int jresult ;
   bool result;
   
@@ -24597,7 +24818,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_CULL_MODE_get(
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_REFRESH_RATE_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_DEFAULT_REFRESH_RATE_get() {
   unsigned int jresult ;
   unsigned int result;
   
@@ -24607,7 +24828,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_DEFAULT_REFRESH_RATE_g
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTask__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask__SWIG_0() {
   void * jresult ;
   Dali::RenderTask *result = 0 ;
   
@@ -24633,7 +24854,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTask__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -24667,7 +24888,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RenderTask(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTask(void * jarg1) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   
   arg1 = (Dali::RenderTask *)jarg1; 
@@ -24691,7 +24912,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RenderTask(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTask__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTask__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = 0 ;
   Dali::RenderTask *result = 0 ;
@@ -24723,7 +24944,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTask__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::RenderTask *arg2 = 0 ;
@@ -24757,7 +24978,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetSourceActor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetSourceActor(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -24789,7 +25010,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetSourceActor(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetSourceActor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetSourceActor(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Actor result;
@@ -24817,7 +25038,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetSourceActor(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetExclusive(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetExclusive(void * jarg1, unsigned int jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   bool arg2 ;
   
@@ -24843,7 +25064,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetExclusive(void * jarg1, uns
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_IsExclusive(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_IsExclusive(void * jarg1) {
   unsigned int jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   bool result;
@@ -24871,7 +25092,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_IsExclusive(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetInputEnabled(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetInputEnabled(void * jarg1, unsigned int jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   bool arg2 ;
   
@@ -24897,7 +25118,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetInputEnabled(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_GetInputEnabled(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_GetInputEnabled(void * jarg1) {
   unsigned int jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   bool result;
@@ -24925,7 +25146,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_GetInputEnabled(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetCameraActor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetCameraActor(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::CameraActor arg2 ;
   Dali::CameraActor *argp2 ;
@@ -24957,7 +25178,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetCameraActor(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetCameraActor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCameraActor(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::CameraActor result;
@@ -24985,7 +25206,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetCameraActor(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetTargetFrameBuffer(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetTargetFrameBuffer(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::FrameBufferImage arg2 ;
   Dali::FrameBufferImage *argp2 ;
@@ -25017,7 +25238,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetTargetFrameBuffer(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetTargetFrameBuffer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetTargetFrameBuffer(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::FrameBufferImage result;
@@ -25045,7 +25266,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetTargetFrameBuffer(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetFrameBuffer(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetFrameBuffer(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::FrameBuffer arg2 ;
   Dali::FrameBuffer *argp2 ;
@@ -25077,7 +25298,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetFrameBuffer(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetFrameBuffer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetFrameBuffer(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::FrameBuffer result;
@@ -25105,7 +25326,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetFrameBuffer(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetScreenToFrameBufferFunction(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetScreenToFrameBufferFunction(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::RenderTask::ScreenToFrameBufferFunction arg2 = (Dali::RenderTask::ScreenToFrameBufferFunction) 0 ;
   
@@ -25131,7 +25352,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetScreenToFrameBufferFunction
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetScreenToFrameBufferFunction(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetScreenToFrameBufferFunction(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::RenderTask::ScreenToFrameBufferFunction result;
@@ -25159,7 +25380,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetScreenToFrameBufferFuncti
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetScreenToFrameBufferMappingActor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetScreenToFrameBufferMappingActor(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -25191,7 +25412,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetScreenToFrameBufferMappingA
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetScreenToFrameBufferMappingActor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetScreenToFrameBufferMappingActor(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Actor result;
@@ -25219,7 +25440,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetScreenToFrameBufferMappin
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetViewportPosition(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewportPosition(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Vector2 arg2 ;
   Dali::Vector2 *argp2 ;
@@ -25251,7 +25472,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetViewportPosition(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetCurrentViewportPosition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCurrentViewportPosition(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Vector2 result;
@@ -25279,7 +25500,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetCurrentViewportPosition(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetViewportSize(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewportSize(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Vector2 arg2 ;
   Dali::Vector2 *argp2 ;
@@ -25311,7 +25532,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetViewportSize(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetCurrentViewportSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetCurrentViewportSize(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Vector2 result;
@@ -25339,7 +25560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetCurrentViewportSize(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetViewport(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetViewport(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Viewport arg2 ;
   Dali::Viewport *argp2 ;
@@ -25371,7 +25592,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetViewport(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetViewport(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetViewport(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Viewport result;
@@ -25399,7 +25620,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetViewport(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetClearColor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetClearColor(void * jarg1, void * jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
   
@@ -25429,7 +25650,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetClearColor(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetClearColor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_GetClearColor(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Vector4 result;
@@ -25457,7 +25678,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_GetClearColor(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetClearEnabled(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetClearEnabled(void * jarg1, unsigned int jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   bool arg2 ;
   
@@ -25483,7 +25704,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetClearEnabled(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_GetClearEnabled(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_GetClearEnabled(void * jarg1) {
   unsigned int jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   bool result;
@@ -25511,7 +25732,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_GetClearEnabled(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetCullMode(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetCullMode(void * jarg1, unsigned int jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   bool arg2 ;
   
@@ -25537,7 +25758,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetCullMode(void * jarg1, unsi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_GetCullMode(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_GetCullMode(void * jarg1) {
   unsigned int jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   bool result;
@@ -25565,7 +25786,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_GetCullMode(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetRefreshRate(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RenderTask_SetRefreshRate(void * jarg1, unsigned int jarg2) {
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   unsigned int arg2 ;
   
@@ -25591,7 +25812,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RenderTask_SetRefreshRate(void * jarg1, u
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_GetRefreshRate(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_GetRefreshRate(void * jarg1) {
   unsigned int jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   unsigned int result;
@@ -25619,7 +25840,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_GetRefreshRate(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_WorldToViewport(void * jarg1, void * jarg2, float * jarg3, float * jarg4) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_WorldToViewport(void * jarg1, void * jarg2, float * jarg3, float * jarg4) {
   unsigned int jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -25657,7 +25878,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_WorldToViewport(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_ViewportToLocal(void * jarg1, void * jarg2, float jarg3, float jarg4, float * jarg5, float * jarg6) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RenderTask_ViewportToLocal(void * jarg1, void * jarg2, float jarg3, float jarg4, float * jarg5, float * jarg6) {
   unsigned int jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::Actor arg2 ;
@@ -25701,7 +25922,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RenderTask_ViewportToLocal(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_FinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RenderTask_FinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::RenderTask *arg1 = (Dali::RenderTask *) 0 ;
   Dali::RenderTask::RenderTaskSignalType *result = 0 ;
@@ -25729,7 +25950,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RenderTask_FinishedSignal(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPoint__SWIG_0(int jarg1, int jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPoint__SWIG_0(int jarg1, int jarg2, float jarg3, float jarg4) {
   void * jresult ;
   int arg1 ;
   Dali::TouchPoint::State arg2 ;
@@ -25763,7 +25984,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPoint__SWIG_0(int jarg1, int j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPoint__SWIG_1(int jarg1, int jarg2, float jarg3, float jarg4, float jarg5, float jarg6) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPoint__SWIG_1(int jarg1, int jarg2, float jarg3, float jarg4, float jarg5, float jarg6) {
   void * jresult ;
   int arg1 ;
   Dali::TouchPoint::State arg2 ;
@@ -25801,7 +26022,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPoint__SWIG_1(int jarg1, int j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchPoint(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TouchPoint(void * jarg1) {
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   
   arg1 = (Dali::TouchPoint *)jarg1; 
@@ -25825,7 +26046,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchPoint(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_deviceId_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_deviceId_set(void * jarg1, int jarg2) {
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   int arg2 ;
   
@@ -25835,7 +26056,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_deviceId_set(void * jarg1, int
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TouchPoint_deviceId_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TouchPoint_deviceId_get(void * jarg1) {
   int jresult ;
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   int result;
@@ -25847,7 +26068,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TouchPoint_deviceId_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_state_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_state_set(void * jarg1, int jarg2) {
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   Dali::TouchPoint::State arg2 ;
   
@@ -25857,7 +26078,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_state_set(void * jarg1, int ja
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TouchPoint_state_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TouchPoint_state_get(void * jarg1) {
   int jresult ;
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   Dali::TouchPoint::State result;
@@ -25869,7 +26090,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TouchPoint_state_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_hitActor_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_hitActor_set(void * jarg1, void * jarg2) {
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   Dali::Actor *arg2 = (Dali::Actor *) 0 ;
   
@@ -25879,7 +26100,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_hitActor_set(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPoint_hitActor_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_hitActor_get(void * jarg1) {
   void * jresult ;
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   Dali::Actor *result = 0 ;
@@ -25891,7 +26112,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPoint_hitActor_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_local_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_local_set(void * jarg1, void * jarg2) {
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -25901,7 +26122,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_local_set(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPoint_local_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_local_get(void * jarg1) {
   void * jresult ;
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -25913,7 +26134,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPoint_local_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_screen_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPoint_screen_set(void * jarg1, void * jarg2) {
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -25923,7 +26144,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPoint_screen_set(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPoint_screen_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPoint_screen_get(void * jarg1) {
   void * jresult ;
   Dali::TouchPoint *arg1 = (Dali::TouchPoint *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -25935,7 +26156,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPoint_screen_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchData__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Touch__SWIG_0() {
   void * jresult ;
   Dali::TouchData *result = 0 ;
   
@@ -25961,7 +26182,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchData__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchData__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Touch__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::TouchData *arg1 = 0 ;
   Dali::TouchData *result = 0 ;
@@ -25993,7 +26214,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchData__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchData(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Touch(void * jarg1) {
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   
   arg1 = (Dali::TouchData *)jarg1; 
@@ -26017,7 +26238,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchData(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   Dali::TouchData *arg2 = 0 ;
@@ -26051,7 +26272,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchData_GetTime(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Touch_GetTime(void * jarg1) {
   unsigned long jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   unsigned long result;
@@ -26079,7 +26300,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchData_GetTime(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchData_GetPointCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Touch_GetPointCount(void * jarg1) {
   unsigned long jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t result;
@@ -26107,7 +26328,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchData_GetPointCount(void * j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TouchData_GetDeviceId(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetDeviceId(void * jarg1, unsigned long jarg2) {
   int jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26137,7 +26358,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TouchData_GetDeviceId(void * jarg1, unsign
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TouchData_GetState(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Touch_GetState(void * jarg1, unsigned long jarg2) {
   int jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26167,7 +26388,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TouchData_GetState(void * jarg1, unsigned
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetHitActor(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetHitActor(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26197,7 +26418,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetHitActor(void * jarg1, uns
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetLocalPosition(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetLocalPosition(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26227,7 +26448,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetLocalPosition(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetScreenPosition(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetScreenPosition(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26257,7 +26478,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetScreenPosition(void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TouchData_GetRadius(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Touch_GetRadius(void * jarg1, unsigned long jarg2) {
   float jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26287,7 +26508,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TouchData_GetRadius(void * jarg1, unsign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetEllipseRadius(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetEllipseRadius(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26317,7 +26538,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetEllipseRadius(void * jarg1
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TouchData_GetPressure(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Touch_GetPressure(void * jarg1, unsigned long jarg2) {
   float jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26347,7 +26568,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TouchData_GetPressure(void * jarg1, unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetAngle(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Touch_GetAngle(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::TouchData *arg1 = (Dali::TouchData *) 0 ;
   std::size_t arg2 ;
@@ -26377,7 +26598,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchData_GetAngle(void * jarg1, unsign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GestureDetector__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GestureDetector__SWIG_0() {
   void * jresult ;
   Dali::GestureDetector *result = 0 ;
   
@@ -26403,7 +26624,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GestureDetector__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GestureDetector_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -26437,7 +26658,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GestureDetector_DownCast(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_GestureDetector(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GestureDetector(void * jarg1) {
   Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
   
   arg1 = (Dali::GestureDetector *)jarg1; 
@@ -26461,7 +26682,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_GestureDetector(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GestureDetector__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::GestureDetector *arg1 = 0 ;
   Dali::GestureDetector *result = 0 ;
@@ -26493,7 +26714,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GestureDetector__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GestureDetector_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
   Dali::GestureDetector *arg2 = 0 ;
@@ -26527,7 +26748,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GestureDetector_Assign(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GestureDetector_Attach(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_Attach(void * jarg1, void * jarg2) {
   Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -26559,7 +26780,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GestureDetector_Attach(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GestureDetector_Detach(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_Detach(void * jarg1, void * jarg2) {
   Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -26591,7 +26812,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GestureDetector_Detach(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GestureDetector_DetachAll(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GestureDetector_DetachAll(void * jarg1) {
   Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
   
   arg1 = (Dali::GestureDetector *)jarg1; 
@@ -26615,7 +26836,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GestureDetector_DetachAll(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_GestureDetector_GetAttachedActorCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_GestureDetector_GetAttachedActorCount(void * jarg1) {
   unsigned long jresult ;
   Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
   size_t result;
@@ -26643,7 +26864,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_GestureDetector_GetAttachedActor
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GestureDetector_GetAttachedActor(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GestureDetector_GetAttachedActor(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::GestureDetector *arg1 = (Dali::GestureDetector *) 0 ;
   size_t arg2 ;
@@ -26673,7 +26894,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GestureDetector_GetAttachedActor(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Gesture(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Gesture(void * jarg1) {
   void * jresult ;
   Dali::Gesture *arg1 = 0 ;
   Dali::Gesture *result = 0 ;
@@ -26705,7 +26926,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Gesture(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Gesture_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Gesture_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
   Dali::Gesture *arg2 = 0 ;
@@ -26739,7 +26960,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Gesture_Assign(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Gesture(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Gesture(void * jarg1) {
   Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
   
   arg1 = (Dali::Gesture *)jarg1; 
@@ -26763,7 +26984,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Gesture(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Gesture_type_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Gesture_type_set(void * jarg1, int jarg2) {
   Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
   Dali::Gesture::Type arg2 ;
   
@@ -26773,7 +26994,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Gesture_type_set(void * jarg1, int jarg2)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Gesture_type_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_type_get(void * jarg1) {
   int jresult ;
   Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
   Dali::Gesture::Type result;
@@ -26785,7 +27006,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Gesture_type_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Gesture_state_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Gesture_state_set(void * jarg1, int jarg2) {
   Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
   Dali::Gesture::State arg2 ;
   
@@ -26795,7 +27016,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Gesture_state_set(void * jarg1, int jarg2
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Gesture_state_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Gesture_state_get(void * jarg1) {
   int jresult ;
   Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
   Dali::Gesture::State result;
@@ -26807,7 +27028,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Gesture_state_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Gesture_time_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Gesture_time_set(void * jarg1, unsigned int jarg2) {
   Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
   unsigned int arg2 ;
   
@@ -26817,7 +27038,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Gesture_time_set(void * jarg1, unsigned i
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Gesture_time_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Gesture_time_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Gesture *arg1 = (Dali::Gesture *) 0 ;
   unsigned int result;
@@ -26829,7 +27050,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Gesture_time_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_HoverEvent__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Hover__SWIG_0() {
   void * jresult ;
   Dali::HoverEvent *result = 0 ;
   
@@ -26855,7 +27076,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_HoverEvent__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_HoverEvent__SWIG_1(unsigned long jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Hover__SWIG_1(unsigned long jarg1) {
   void * jresult ;
   unsigned long arg1 ;
   Dali::HoverEvent *result = 0 ;
@@ -26883,7 +27104,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_HoverEvent__SWIG_1(unsigned long ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_HoverEvent(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Hover(void * jarg1) {
   Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
   
   arg1 = (Dali::HoverEvent *)jarg1; 
@@ -26907,7 +27128,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_HoverEvent(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_HoverEvent_points_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Hover_points_set(void * jarg1, void * jarg2) {
   Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
   Dali::TouchPointContainer *arg2 = (Dali::TouchPointContainer *) 0 ;
   
@@ -26917,7 +27138,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_HoverEvent_points_set(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_HoverEvent_points_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_points_get(void * jarg1) {
   void * jresult ;
   Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
   Dali::TouchPointContainer *result = 0 ;
@@ -26929,7 +27150,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_HoverEvent_points_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_HoverEvent_time_set(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Hover_time_set(void * jarg1, unsigned long jarg2) {
   Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
   unsigned long arg2 ;
   
@@ -26939,7 +27160,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_HoverEvent_time_set(void * jarg1, unsigne
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_HoverEvent_time_get(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Hover_time_get(void * jarg1) {
   unsigned long jresult ;
   Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
   unsigned long result;
@@ -26951,7 +27172,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_HoverEvent_time_get(void * jarg1
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_HoverEvent_GetPointCount(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Hover_GetPointCount(void * jarg1) {
   unsigned int jresult ;
   Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
   unsigned int result;
@@ -26979,7 +27200,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_HoverEvent_GetPointCount(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_HoverEvent_GetPoint(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Hover_GetPoint(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::HoverEvent *arg1 = (Dali::HoverEvent *) 0 ;
   unsigned int arg2 ;
@@ -27009,7 +27230,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_HoverEvent_GetPoint(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyEvent__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Key__SWIG_0() {
   void * jresult ;
   Dali::KeyEvent *result = 0 ;
   
@@ -27035,7 +27256,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyEvent__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyEvent__SWIG_1(char * jarg1, char * jarg2, int jarg3, int jarg4, unsigned long jarg5, int jarg6) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Key__SWIG_1(char * jarg1, char * jarg2, int jarg3, int jarg4, unsigned long jarg5, int jarg6) {
   void * jresult ;
   std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -27091,7 +27312,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyEvent__SWIG_1(char * jarg1, char
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyEvent(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Key(void * jarg1) {
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   
   arg1 = (Dali::KeyEvent *)jarg1; 
@@ -27115,7 +27336,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyEvent(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyEvent_IsShiftModifier(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Key_IsShiftModifier(void * jarg1) {
   unsigned int jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   bool result;
@@ -27143,7 +27364,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyEvent_IsShiftModifier(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyEvent_IsCtrlModifier(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Key_IsCtrlModifier(void * jarg1) {
   unsigned int jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   bool result;
@@ -27171,7 +27392,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyEvent_IsCtrlModifier(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyEvent_IsAltModifier(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Key_IsAltModifier(void * jarg1) {
   unsigned int jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   bool result;
@@ -27199,7 +27420,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyEvent_IsAltModifier(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_keyPressedName_set(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyPressedName_set(void * jarg1, char * jarg2) {
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -27217,7 +27438,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_keyPressedName_set(void * jarg1,
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_KeyEvent_keyPressedName_get(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Key_keyPressedName_get(void * jarg1) {
   char * jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   std::string *result = 0 ;
@@ -27229,7 +27450,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_KeyEvent_keyPressedName_get(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_keyPressed_set(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyPressed_set(void * jarg1, char * jarg2) {
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -27247,7 +27468,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_keyPressed_set(void * jarg1, cha
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_KeyEvent_keyPressed_get(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Key_keyPressed_get(void * jarg1) {
   char * jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   std::string *result = 0 ;
@@ -27259,7 +27480,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_KeyEvent_keyPressed_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_keyCode_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyCode_set(void * jarg1, int jarg2) {
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   int arg2 ;
   
@@ -27269,7 +27490,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_keyCode_set(void * jarg1, int ja
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_KeyEvent_keyCode_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_keyCode_get(void * jarg1) {
   int jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   int result;
@@ -27281,7 +27502,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_KeyEvent_keyCode_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_keyModifier_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyModifier_set(void * jarg1, int jarg2) {
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   int arg2 ;
   
@@ -27291,7 +27512,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_keyModifier_set(void * jarg1, in
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_KeyEvent_keyModifier_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_keyModifier_get(void * jarg1) {
   int jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   int result;
@@ -27303,7 +27524,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_KeyEvent_keyModifier_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_time_set(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_time_set(void * jarg1, unsigned long jarg2) {
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   unsigned long arg2 ;
   
@@ -27313,7 +27534,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_time_set(void * jarg1, unsigned
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_KeyEvent_time_get(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Key_time_get(void * jarg1) {
   unsigned long jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   unsigned long result;
@@ -27325,7 +27546,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_KeyEvent_time_get(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_state_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_state_set(void * jarg1, int jarg2) {
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   Dali::KeyEvent::State arg2 ;
   
@@ -27335,7 +27556,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEvent_state_set(void * jarg1, int jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_KeyEvent_state_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Key_state_get(void * jarg1) {
   int jresult ;
   Dali::KeyEvent *arg1 = (Dali::KeyEvent *) 0 ;
   Dali::KeyEvent::State result;
@@ -27347,7 +27568,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_KeyEvent_state_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGestureDetector__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetector__SWIG_0() {
   void * jresult ;
   Dali::LongPressGestureDetector *result = 0 ;
   
@@ -27373,7 +27594,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGestureDetector__SWIG_0()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_0() {
   void * jresult ;
   Dali::LongPressGestureDetector result;
   
@@ -27399,7 +27620,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_New__SWIG_0()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_New__SWIG_1(unsigned int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_1(unsigned int jarg1) {
   void * jresult ;
   unsigned int arg1 ;
   Dali::LongPressGestureDetector result;
@@ -27427,7 +27648,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_New__SWIG_1(un
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_New__SWIG_2(unsigned int jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_New__SWIG_2(unsigned int jarg1, unsigned int jarg2) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -27457,7 +27678,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_New__SWIG_2(un
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -27491,7 +27712,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_DownCast(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LongPressGestureDetector(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGestureDetector(void * jarg1) {
   Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   
   arg1 = (Dali::LongPressGestureDetector *)jarg1; 
@@ -27515,7 +27736,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LongPressGestureDetector(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGestureDetector__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::LongPressGestureDetector *arg1 = 0 ;
   Dali::LongPressGestureDetector *result = 0 ;
@@ -27547,7 +27768,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGestureDetector__SWIG_1(vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   Dali::LongPressGestureDetector *arg2 = 0 ;
@@ -27581,7 +27802,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_Assign(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_SetTouchesRequired__SWIG_0(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_SetTouchesRequired__SWIG_0(void * jarg1, unsigned int jarg2) {
   Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   unsigned int arg2 ;
   
@@ -27607,7 +27828,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_SetTouchesRequir
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_SetTouchesRequired__SWIG_1(void * jarg1, unsigned int jarg2, unsigned int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_SetTouchesRequired__SWIG_1(void * jarg1, unsigned int jarg2, unsigned int jarg3) {
   Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   unsigned int arg2 ;
   unsigned int arg3 ;
@@ -27635,7 +27856,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_SetTouchesRequir
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_GetMinimumTouchesRequired(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_GetMinimumTouchesRequired(void * jarg1) {
   unsigned int jresult ;
   Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   unsigned int result;
@@ -27663,7 +27884,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_GetMinim
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_GetMaximumTouchesRequired(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_GetMaximumTouchesRequired(void * jarg1) {
   unsigned int jresult ;
   Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   unsigned int result;
@@ -27691,7 +27912,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_GetMaxim
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_DetectedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_DetectedSignal(void * jarg1) {
   void * jresult ;
   Dali::LongPressGestureDetector *arg1 = (Dali::LongPressGestureDetector *) 0 ;
   Dali::LongPressGestureDetector::DetectedSignalType *result = 0 ;
@@ -27719,7 +27940,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_DetectedSignal
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGesture__SWIG_0(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGesture__SWIG_0(int jarg1) {
   void * jresult ;
   Dali::Gesture::State arg1 ;
   Dali::LongPressGesture *result = 0 ;
@@ -27747,7 +27968,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGesture__SWIG_0(int jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGesture__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGesture__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::LongPressGesture *arg1 = 0 ;
   Dali::LongPressGesture *result = 0 ;
@@ -27779,7 +28000,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGesture__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGesture_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
   Dali::LongPressGesture *arg2 = 0 ;
@@ -27813,7 +28034,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGesture_Assign(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LongPressGesture(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGesture(void * jarg1) {
   Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
   
   arg1 = (Dali::LongPressGesture *)jarg1; 
@@ -27837,7 +28058,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LongPressGesture(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGesture_numberOfTouches_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGesture_numberOfTouches_set(void * jarg1, unsigned int jarg2) {
   Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
   unsigned int arg2 ;
   
@@ -27847,7 +28068,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGesture_numberOfTouches_set(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LongPressGesture_numberOfTouches_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGesture_numberOfTouches_get(void * jarg1) {
   unsigned int jresult ;
   Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
   unsigned int result;
@@ -27859,7 +28080,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LongPressGesture_numberOfTouches_
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGesture_screenPoint_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGesture_screenPoint_set(void * jarg1, void * jarg2) {
   Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -27869,7 +28090,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGesture_screenPoint_set(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGesture_screenPoint_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_screenPoint_get(void * jarg1) {
   void * jresult ;
   Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -27881,7 +28102,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGesture_screenPoint_get(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGesture_localPoint_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGesture_localPoint_set(void * jarg1, void * jarg2) {
   Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -27891,7 +28112,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGesture_localPoint_set(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGesture_localPoint_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_localPoint_get(void * jarg1) {
   void * jresult ;
   Dali::LongPressGesture *arg1 = (Dali::LongPressGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -27903,7 +28124,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LongPressGesture_localPoint_get(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_WheelEvent__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Wheel__SWIG_0() {
   void * jresult ;
   Dali::WheelEvent *result = 0 ;
   
@@ -27929,7 +28150,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_WheelEvent__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_WheelEvent__SWIG_1(int jarg1, int jarg2, unsigned int jarg3, void * jarg4, int jarg5, unsigned int jarg6) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Wheel__SWIG_1(int jarg1, int jarg2, unsigned int jarg3, void * jarg4, int jarg5, unsigned int jarg6) {
   void * jresult ;
   Dali::WheelEvent::Type arg1 ;
   int arg2 ;
@@ -27973,7 +28194,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_WheelEvent__SWIG_1(int jarg1, int j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_WheelEvent(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Wheel(void * jarg1) {
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   
   arg1 = (Dali::WheelEvent *)jarg1; 
@@ -27997,7 +28218,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_WheelEvent(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_IsShiftModifier(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_IsShiftModifier(void * jarg1) {
   unsigned int jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   bool result;
@@ -28025,7 +28246,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_IsShiftModifier(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_IsCtrlModifier(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_IsCtrlModifier(void * jarg1) {
   unsigned int jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   bool result;
@@ -28053,7 +28274,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_IsCtrlModifier(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_IsAltModifier(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_IsAltModifier(void * jarg1) {
   unsigned int jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   bool result;
@@ -28081,7 +28302,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_IsAltModifier(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_type_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Wheel_type_set(void * jarg1, int jarg2) {
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   Dali::WheelEvent::Type arg2 ;
   
@@ -28091,7 +28312,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_type_set(void * jarg1, int jar
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_WheelEvent_type_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_type_get(void * jarg1) {
   int jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   Dali::WheelEvent::Type result;
@@ -28103,7 +28324,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_WheelEvent_type_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_direction_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Wheel_direction_set(void * jarg1, int jarg2) {
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   int arg2 ;
   
@@ -28113,7 +28334,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_direction_set(void * jarg1, in
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_WheelEvent_direction_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_direction_get(void * jarg1) {
   int jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   int result;
@@ -28125,7 +28346,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_WheelEvent_direction_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_modifiers_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Wheel_modifiers_set(void * jarg1, unsigned int jarg2) {
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   unsigned int arg2 ;
   
@@ -28135,7 +28356,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_modifiers_set(void * jarg1, un
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_modifiers_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_modifiers_get(void * jarg1) {
   unsigned int jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   unsigned int result;
@@ -28147,7 +28368,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_modifiers_get(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_point_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Wheel_point_set(void * jarg1, void * jarg2) {
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -28157,7 +28378,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_point_set(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_WheelEvent_point_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Wheel_point_get(void * jarg1) {
   void * jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -28169,7 +28390,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_WheelEvent_point_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_z_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Wheel_z_set(void * jarg1, int jarg2) {
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   int arg2 ;
   
@@ -28179,7 +28400,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_z_set(void * jarg1, int jarg2)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_WheelEvent_z_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Wheel_z_get(void * jarg1) {
   int jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   int result;
@@ -28191,7 +28412,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_WheelEvent_z_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_timeStamp_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Wheel_timeStamp_set(void * jarg1, unsigned int jarg2) {
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   unsigned int arg2 ;
   
@@ -28201,7 +28422,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WheelEvent_timeStamp_set(void * jarg1, un
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_timeStamp_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Wheel_timeStamp_get(void * jarg1) {
   unsigned int jresult ;
   Dali::WheelEvent *arg1 = (Dali::WheelEvent *) 0 ;
   unsigned int result;
@@ -28213,7 +28434,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_WheelEvent_timeStamp_get(void * j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PARENT_ORIGIN_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_PARENT_ORIGIN_get() {
   int jresult ;
   int result;
   
@@ -28223,7 +28444,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PARENT_ORIGIN_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PARENT_ORIGIN_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_PARENT_ORIGIN_X_get() {
   int jresult ;
   int result;
   
@@ -28233,7 +28454,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PARENT_ORIGIN_X_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PARENT_ORIGIN_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_PARENT_ORIGIN_Y_get() {
   int jresult ;
   int result;
   
@@ -28243,7 +28464,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PARENT_ORIGIN_Y_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PARENT_ORIGIN_Z_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_PARENT_ORIGIN_Z_get() {
   int jresult ;
   int result;
   
@@ -28253,7 +28474,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PARENT_ORIGIN_Z_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ANCHOR_POINT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_ANCHOR_POINT_get() {
   int jresult ;
   int result;
   
@@ -28263,7 +28484,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ANCHOR_POINT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ANCHOR_POINT_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_ANCHOR_POINT_X_get() {
   int jresult ;
   int result;
   
@@ -28273,7 +28494,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ANCHOR_POINT_X_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ANCHOR_POINT_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_ANCHOR_POINT_Y_get() {
   int jresult ;
   int result;
   
@@ -28283,7 +28504,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ANCHOR_POINT_Y_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ANCHOR_POINT_Z_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_ANCHOR_POINT_Z_get() {
   int jresult ;
   int result;
   
@@ -28293,7 +28514,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ANCHOR_POINT_Z_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SIZE_get() {
   int jresult ;
   int result;
   
@@ -28303,7 +28524,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_WIDTH_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SIZE_WIDTH_get() {
   int jresult ;
   int result;
   
@@ -28313,7 +28534,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_WIDTH_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_HEIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SIZE_HEIGHT_get() {
   int jresult ;
   int result;
   
@@ -28323,7 +28544,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_HEIGHT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_DEPTH_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SIZE_DEPTH_get() {
   int jresult ;
   int result;
   
@@ -28333,7 +28554,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_DEPTH_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_POSITION_get() {
   int jresult ;
   int result;
   
@@ -28343,7 +28564,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_POSITION_X_get() {
   int jresult ;
   int result;
   
@@ -28353,7 +28574,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_X_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_POSITION_Y_get() {
   int jresult ;
   int result;
   
@@ -28363,7 +28584,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_Y_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_Z_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_POSITION_Z_get() {
   int jresult ;
   int result;
   
@@ -28373,7 +28594,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_Z_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_POSITION_get() {
   int jresult ;
   int result;
   
@@ -28383,7 +28604,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_POSITION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_POSITION_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_POSITION_X_get() {
   int jresult ;
   int result;
   
@@ -28393,7 +28614,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_POSITION_X_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_POSITION_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_POSITION_Y_get() {
   int jresult ;
   int result;
   
@@ -28403,7 +28624,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_POSITION_Y_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_POSITION_Z_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_POSITION_Z_get() {
   int jresult ;
   int result;
   
@@ -28413,7 +28634,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_POSITION_Z_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ORIENTATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_ORIENTATION_get() {
   int jresult ;
   int result;
   
@@ -28423,7 +28644,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_ORIENTATION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_ORIENTATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_ORIENTATION_get() {
   int jresult ;
   int result;
   
@@ -28433,7 +28654,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_ORIENTATION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SCALE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SCALE_get() {
   int jresult ;
   int result;
   
@@ -28443,7 +28664,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SCALE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SCALE_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SCALE_X_get() {
   int jresult ;
   int result;
   
@@ -28453,7 +28674,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SCALE_X_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SCALE_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SCALE_Y_get() {
   int jresult ;
   int result;
   
@@ -28463,7 +28684,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SCALE_Y_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SCALE_Z_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SCALE_Z_get() {
   int jresult ;
   int result;
   
@@ -28473,7 +28694,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SCALE_Z_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_SCALE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_SCALE_get() {
   int jresult ;
   int result;
   
@@ -28483,7 +28704,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_SCALE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_VISIBLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_VISIBLE_get() {
   int jresult ;
   int result;
   
@@ -28493,7 +28714,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_VISIBLE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_get() {
   int jresult ;
   int result;
   
@@ -28503,7 +28724,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_RED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_RED_get() {
   int jresult ;
   int result;
   
@@ -28513,7 +28734,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_RED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_GREEN_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_GREEN_get() {
   int jresult ;
   int result;
   
@@ -28523,7 +28744,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_GREEN_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_BLUE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_BLUE_get() {
   int jresult ;
   int result;
   
@@ -28533,7 +28754,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_BLUE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_ALPHA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_ALPHA_get() {
   int jresult ;
   int result;
   
@@ -28543,7 +28764,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_ALPHA_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_COLOR_get() {
   int jresult ;
   int result;
   
@@ -28553,7 +28774,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_MATRIX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WORLD_MATRIX_get() {
   int jresult ;
   int result;
   
@@ -28563,7 +28784,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WORLD_MATRIX_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_NAME_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_NAME_get() {
   int jresult ;
   int result;
   
@@ -28573,7 +28794,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_NAME_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SENSITIVE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SENSITIVE_get() {
   int jresult ;
   int result;
   
@@ -28583,7 +28804,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SENSITIVE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_LEAVE_REQUIRED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_LEAVE_REQUIRED_get() {
   int jresult ;
   int result;
   
@@ -28593,7 +28814,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_LEAVE_REQUIRED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_INHERIT_ORIENTATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_INHERIT_ORIENTATION_get() {
   int jresult ;
   int result;
   
@@ -28603,7 +28824,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_INHERIT_ORIENTATION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_INHERIT_SCALE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_INHERIT_SCALE_get() {
   int jresult ;
   int result;
   
@@ -28613,7 +28834,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_INHERIT_SCALE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_COLOR_MODE_get() {
   int jresult ;
   int result;
   
@@ -28623,7 +28844,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_COLOR_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_INHERITANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_POSITION_INHERITANCE_get() {
   int jresult ;
   int result;
   
@@ -28633,7 +28854,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_POSITION_INHERITANCE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_DRAW_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_DRAW_MODE_get() {
   int jresult ;
   int result;
   
@@ -28643,7 +28864,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_DRAW_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_MODE_FACTOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SIZE_MODE_FACTOR_get() {
   int jresult ;
   int result;
   
@@ -28653,7 +28874,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_MODE_FACTOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WIDTH_RESIZE_POLICY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WIDTH_RESIZE_POLICY_get() {
   int jresult ;
   int result;
   
@@ -28663,7 +28884,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WIDTH_RESIZE_POLICY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_HEIGHT_RESIZE_POLICY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_HEIGHT_RESIZE_POLICY_get() {
   int jresult ;
   int result;
   
@@ -28673,7 +28894,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_HEIGHT_RESIZE_POLICY_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_SCALE_POLICY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_SIZE_SCALE_POLICY_get() {
   int jresult ;
   int result;
   
@@ -28683,7 +28904,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_SIZE_SCALE_POLICY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WIDTH_FOR_HEIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_WIDTH_FOR_HEIGHT_get() {
   int jresult ;
   int result;
   
@@ -28693,7 +28914,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_WIDTH_FOR_HEIGHT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_HEIGHT_FOR_WIDTH_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_HEIGHT_FOR_WIDTH_get() {
   int jresult ;
   int result;
   
@@ -28703,7 +28924,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_HEIGHT_FOR_WIDTH_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PADDING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_PADDING_get() {
   int jresult ;
   int result;
   
@@ -28713,7 +28934,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_PADDING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_MINIMUM_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_MINIMUM_SIZE_get() {
   int jresult ;
   int result;
   
@@ -28723,7 +28944,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_MINIMUM_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_MAXIMUM_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_MAXIMUM_SIZE_get() {
   int jresult ;
   int result;
   
@@ -28733,7 +28954,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_MAXIMUM_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_INHERIT_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_INHERIT_POSITION_get() {
   int jresult ;
   int result;
   
@@ -28743,7 +28964,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_INHERIT_POSITION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_CLIPPING_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_Property_CLIPPING_MODE_get() {
   int jresult ;
   int result;
   
@@ -28753,7 +28974,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_Property_CLIPPING_MODE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Actor_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Actor_Property() {
   void * jresult ;
   Dali::Actor::Property *result = 0 ;
   
@@ -28779,7 +29000,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Actor_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Actor_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Actor_Property(void * jarg1) {
   Dali::Actor::Property *arg1 = (Dali::Actor::Property *) 0 ;
   
   arg1 = (Dali::Actor::Property *)jarg1; 
@@ -28803,7 +29024,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Actor_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Actor__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Actor__SWIG_0() {
   void * jresult ;
   Dali::Actor *result = 0 ;
   
@@ -28829,7 +29050,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Actor__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_New() {
   void * jresult ;
   Dali::Actor result;
   
@@ -28855,7 +29076,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -28889,7 +29110,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Actor(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Actor(void * jarg1) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   
   arg1 = (Dali::Actor *)jarg1; 
@@ -28913,7 +29134,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Actor(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Actor__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Actor__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = 0 ;
   Dali::Actor *result = 0 ;
@@ -28945,7 +29166,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Actor__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor *arg2 = 0 ;
@@ -28979,7 +29200,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_Assign(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Actor_GetName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Actor_GetName(void * jarg1) {
   char * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   std::string *result = 0 ;
@@ -29007,7 +29228,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Actor_GetName(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetName(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetName(void * jarg1, char * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -29041,7 +29262,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetName(void * jarg1, char * jarg2)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_GetId(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_GetId(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   unsigned int result;
@@ -29069,7 +29290,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_GetId(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsRoot(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_IsRoot(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -29097,7 +29318,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsRoot(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_OnStage(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_OnStage(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -29125,7 +29346,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_OnStage(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsLayer(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_IsLayer(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -29153,7 +29374,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsLayer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetLayer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetLayer(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Layer result;
@@ -29181,7 +29402,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetLayer(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_Add(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -29213,7 +29434,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_Add(void * jarg1, void * jarg2) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_Remove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_Remove(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -29245,7 +29466,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_Remove(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_Unparent(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_Unparent(void * jarg1) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   
   arg1 = (Dali::Actor *)jarg1; 
@@ -29269,7 +29490,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_Unparent(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_GetChildCount(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_GetChildCount(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   unsigned int result;
@@ -29297,7 +29518,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_GetChildCount(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetChildAt(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetChildAt(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   unsigned int arg2 ;
@@ -29327,7 +29548,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetChildAt(void * jarg1, unsigned
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_FindChildByName(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_FindChildByName(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   std::string *arg2 = 0 ;
@@ -29365,7 +29586,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_FindChildByName(void * jarg1, cha
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_FindChildById(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_FindChildById(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   unsigned int arg2 ;
@@ -29395,7 +29616,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_FindChildById(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetParent(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetParent(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor result;
@@ -29423,7 +29644,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetParent(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetParentOrigin(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetParentOrigin(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -29453,7 +29674,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetParentOrigin(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentParentOrigin(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentParentOrigin(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -29481,7 +29702,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentParentOrigin(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetAnchorPoint(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetAnchorPoint(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -29511,7 +29732,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetAnchorPoint(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentAnchorPoint(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentAnchorPoint(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -29539,7 +29760,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentAnchorPoint(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSize__SWIG_0(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSize__SWIG_0(void * jarg1, float jarg2, float jarg3) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   float arg3 ;
@@ -29567,7 +29788,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSize__SWIG_0(void * jarg1, float
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSize__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSize__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   float arg3 ;
@@ -29597,7 +29818,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSize__SWIG_1(void * jarg1, float
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSize__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSize__SWIG_2(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   
@@ -29627,7 +29848,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSize__SWIG_2(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSize__SWIG_3(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSize__SWIG_3(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -29657,7 +29878,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSize__SWIG_3(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetTargetSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetTargetSize(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -29685,7 +29906,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetTargetSize(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentSize(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -29713,7 +29934,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentSize(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetNaturalSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetNaturalSize(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -29741,7 +29962,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetNaturalSize(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetPosition__SWIG_0(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetPosition__SWIG_0(void * jarg1, float jarg2, float jarg3) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   float arg3 ;
@@ -29769,7 +29990,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetPosition__SWIG_0(void * jarg1, f
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetPosition__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetPosition__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   float arg3 ;
@@ -29799,7 +30020,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetPosition__SWIG_1(void * jarg1, f
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetPosition__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetPosition__SWIG_2(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -29829,7 +30050,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetPosition__SWIG_2(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetX(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetX(void * jarg1, float jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   
@@ -29855,7 +30076,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetX(void * jarg1, float jarg2) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetY(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetY(void * jarg1, float jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   
@@ -29881,7 +30102,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetY(void * jarg1, float jarg2) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetZ(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetZ(void * jarg1, float jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   
@@ -29907,7 +30128,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetZ(void * jarg1, float jarg2) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_TranslateBy(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_TranslateBy(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -29937,7 +30158,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_TranslateBy(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentPosition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentPosition(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -29965,7 +30186,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentPosition(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldPosition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentWorldPosition(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -29993,7 +30214,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldPosition(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetInheritPosition(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetInheritPosition(void * jarg1, unsigned int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool arg2 ;
   
@@ -30019,7 +30240,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetInheritPosition(void * jarg1, un
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetPositionInheritanceMode(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetPositionInheritanceMode(void * jarg1) {
   int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::PositionInheritanceMode result;
@@ -30047,7 +30268,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetPositionInheritanceMode(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsPositionInherited(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_IsPositionInherited(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -30075,7 +30296,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsPositionInherited(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetOrientation__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetOrientation__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Degree *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -30111,7 +30332,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetOrientation__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetOrientation__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetOrientation__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Radian *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -30147,7 +30368,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetOrientation__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetOrientation__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetOrientation__SWIG_2(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
   
@@ -30177,7 +30398,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetOrientation__SWIG_2(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RotateBy__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_RotateBy__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Degree *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -30213,7 +30434,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RotateBy__SWIG_0(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RotateBy__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_RotateBy__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Radian *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -30249,7 +30470,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RotateBy__SWIG_1(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RotateBy__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_RotateBy__SWIG_2(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Quaternion *arg2 = 0 ;
   
@@ -30279,7 +30500,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RotateBy__SWIG_2(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentOrientation(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentOrientation(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Quaternion result;
@@ -30307,7 +30528,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentOrientation(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetInheritOrientation(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetInheritOrientation(void * jarg1, unsigned int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool arg2 ;
   
@@ -30333,7 +30554,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetInheritOrientation(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsOrientationInherited(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_IsOrientationInherited(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -30361,7 +30582,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsOrientationInherited(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldOrientation(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentWorldOrientation(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Quaternion result;
@@ -30389,7 +30610,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldOrientation(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetScale__SWIG_0(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetScale__SWIG_0(void * jarg1, float jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   
@@ -30415,7 +30636,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetScale__SWIG_0(void * jarg1, floa
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetScale__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetScale__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   float arg3 ;
@@ -30445,7 +30666,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetScale__SWIG_1(void * jarg1, floa
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetScale__SWIG_2(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetScale__SWIG_2(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -30475,7 +30696,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetScale__SWIG_2(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_ScaleBy(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_ScaleBy(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -30505,7 +30726,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_ScaleBy(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentScale(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentScale(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -30533,7 +30754,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentScale(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldScale(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentWorldScale(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -30561,7 +30782,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldScale(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetInheritScale(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetInheritScale(void * jarg1, unsigned int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool arg2 ;
   
@@ -30587,7 +30808,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetInheritScale(void * jarg1, unsig
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsScaleInherited(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_IsScaleInherited(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -30615,7 +30836,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsScaleInherited(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldMatrix(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentWorldMatrix(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Matrix result;
@@ -30643,7 +30864,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldMatrix(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetVisible(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetVisible(void * jarg1, unsigned int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool arg2 ;
   
@@ -30669,7 +30890,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetVisible(void * jarg1, unsigned i
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsVisible(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_IsVisible(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -30697,7 +30918,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsVisible(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetOpacity(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetOpacity(void * jarg1, float jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
   
@@ -30723,7 +30944,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetOpacity(void * jarg1, float jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Actor_GetCurrentOpacity(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Actor_GetCurrentOpacity(void * jarg1) {
   float jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float result;
@@ -30751,7 +30972,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Actor_GetCurrentOpacity(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetColor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetColor(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
   
@@ -30781,7 +31002,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetColor(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentColor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentColor(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector4 result;
@@ -30809,7 +31030,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentColor(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetColorMode(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetColorMode(void * jarg1, int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::ColorMode arg2 ;
   
@@ -30835,7 +31056,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetColorMode(void * jarg1, int jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetColorMode(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetColorMode(void * jarg1) {
   int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::ColorMode result;
@@ -30863,7 +31084,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetColorMode(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldColor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetCurrentWorldColor(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector4 result;
@@ -30891,7 +31112,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetCurrentWorldColor(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetDrawMode(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetDrawMode(void * jarg1, int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::DrawMode::Type arg2 ;
   
@@ -30917,7 +31138,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetDrawMode(void * jarg1, int jarg2
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetDrawMode(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetDrawMode(void * jarg1) {
   int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::DrawMode::Type result;
@@ -30945,7 +31166,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetDrawMode(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSensitive(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSensitive(void * jarg1, unsigned int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool arg2 ;
   
@@ -30971,7 +31192,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSensitive(void * jarg1, unsigned
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsSensitive(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_IsSensitive(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -30999,7 +31220,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsSensitive(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_ScreenToLocal(void * jarg1, float * jarg2, float * jarg3, float jarg4, float jarg5) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_ScreenToLocal(void * jarg1, float * jarg2, float * jarg3, float jarg4, float jarg5) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float *arg2 = 0 ;
@@ -31035,7 +31256,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_ScreenToLocal(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetLeaveRequired(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetLeaveRequired(void * jarg1, unsigned int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool arg2 ;
   
@@ -31061,7 +31282,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetLeaveRequired(void * jarg1, unsi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_GetLeaveRequired(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_GetLeaveRequired(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -31089,7 +31310,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_GetLeaveRequired(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetKeyboardFocusable(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetKeyboardFocusable(void * jarg1, unsigned int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool arg2 ;
   
@@ -31115,7 +31336,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetKeyboardFocusable(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsKeyboardFocusable(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_IsKeyboardFocusable(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   bool result;
@@ -31143,7 +31364,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_IsKeyboardFocusable(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetResizePolicy(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetResizePolicy(void * jarg1, int jarg2, int jarg3) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::ResizePolicy::Type arg2 ;
   Dali::Dimension::Type arg3 ;
@@ -31171,7 +31392,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetResizePolicy(void * jarg1, int j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetResizePolicy(void * jarg1, int jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetResizePolicy(void * jarg1, int jarg2) {
   int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Dimension::Type arg2 ;
@@ -31201,7 +31422,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetResizePolicy(void * jarg1, int ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSizeScalePolicy(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSizeScalePolicy(void * jarg1, int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::SizeScalePolicy::Type arg2 ;
   
@@ -31227,7 +31448,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSizeScalePolicy(void * jarg1, in
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetSizeScalePolicy(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetSizeScalePolicy(void * jarg1) {
   int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::SizeScalePolicy::Type result;
@@ -31255,7 +31476,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetSizeScalePolicy(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSizeModeFactor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetSizeModeFactor(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -31285,7 +31506,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetSizeModeFactor(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetSizeModeFactor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetSizeModeFactor(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector3 result;
@@ -31313,7 +31534,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetSizeModeFactor(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Actor_GetHeightForWidth(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Actor_GetHeightForWidth(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
@@ -31343,7 +31564,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Actor_GetHeightForWidth(void * jarg1, fl
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Actor_GetWidthForHeight(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Actor_GetWidthForHeight(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   float arg2 ;
@@ -31373,7 +31594,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Actor_GetWidthForHeight(void * jarg1, fl
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Actor_GetRelayoutSize(void * jarg1, int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Actor_GetRelayoutSize(void * jarg1, int jarg2) {
   float jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Dimension::Type arg2 ;
@@ -31403,7 +31624,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Actor_GetRelayoutSize(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetPadding(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetPadding(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Padding *arg2 = 0 ;
   
@@ -31433,7 +31654,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetPadding(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_GetPadding(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_GetPadding(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Padding *arg2 = 0 ;
   
@@ -31463,7 +31684,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_GetPadding(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetMinimumSize(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetMinimumSize(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   
@@ -31493,7 +31714,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetMinimumSize(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetMinimumSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetMinimumSize(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector2 result;
@@ -31521,7 +31742,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetMinimumSize(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetMaximumSize(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_SetMaximumSize(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   
@@ -31551,7 +31772,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_SetMaximumSize(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetMaximumSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetMaximumSize(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Vector2 result;
@@ -31579,7 +31800,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetMaximumSize(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetHierarchyDepth(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Actor_GetHierarchyDepth(void * jarg1) {
   int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   int result;
@@ -31607,7 +31828,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Actor_GetHierarchyDepth(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_AddRenderer(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_AddRenderer(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Renderer *arg2 = 0 ;
@@ -31641,7 +31862,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_AddRenderer(void * jarg1, v
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_GetRendererCount(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Actor_GetRendererCount(void * jarg1) {
   unsigned int jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   unsigned int result;
@@ -31669,7 +31890,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Actor_GetRendererCount(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetRendererAt(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_GetRendererAt(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   unsigned int arg2 ;
@@ -31699,7 +31920,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_GetRendererAt(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RemoveRenderer__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_RemoveRenderer__SWIG_0(void * jarg1, void * jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Renderer *arg2 = 0 ;
   
@@ -31729,7 +31950,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RemoveRenderer__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RemoveRenderer__SWIG_1(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Actor_RemoveRenderer__SWIG_1(void * jarg1, unsigned int jarg2) {
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   unsigned int arg2 ;
   
@@ -31755,7 +31976,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Actor_RemoveRenderer__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_TouchedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_TouchedSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor::TouchSignalType *result = 0 ;
@@ -31783,7 +32004,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_TouchedSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_TouchSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_TouchSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor::TouchDataSignalType *result = 0 ;
@@ -31811,7 +32032,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_TouchSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_HoveredSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_HoveredSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor::HoverSignalType *result = 0 ;
@@ -31839,7 +32060,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_HoveredSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_WheelEventSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_WheelEventSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor::WheelEventSignalType *result = 0 ;
@@ -31867,7 +32088,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_WheelEventSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_OnStageSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_OnStageSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor::OnStageSignalType *result = 0 ;
@@ -31895,7 +32116,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_OnStageSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_OffStageSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_OffStageSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor::OffStageSignalType *result = 0 ;
@@ -31923,7 +32144,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_OffStageSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_OnRelayoutSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_OnRelayoutSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
   Dali::Actor::OnRelayoutSignalType *result = 0 ;
@@ -31951,7 +32172,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Actor_OnRelayoutSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_UnparentAndReset(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_UnparentAndReset(void * jarg1) {
   Dali::Actor *arg1 = 0 ;
   
   arg1 = (Dali::Actor *)jarg1;
@@ -31979,7 +32200,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_UnparentAndReset(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Layer_Property_CLIPPING_ENABLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_CLIPPING_ENABLE_get() {
   int jresult ;
   int result;
   
@@ -31989,7 +32210,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Layer_Property_CLIPPING_ENABLE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Layer_Property_CLIPPING_BOX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_CLIPPING_BOX_get() {
   int jresult ;
   int result;
   
@@ -31999,7 +32220,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Layer_Property_CLIPPING_BOX_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Layer_Property_BEHAVIOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_BEHAVIOR_get() {
   int jresult ;
   int result;
   
@@ -32009,7 +32230,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Layer_Property_BEHAVIOR_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Layer_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Layer_Property() {
   void * jresult ;
   Dali::Layer::Property *result = 0 ;
   
@@ -32035,7 +32256,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Layer_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Layer_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Layer_Property(void * jarg1) {
   Dali::Layer::Property *arg1 = (Dali::Layer::Property *) 0 ;
   
   arg1 = (Dali::Layer::Property *)jarg1; 
@@ -32059,7 +32280,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Layer_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Layer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Layer__SWIG_0() {
   void * jresult ;
   Dali::Layer *result = 0 ;
   
@@ -32085,7 +32306,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Layer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Layer_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Layer_New() {
   void * jresult ;
   Dali::Layer result;
   
@@ -32111,7 +32332,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Layer_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Layer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Layer_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -32145,7 +32366,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Layer_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Layer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Layer(void * jarg1) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   
   arg1 = (Dali::Layer *)jarg1; 
@@ -32169,7 +32390,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Layer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Layer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Layer__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Layer *arg1 = 0 ;
   Dali::Layer *result = 0 ;
@@ -32201,7 +32422,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Layer__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Layer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Layer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::Layer *arg2 = 0 ;
@@ -32235,7 +32456,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Layer_Assign(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_GetDepth(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Layer_GetDepth(void * jarg1) {
   unsigned int jresult ;
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   unsigned int result;
@@ -32263,7 +32484,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_GetDepth(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_Raise(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_Raise(void * jarg1) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   
   arg1 = (Dali::Layer *)jarg1; 
@@ -32287,7 +32508,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_Raise(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_Lower(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_Lower(void * jarg1) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   
   arg1 = (Dali::Layer *)jarg1; 
@@ -32311,7 +32532,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_Lower(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_RaiseAbove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_RaiseAbove(void * jarg1, void * jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::Layer arg2 ;
   Dali::Layer *argp2 ;
@@ -32343,7 +32564,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_RaiseAbove(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_LowerBelow(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_LowerBelow(void * jarg1, void * jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::Layer arg2 ;
   Dali::Layer *argp2 ;
@@ -32375,7 +32596,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_LowerBelow(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_RaiseToTop(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_RaiseToTop(void * jarg1) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   
   arg1 = (Dali::Layer *)jarg1; 
@@ -32399,7 +32620,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_RaiseToTop(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_LowerToBottom(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_LowerToBottom(void * jarg1) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   
   arg1 = (Dali::Layer *)jarg1; 
@@ -32423,7 +32644,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_LowerToBottom(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_MoveAbove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_MoveAbove(void * jarg1, void * jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::Layer arg2 ;
   Dali::Layer *argp2 ;
@@ -32455,7 +32676,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_MoveAbove(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_MoveBelow(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_MoveBelow(void * jarg1, void * jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::Layer arg2 ;
   Dali::Layer *argp2 ;
@@ -32487,7 +32708,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_MoveBelow(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetBehavior(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetBehavior(void * jarg1, int jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::Layer::Behavior arg2 ;
   
@@ -32513,7 +32734,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetBehavior(void * jarg1, int jarg2
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Layer_GetBehavior(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_GetBehavior(void * jarg1) {
   int jresult ;
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::Layer::Behavior result;
@@ -32541,7 +32762,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Layer_GetBehavior(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetClipping(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetClipping(void * jarg1, unsigned int jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   bool arg2 ;
   
@@ -32567,7 +32788,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetClipping(void * jarg1, unsigned
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_IsClipping(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Layer_IsClipping(void * jarg1) {
   unsigned int jresult ;
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   bool result;
@@ -32595,7 +32816,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_IsClipping(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetClippingBox__SWIG_0(void * jarg1, int jarg2, int jarg3, int jarg4, int jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetClippingBox__SWIG_0(void * jarg1, int jarg2, int jarg3, int jarg4, int jarg5) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -32627,7 +32848,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetClippingBox__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetClippingBox__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetClippingBox__SWIG_1(void * jarg1, void * jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::ClippingBox arg2 ;
   Dali::ClippingBox *argp2 ;
@@ -32659,7 +32880,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetClippingBox__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Layer_GetClippingBox(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Layer_GetClippingBox(void * jarg1) {
   void * jresult ;
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::ClippingBox result;
@@ -32687,7 +32908,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Layer_GetClippingBox(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetDepthTestDisabled(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetDepthTestDisabled(void * jarg1, unsigned int jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   bool arg2 ;
   
@@ -32713,7 +32934,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetDepthTestDisabled(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_IsDepthTestDisabled(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Layer_IsDepthTestDisabled(void * jarg1) {
   unsigned int jresult ;
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   bool result;
@@ -32741,7 +32962,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_IsDepthTestDisabled(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetSortFunction(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetSortFunction(void * jarg1, void * jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   Dali::Layer::SortFunctionType arg2 = (Dali::Layer::SortFunctionType) 0 ;
   
@@ -32767,7 +32988,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetSortFunction(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetTouchConsumed(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetTouchConsumed(void * jarg1, unsigned int jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   bool arg2 ;
   
@@ -32793,7 +33014,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetTouchConsumed(void * jarg1, unsi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_IsTouchConsumed(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Layer_IsTouchConsumed(void * jarg1) {
   unsigned int jresult ;
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   bool result;
@@ -32821,7 +33042,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_IsTouchConsumed(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetHoverConsumed(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Layer_SetHoverConsumed(void * jarg1, unsigned int jarg2) {
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   bool arg2 ;
   
@@ -32847,7 +33068,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Layer_SetHoverConsumed(void * jarg1, unsi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_IsHoverConsumed(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Layer_IsHoverConsumed(void * jarg1) {
   unsigned int jresult ;
   Dali::Layer *arg1 = (Dali::Layer *) 0 ;
   bool result;
@@ -32875,7 +33096,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Layer_IsHoverConsumed(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_DEFAULT_BACKGROUND_COLOR_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_DEFAULT_BACKGROUND_COLOR_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -32885,7 +33106,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_DEFAULT_BACKGROUND_COLOR_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_DEBUG_BACKGROUND_COLOR_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_DEBUG_BACKGROUND_COLOR_get() {
   void * jresult ;
   Dali::Vector4 *result = 0 ;
   
@@ -32895,7 +33116,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_DEBUG_BACKGROUND_COLOR_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Stage__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Stage__SWIG_0() {
   void * jresult ;
   Dali::Stage *result = 0 ;
   
@@ -32921,7 +33142,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Stage__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetCurrent() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetCurrent() {
   void * jresult ;
   Dali::Stage result;
   
@@ -32947,7 +33168,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetCurrent() {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Stage_IsInstalled() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Stage_IsInstalled() {
   unsigned int jresult ;
   bool result;
   
@@ -32973,7 +33194,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Stage_IsInstalled() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Stage(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Stage(void * jarg1) {
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   
   arg1 = (Dali::Stage *)jarg1; 
@@ -32997,7 +33218,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Stage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Stage__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Stage__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = 0 ;
   Dali::Stage *result = 0 ;
@@ -33029,7 +33250,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Stage__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Stage *arg2 = 0 ;
@@ -33063,7 +33284,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_Assign(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Stage_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Stage_Add(void * jarg1, void * jarg2) {
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -33093,7 +33314,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Stage_Add(void * jarg1, void * jarg2) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Stage_Remove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Stage_Remove(void * jarg1, void * jarg2) {
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -33123,7 +33344,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Stage_Remove(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetSize(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Vector2 result;
@@ -33151,7 +33372,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetSize(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetRenderTaskList(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetRenderTaskList(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::RenderTaskList result;
@@ -33179,7 +33400,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetRenderTaskList(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Stage_GetLayerCount(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Stage_GetLayerCount(void * jarg1) {
   unsigned int jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   unsigned int result;
@@ -33207,7 +33428,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Stage_GetLayerCount(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetLayer(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetLayer(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   unsigned int arg2 ;
@@ -33237,7 +33458,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetLayer(void * jarg1, unsigned i
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetRootLayer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetRootLayer(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Layer result;
@@ -33265,7 +33486,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetRootLayer(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Stage_SetBackgroundColor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Stage_SetBackgroundColor(void * jarg1, void * jarg2) {
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Vector4 arg2 ;
   Dali::Vector4 *argp2 ;
@@ -33297,7 +33518,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Stage_SetBackgroundColor(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetBackgroundColor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetBackgroundColor(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Vector4 result;
@@ -33325,7 +33546,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetBackgroundColor(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetDpi(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetDpi(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Vector2 result;
@@ -33353,7 +33574,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetDpi(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetObjectRegistry(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_GetObjectRegistry(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::ObjectRegistry result;
@@ -33381,7 +33602,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_GetObjectRegistry(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Stage_KeepRendering(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Stage_KeepRendering(void * jarg1, float jarg2) {
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   float arg2 ;
   
@@ -33407,7 +33628,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Stage_KeepRendering(void * jarg1, float j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_KeyEventSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_KeyEventSignal(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Stage::KeyEventSignalType *result = 0 ;
@@ -33435,7 +33656,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_KeyEventSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_EventProcessingFinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_EventProcessingFinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Stage::EventProcessingFinishedSignalType *result = 0 ;
@@ -33463,35 +33684,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_EventProcessingFinishedSignal(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_TouchedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Stage *arg1 = (Dali::Stage *) 0 ;
-  Dali::Stage::TouchedSignalType *result = 0 ;
-  
-  arg1 = (Dali::Stage *)jarg1; 
-  {
-    try {
-      result = (Dali::Stage::TouchedSignalType *) &(arg1)->TouchedSignal();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_TouchSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_TouchSignal(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Stage::TouchSignalType *result = 0 ;
@@ -33519,7 +33712,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_TouchSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_WheelEventSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_WheelEventSignal(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Stage::WheelEventSignalType *result = 0 ;
@@ -33547,7 +33740,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_WheelEventSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_ContextLostSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_ContextLostSignal(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Stage::ContextStatusSignal *result = 0 ;
@@ -33575,7 +33768,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_ContextLostSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_ContextRegainedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_ContextRegainedSignal(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Stage::ContextStatusSignal *result = 0 ;
@@ -33603,7 +33796,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_ContextRegainedSignal(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_SceneCreatedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Stage_SceneCreatedSignal(void * jarg1) {
   void * jresult ;
   Dali::Stage *arg1 = (Dali::Stage *) 0 ;
   Dali::Stage::SceneCreatedSignalType *result = 0 ;
@@ -33631,7 +33824,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Stage_SceneCreatedSignal(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RelayoutContainer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RelayoutContainer(void * jarg1) {
   Dali::RelayoutContainer *arg1 = (Dali::RelayoutContainer *) 0 ;
   
   arg1 = (Dali::RelayoutContainer *)jarg1; 
@@ -33655,7 +33848,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RelayoutContainer(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RelayoutContainer_Add(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RelayoutContainer_Add(void * jarg1, void * jarg2, void * jarg3) {
   Dali::RelayoutContainer *arg1 = (Dali::RelayoutContainer *) 0 ;
   Dali::Actor *arg2 = 0 ;
   Dali::Vector2 *arg3 = 0 ;
@@ -33691,7 +33884,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RelayoutContainer_Add(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActorImpl_Self(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActorImpl_Self(void * jarg1) {
   void * jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::CustomActor result;
@@ -33719,7 +33912,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActorImpl_Self(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnStageConnection(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnStageConnection(void * jarg1, int jarg2) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   int arg2 ;
   
@@ -33745,7 +33938,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnStageConnection(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnStageDisconnection(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnStageDisconnection(void * jarg1) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   
   arg1 = (Dali::CustomActorImpl *)jarg1; 
@@ -33769,7 +33962,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnStageDisconnection(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnChildAdd(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnChildAdd(void * jarg1, void * jarg2) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -33799,7 +33992,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnChildAdd(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnChildRemove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnChildRemove(void * jarg1, void * jarg2) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -33829,7 +34022,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnChildRemove(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnPropertySet(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnPropertySet(void * jarg1, int jarg2, void * jarg3) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Property::Index arg2 ;
   Dali::Property::Value arg3 ;
@@ -33863,7 +34056,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnPropertySet(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnSizeSet(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSizeSet(void * jarg1, void * jarg2) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -33893,7 +34086,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnSizeSet(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnSizeAnimation(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSizeAnimation(void * jarg1, void * jarg2, void * jarg3) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Animation *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -33929,7 +34122,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnSizeAnimation(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnTouchEvent(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnTouchEvent(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::TouchEvent *arg2 = 0 ;
@@ -33963,7 +34156,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnTouchEvent(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnHoverEvent(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnHoverEvent(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::HoverEvent *arg2 = 0 ;
@@ -33997,7 +34190,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnHoverEvent(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnKeyEvent(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnKeyEvent(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::KeyEvent *arg2 = 0 ;
@@ -34031,7 +34224,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnKeyEvent(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnWheelEvent(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnWheelEvent(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::WheelEvent *arg2 = 0 ;
@@ -34065,7 +34258,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnWheelEvent(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnRelayout(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnRelayout(void * jarg1, void * jarg2, void * jarg3) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   Dali::RelayoutContainer *arg3 = 0 ;
@@ -34101,7 +34294,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnRelayout(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnSetResizePolicy(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSetResizePolicy(void * jarg1, int jarg2, int jarg3) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::ResizePolicy::Type arg2 ;
   Dali::Dimension::Type arg3 ;
@@ -34129,7 +34322,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnSetResizePolicy(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActorImpl_GetNaturalSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetNaturalSize(void * jarg1) {
   void * jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Vector3 result;
@@ -34157,7 +34350,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActorImpl_GetNaturalSize(void * j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CustomActorImpl_CalculateChildSize(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_CalculateChildSize(void * jarg1, void * jarg2, int jarg3) {
   float jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Actor *arg2 = 0 ;
@@ -34193,7 +34386,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CustomActorImpl_CalculateChildSize(void
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CustomActorImpl_GetHeightForWidth(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetHeightForWidth(void * jarg1, float jarg2) {
   float jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   float arg2 ;
@@ -34223,7 +34416,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CustomActorImpl_GetHeightForWidth(void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CustomActorImpl_GetWidthForHeight(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CustomActorImpl_GetWidthForHeight(void * jarg1, float jarg2) {
   float jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   float arg2 ;
@@ -34253,7 +34446,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CustomActorImpl_GetWidthForHeight(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RelayoutDependentOnChildren__SWIG_0(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_RelayoutDependentOnChildren__SWIG_0(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Dimension::Type arg2 ;
@@ -34283,7 +34476,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RelayoutDependent
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RelayoutDependentOnChildren__SWIG_1(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_RelayoutDependentOnChildren__SWIG_1(void * jarg1) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   bool result;
@@ -34311,7 +34504,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RelayoutDependent
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnCalculateRelayoutSize(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnCalculateRelayoutSize(void * jarg1, int jarg2) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   Dali::Dimension::Type arg2 ;
   
@@ -34337,7 +34530,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnCalculateRelayoutSize(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnLayoutNegotiated(void * jarg1, float jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnLayoutNegotiated(void * jarg1, float jarg2, int jarg3) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   float arg2 ;
   Dali::Dimension::Type arg3 ;
@@ -34365,7 +34558,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CustomActorImpl_OnLayoutNegotiated(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RequiresTouchEvents(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_RequiresTouchEvents(void * jarg1) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   bool result;
@@ -34393,7 +34586,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RequiresTouchEven
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RequiresHoverEvents(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_RequiresHoverEvents(void * jarg1) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   bool result;
@@ -34421,7 +34614,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RequiresHoverEven
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RequiresWheelEvents(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_RequiresWheelEvents(void * jarg1) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   bool result;
@@ -34449,7 +34642,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_RequiresWheelEven
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_IsRelayoutEnabled(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CustomActorImpl_IsRelayoutEnabled(void * jarg1) {
   unsigned int jresult ;
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   bool result;
@@ -34477,7 +34670,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CustomActorImpl_IsRelayoutEnabled
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CustomActor__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_0() {
   void * jresult ;
   Dali::CustomActor *result = 0 ;
   
@@ -34503,7 +34696,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CustomActor__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActor_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActor_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -34537,7 +34730,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActor_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_CustomActor(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CustomActor(void * jarg1) {
   Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
   
   arg1 = (Dali::CustomActor *)jarg1; 
@@ -34561,7 +34754,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_CustomActor(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActor_GetImplementation(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActor_GetImplementation(void * jarg1) {
   void * jresult ;
   Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
   Dali::CustomActorImpl *result = 0 ;
@@ -34589,7 +34782,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActor_GetImplementation(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CustomActor__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::CustomActorImpl *arg1 = 0 ;
   Dali::CustomActor *result = 0 ;
@@ -34621,7 +34814,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CustomActor__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CustomActor__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CustomActor__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::CustomActor *arg1 = 0 ;
   Dali::CustomActor *result = 0 ;
@@ -34653,7 +34846,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CustomActor__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActor_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActor_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::CustomActor *arg1 = (Dali::CustomActor *) 0 ;
   Dali::CustomActor *arg2 = 0 ;
@@ -34687,7 +34880,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CustomActor_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_SCREEN_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_POSITION_get() {
   int jresult ;
   int result;
   
@@ -34697,7 +34890,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_SCREEN_POSITIO
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_SCREEN_DISPLACEMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_DISPLACEMENT_get() {
   int jresult ;
   int result;
   
@@ -34707,7 +34900,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_SCREEN_DISPLAC
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_SCREEN_VELOCITY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_SCREEN_VELOCITY_get() {
   int jresult ;
   int result;
   
@@ -34717,7 +34910,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_SCREEN_VELOCIT
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_LOCAL_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_POSITION_get() {
   int jresult ;
   int result;
   
@@ -34727,7 +34920,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_LOCAL_POSITION
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_LOCAL_DISPLACEMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_DISPLACEMENT_get() {
   int jresult ;
   int result;
   
@@ -34737,7 +34930,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_LOCAL_DISPLACE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_LOCAL_VELOCITY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_LOCAL_VELOCITY_get() {
   int jresult ;
   int result;
   
@@ -34747,7 +34940,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_LOCAL_VELOCITY
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_PANNING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PanGestureDetector_Property_PANNING_get() {
   int jresult ;
   int result;
   
@@ -34757,7 +34950,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PanGestureDetector_Property_PANNING_get()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGestureDetector_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetector_Property() {
   void * jresult ;
   Dali::PanGestureDetector::Property *result = 0 ;
   
@@ -34783,7 +34976,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGestureDetector_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PanGestureDetector_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetector_Property(void * jarg1) {
   Dali::PanGestureDetector::Property *arg1 = (Dali::PanGestureDetector::Property *) 0 ;
   
   arg1 = (Dali::PanGestureDetector::Property *)jarg1; 
@@ -34807,7 +35000,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PanGestureDetector_Property(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_LEFT_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_LEFT_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -34817,7 +35010,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_LEFT_get()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_RIGHT_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_RIGHT_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -34827,7 +35020,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_RIGHT_get(
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_UP_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_UP_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -34837,7 +35030,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_UP_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_DOWN_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_DOWN_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -34847,7 +35040,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_DOWN_get()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_HORIZONTAL_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_HORIZONTAL_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -34857,7 +35050,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_HORIZONTAL
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_VERTICAL_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DIRECTION_VERTICAL_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -34867,7 +35060,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DIRECTION_VERTICAL_g
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DEFAULT_THRESHOLD_get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DEFAULT_THRESHOLD_get() {
   void * jresult ;
   Dali::Radian *result = 0 ;
   
@@ -34877,7 +35070,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DEFAULT_THRESHOLD_ge
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGestureDetector__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetector__SWIG_0() {
   void * jresult ;
   Dali::PanGestureDetector *result = 0 ;
   
@@ -34903,7 +35096,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGestureDetector__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_New() {
   void * jresult ;
   Dali::PanGestureDetector result;
   
@@ -34929,7 +35122,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -34963,7 +35156,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DownCast(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PanGestureDetector(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetector(void * jarg1) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   
   arg1 = (Dali::PanGestureDetector *)jarg1; 
@@ -34987,7 +35180,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PanGestureDetector(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGestureDetector__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::PanGestureDetector *arg1 = 0 ;
   Dali::PanGestureDetector *result = 0 ;
@@ -35019,7 +35212,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGestureDetector__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   Dali::PanGestureDetector *arg2 = 0 ;
@@ -35053,7 +35246,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_Assign(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_SetMinimumTouchesRequired(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetMinimumTouchesRequired(void * jarg1, unsigned int jarg2) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   unsigned int arg2 ;
   
@@ -35079,7 +35272,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_SetMinimumTouchesRequi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_SetMaximumTouchesRequired(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetMaximumTouchesRequired(void * jarg1, unsigned int jarg2) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   unsigned int arg2 ;
   
@@ -35105,7 +35298,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_SetMaximumTouchesRequi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PanGestureDetector_GetMinimumTouchesRequired(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetMinimumTouchesRequired(void * jarg1) {
   unsigned int jresult ;
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   unsigned int result;
@@ -35133,7 +35326,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PanGestureDetector_GetMinimumTouc
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PanGestureDetector_GetMaximumTouchesRequired(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetMaximumTouchesRequired(void * jarg1) {
   unsigned int jresult ;
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   unsigned int result;
@@ -35161,7 +35354,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PanGestureDetector_GetMaximumTouc
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_AddAngle__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddAngle__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian arg3 ;
@@ -35201,7 +35394,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_AddAngle__SWIG_0(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_AddAngle__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddAngle__SWIG_1(void * jarg1, void * jarg2) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian *argp2 ;
@@ -35233,7 +35426,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_AddAngle__SWIG_1(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_AddDirection__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddDirection__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian arg3 ;
@@ -35273,7 +35466,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_AddDirection__SWIG_0(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_AddDirection__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_AddDirection__SWIG_1(void * jarg1, void * jarg2) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian *argp2 ;
@@ -35305,7 +35498,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_AddDirection__SWIG_1(v
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PanGestureDetector_GetAngleCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetAngleCount(void * jarg1) {
   unsigned long jresult ;
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   size_t result;
@@ -35333,7 +35526,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PanGestureDetector_GetAngleCount
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_GetAngle(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_GetAngle(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   size_t arg2 ;
@@ -35363,7 +35556,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_GetAngle(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_ClearAngles(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_ClearAngles(void * jarg1) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   
   arg1 = (Dali::PanGestureDetector *)jarg1; 
@@ -35387,7 +35580,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_ClearAngles(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_RemoveAngle(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_RemoveAngle(void * jarg1, void * jarg2) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian *argp2 ;
@@ -35419,7 +35612,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_RemoveAngle(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_RemoveDirection(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_RemoveDirection(void * jarg1, void * jarg2) {
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian *argp2 ;
@@ -35451,7 +35644,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_RemoveDirection(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DetectedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGestureDetector_DetectedSignal(void * jarg1) {
   void * jresult ;
   Dali::PanGestureDetector *arg1 = (Dali::PanGestureDetector *) 0 ;
   Dali::PanGestureDetector::DetectedSignalType *result = 0 ;
@@ -35479,7 +35672,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGestureDetector_DetectedSignal(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_SetPanGestureProperties(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetector_SetPanGestureProperties(void * jarg1) {
   Dali::PanGesture *arg1 = 0 ;
   
   arg1 = (Dali::PanGesture *)jarg1;
@@ -35507,7 +35700,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetector_SetPanGesturePropertie
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGesture__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGesture__SWIG_0() {
   void * jresult ;
   Dali::PanGesture *result = 0 ;
   
@@ -35533,7 +35726,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGesture__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGesture__SWIG_1(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGesture__SWIG_1(int jarg1) {
   void * jresult ;
   Dali::Gesture::State arg1 ;
   Dali::PanGesture *result = 0 ;
@@ -35561,7 +35754,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGesture__SWIG_1(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGesture__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGesture__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::PanGesture *arg1 = 0 ;
   Dali::PanGesture *result = 0 ;
@@ -35593,7 +35786,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGesture__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::PanGesture *arg2 = 0 ;
@@ -35627,7 +35820,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PanGesture(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGesture(void * jarg1) {
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   
   arg1 = (Dali::PanGesture *)jarg1; 
@@ -35651,7 +35844,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PanGesture(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_velocity_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGesture_velocity_set(void * jarg1, void * jarg2) {
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -35661,7 +35854,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_velocity_set(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_velocity_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_velocity_get(void * jarg1) {
   void * jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -35673,7 +35866,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_velocity_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_displacement_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGesture_displacement_set(void * jarg1, void * jarg2) {
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -35683,7 +35876,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_displacement_set(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_displacement_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_displacement_get(void * jarg1) {
   void * jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -35695,7 +35888,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_displacement_get(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_position_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGesture_position_set(void * jarg1, void * jarg2) {
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -35705,7 +35898,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_position_set(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_position_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_position_get(void * jarg1) {
   void * jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -35717,7 +35910,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_position_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_screenVelocity_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGesture_screenVelocity_set(void * jarg1, void * jarg2) {
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -35727,7 +35920,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_screenVelocity_set(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_screenVelocity_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenVelocity_get(void * jarg1) {
   void * jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -35739,7 +35932,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_screenVelocity_get(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_screenDisplacement_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGesture_screenDisplacement_set(void * jarg1, void * jarg2) {
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -35749,7 +35942,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_screenDisplacement_set(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_screenDisplacement_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenDisplacement_get(void * jarg1) {
   void * jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -35761,7 +35954,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_screenDisplacement_get(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_screenPosition_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGesture_screenPosition_set(void * jarg1, void * jarg2) {
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -35771,7 +35964,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_screenPosition_set(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_screenPosition_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_screenPosition_get(void * jarg1) {
   void * jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -35783,7 +35976,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PanGesture_screenPosition_get(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_numberOfTouches_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGesture_numberOfTouches_set(void * jarg1, unsigned int jarg2) {
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   unsigned int arg2 ;
   
@@ -35793,7 +35986,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGesture_numberOfTouches_set(void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PanGesture_numberOfTouches_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGesture_numberOfTouches_get(void * jarg1) {
   unsigned int jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   unsigned int result;
@@ -35805,7 +35998,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PanGesture_numberOfTouches_get(vo
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PanGesture_GetSpeed(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetSpeed(void * jarg1) {
   float jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   float result;
@@ -35833,7 +36026,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PanGesture_GetSpeed(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PanGesture_GetDistance(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetDistance(void * jarg1) {
   float jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   float result;
@@ -35861,7 +36054,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PanGesture_GetDistance(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PanGesture_GetScreenSpeed(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetScreenSpeed(void * jarg1) {
   float jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   float result;
@@ -35889,7 +36082,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PanGesture_GetScreenSpeed(void * jarg1)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PanGesture_GetScreenDistance(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PanGesture_GetScreenDistance(void * jarg1) {
   float jresult ;
   Dali::PanGesture *arg1 = (Dali::PanGesture *) 0 ;
   float result;
@@ -35917,7 +36110,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PanGesture_GetScreenDistance(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGestureDetector__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetector__SWIG_0() {
   void * jresult ;
   Dali::PinchGestureDetector *result = 0 ;
   
@@ -35943,7 +36136,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGestureDetector__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_New() {
   void * jresult ;
   Dali::PinchGestureDetector result;
   
@@ -35969,7 +36162,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -36003,7 +36196,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_DownCast(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PinchGestureDetector(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGestureDetector(void * jarg1) {
   Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
   
   arg1 = (Dali::PinchGestureDetector *)jarg1; 
@@ -36027,7 +36220,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PinchGestureDetector(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGestureDetector__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::PinchGestureDetector *arg1 = 0 ;
   Dali::PinchGestureDetector *result = 0 ;
@@ -36059,7 +36252,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGestureDetector__SWIG_1(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
   Dali::PinchGestureDetector *arg2 = 0 ;
@@ -36093,7 +36286,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_Assign(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_DetectedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_DetectedSignal(void * jarg1) {
   void * jresult ;
   Dali::PinchGestureDetector *arg1 = (Dali::PinchGestureDetector *) 0 ;
   Dali::PinchGestureDetector::DetectedSignalType *result = 0 ;
@@ -36121,7 +36314,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_DetectedSignal(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGesture__SWIG_0(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGesture__SWIG_0(int jarg1) {
   void * jresult ;
   Dali::Gesture::State arg1 ;
   Dali::PinchGesture *result = 0 ;
@@ -36149,7 +36342,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGesture__SWIG_0(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGesture__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGesture__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::PinchGesture *arg1 = 0 ;
   Dali::PinchGesture *result = 0 ;
@@ -36181,7 +36374,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGesture__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGesture_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   Dali::PinchGesture *arg2 = 0 ;
@@ -36215,7 +36408,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGesture_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PinchGesture(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGesture(void * jarg1) {
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   
   arg1 = (Dali::PinchGesture *)jarg1; 
@@ -36239,7 +36432,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PinchGesture(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGesture_scale_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGesture_scale_set(void * jarg1, float jarg2) {
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   float arg2 ;
   
@@ -36249,7 +36442,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGesture_scale_set(void * jarg1, floa
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PinchGesture_scale_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PinchGesture_scale_get(void * jarg1) {
   float jresult ;
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   float result;
@@ -36261,7 +36454,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PinchGesture_scale_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGesture_speed_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGesture_speed_set(void * jarg1, float jarg2) {
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   float arg2 ;
   
@@ -36271,7 +36464,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGesture_speed_set(void * jarg1, floa
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PinchGesture_speed_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PinchGesture_speed_get(void * jarg1) {
   float jresult ;
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   float result;
@@ -36283,7 +36476,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_PinchGesture_speed_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGesture_screenCenterPoint_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGesture_screenCenterPoint_set(void * jarg1, void * jarg2) {
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -36293,7 +36486,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGesture_screenCenterPoint_set(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGesture_screenCenterPoint_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_screenCenterPoint_get(void * jarg1) {
   void * jresult ;
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -36305,7 +36498,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGesture_screenCenterPoint_get(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGesture_localCenterPoint_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGesture_localCenterPoint_set(void * jarg1, void * jarg2) {
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -36315,7 +36508,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGesture_localCenterPoint_set(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGesture_localCenterPoint_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_localCenterPoint_get(void * jarg1) {
   void * jresult ;
   Dali::PinchGesture *arg1 = (Dali::PinchGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -36327,7 +36520,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PinchGesture_localCenterPoint_get(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGestureDetector__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetector__SWIG_0() {
   void * jresult ;
   Dali::TapGestureDetector *result = 0 ;
   
@@ -36353,7 +36546,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGestureDetector__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_New__SWIG_0() {
   void * jresult ;
   Dali::TapGestureDetector result;
   
@@ -36379,7 +36572,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_New__SWIG_1(unsigned int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_New__SWIG_1(unsigned int jarg1) {
   void * jresult ;
   unsigned int arg1 ;
   Dali::TapGestureDetector result;
@@ -36407,7 +36600,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_New__SWIG_1(unsigned
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -36441,7 +36634,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_DownCast(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TapGestureDetector(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGestureDetector(void * jarg1) {
   Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
   
   arg1 = (Dali::TapGestureDetector *)jarg1; 
@@ -36465,7 +36658,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TapGestureDetector(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGestureDetector__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetector__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::TapGestureDetector *arg1 = 0 ;
   Dali::TapGestureDetector *result = 0 ;
@@ -36497,7 +36690,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGestureDetector__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
   Dali::TapGestureDetector *arg2 = 0 ;
@@ -36531,7 +36724,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_Assign(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetector_SetMinimumTapsRequired(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetector_SetMinimumTapsRequired(void * jarg1, unsigned int jarg2) {
   Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
   unsigned int arg2 ;
   
@@ -36557,7 +36750,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetector_SetMinimumTapsRequired
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetector_SetMaximumTapsRequired(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetector_SetMaximumTapsRequired(void * jarg1, unsigned int jarg2) {
   Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
   unsigned int arg2 ;
   
@@ -36583,7 +36776,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetector_SetMaximumTapsRequired
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGestureDetector_GetMinimumTapsRequired(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGestureDetector_GetMinimumTapsRequired(void * jarg1) {
   unsigned int jresult ;
   Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
   unsigned int result;
@@ -36611,7 +36804,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGestureDetector_GetMinimumTaps
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGestureDetector_GetMaximumTapsRequired(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGestureDetector_GetMaximumTapsRequired(void * jarg1) {
   unsigned int jresult ;
   Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
   unsigned int result;
@@ -36639,7 +36832,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGestureDetector_GetMaximumTaps
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_DetectedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGestureDetector_DetectedSignal(void * jarg1) {
   void * jresult ;
   Dali::TapGestureDetector *arg1 = (Dali::TapGestureDetector *) 0 ;
   Dali::TapGestureDetector::DetectedSignalType *result = 0 ;
@@ -36667,7 +36860,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGestureDetector_DetectedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGesture__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGesture__SWIG_0() {
   void * jresult ;
   Dali::TapGesture *result = 0 ;
   
@@ -36693,7 +36886,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGesture__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGesture__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGesture__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::TapGesture *arg1 = 0 ;
   Dali::TapGesture *result = 0 ;
@@ -36725,7 +36918,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGesture__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGesture_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   Dali::TapGesture *arg2 = 0 ;
@@ -36759,7 +36952,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGesture_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TapGesture(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGesture(void * jarg1) {
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   
   arg1 = (Dali::TapGesture *)jarg1; 
@@ -36783,7 +36976,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TapGesture(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGesture_numberOfTaps_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGesture_numberOfTaps_set(void * jarg1, unsigned int jarg2) {
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   unsigned int arg2 ;
   
@@ -36793,7 +36986,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGesture_numberOfTaps_set(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGesture_numberOfTaps_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGesture_numberOfTaps_get(void * jarg1) {
   unsigned int jresult ;
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   unsigned int result;
@@ -36805,7 +36998,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGesture_numberOfTaps_get(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGesture_numberOfTouches_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGesture_numberOfTouches_set(void * jarg1, unsigned int jarg2) {
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   unsigned int arg2 ;
   
@@ -36815,7 +37008,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGesture_numberOfTouches_set(void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGesture_numberOfTouches_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGesture_numberOfTouches_get(void * jarg1) {
   unsigned int jresult ;
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   unsigned int result;
@@ -36827,7 +37020,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGesture_numberOfTouches_get(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGesture_screenPoint_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGesture_screenPoint_set(void * jarg1, void * jarg2) {
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -36837,7 +37030,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGesture_screenPoint_set(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGesture_screenPoint_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_screenPoint_get(void * jarg1) {
   void * jresult ;
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -36849,7 +37042,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGesture_screenPoint_get(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGesture_localPoint_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGesture_localPoint_set(void * jarg1, void * jarg2) {
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -36859,7 +37052,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGesture_localPoint_set(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGesture_localPoint_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_localPoint_get(void * jarg1) {
   void * jresult ;
   Dali::TapGesture *arg1 = (Dali::TapGesture *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -36871,187 +37064,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TapGesture_localPoint_get(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchEvent__SWIG_0() {
-  void * jresult ;
-  Dali::TouchEvent *result = 0 ;
-  
-  {
-    try {
-      result = (Dali::TouchEvent *)new Dali::TouchEvent();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchEvent__SWIG_1(unsigned long jarg1) {
-  void * jresult ;
-  unsigned long arg1 ;
-  Dali::TouchEvent *result = 0 ;
-  
-  arg1 = (unsigned long)jarg1; 
-  {
-    try {
-      result = (Dali::TouchEvent *)new Dali::TouchEvent(arg1);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchEvent(void * jarg1) {
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  
-  arg1 = (Dali::TouchEvent *)jarg1; 
-  {
-    try {
-      delete arg1;
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchEvent_points_set(void * jarg1, void * jarg2) {
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  Dali::TouchPointContainer *arg2 = (Dali::TouchPointContainer *) 0 ;
-  
-  arg1 = (Dali::TouchEvent *)jarg1; 
-  arg2 = (Dali::TouchPointContainer *)jarg2; 
-  if (arg1) (arg1)->points = *arg2;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchEvent_points_get(void * jarg1) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  Dali::TouchPointContainer *result = 0 ;
-  
-  arg1 = (Dali::TouchEvent *)jarg1; 
-  result = (Dali::TouchPointContainer *)& ((arg1)->points);
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchEvent_time_set(void * jarg1, unsigned long jarg2) {
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  unsigned long arg2 ;
-  
-  arg1 = (Dali::TouchEvent *)jarg1; 
-  arg2 = (unsigned long)jarg2; 
-  if (arg1) (arg1)->time = arg2;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchEvent_time_get(void * jarg1) {
-  unsigned long jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  unsigned long result;
-  
-  arg1 = (Dali::TouchEvent *)jarg1; 
-  result = (unsigned long) ((arg1)->time);
-  jresult = (unsigned long)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TouchEvent_GetPointCount(void * jarg1) {
-  unsigned int jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  unsigned int result;
-  
-  arg1 = (Dali::TouchEvent *)jarg1; 
-  {
-    try {
-      result = (unsigned int)((Dali::TouchEvent const *)arg1)->GetPointCount();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchEvent_GetPoint(void * jarg1, unsigned int jarg2) {
-  void * jresult ;
-  Dali::TouchEvent *arg1 = (Dali::TouchEvent *) 0 ;
-  unsigned int arg2 ;
-  Dali::TouchPoint *result = 0 ;
-  
-  arg1 = (Dali::TouchEvent *)jarg1; 
-  arg2 = (unsigned int)jarg2; 
-  {
-    try {
-      result = (Dali::TouchPoint *) &((Dali::TouchEvent const *)arg1)->GetPoint(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AlphaFunction__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_0() {
   void * jresult ;
   Dali::AlphaFunction *result = 0 ;
   
@@ -37077,7 +37090,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AlphaFunction__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AlphaFunction__SWIG_1(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_1(int jarg1) {
   void * jresult ;
   Dali::AlphaFunction::BuiltinFunction arg1 ;
   Dali::AlphaFunction *result = 0 ;
@@ -37105,7 +37118,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AlphaFunction__SWIG_1(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AlphaFunction__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::AlphaFunctionPrototype arg1 = (Dali::AlphaFunctionPrototype) 0 ;
   Dali::AlphaFunction *result = 0 ;
@@ -37133,7 +37146,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AlphaFunction__SWIG_2(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AlphaFunction__SWIG_3(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AlphaFunction__SWIG_3(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector2 *arg1 = 0 ;
   Dali::Vector2 *arg2 = 0 ;
@@ -37171,7 +37184,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AlphaFunction__SWIG_3(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AlphaFunction_GetBezierControlPoints(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AlphaFunction_GetBezierControlPoints(void * jarg1) {
   void * jresult ;
   Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
   Dali::Vector4 result;
@@ -37199,7 +37212,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AlphaFunction_GetBezierControlPoints(vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AlphaFunction_GetCustomFunction(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AlphaFunction_GetCustomFunction(void * jarg1) {
   void * jresult ;
   Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
   Dali::AlphaFunctionPrototype result;
@@ -37227,7 +37240,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AlphaFunction_GetCustomFunction(void *
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_AlphaFunction_GetBuiltinFunction(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_AlphaFunction_GetBuiltinFunction(void * jarg1) {
   int jresult ;
   Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
   Dali::AlphaFunction::BuiltinFunction result;
@@ -37255,7 +37268,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_AlphaFunction_GetBuiltinFunction(void * ja
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_AlphaFunction_GetMode(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_AlphaFunction_GetMode(void * jarg1) {
   int jresult ;
   Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
   Dali::AlphaFunction::Mode result;
@@ -37283,7 +37296,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_AlphaFunction_GetMode(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AlphaFunction(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AlphaFunction(void * jarg1) {
   Dali::AlphaFunction *arg1 = (Dali::AlphaFunction *) 0 ;
   
   arg1 = (Dali::AlphaFunction *)jarg1; 
@@ -37307,7 +37320,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AlphaFunction(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyFrames_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyFrames_New() {
   void * jresult ;
   Dali::KeyFrames result;
   
@@ -37333,7 +37346,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyFrames_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyFrames_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyFrames_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -37367,7 +37380,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyFrames_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyFrames__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyFrames__SWIG_0() {
   void * jresult ;
   Dali::KeyFrames *result = 0 ;
   
@@ -37393,7 +37406,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyFrames__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyFrames(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyFrames(void * jarg1) {
   Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
   
   arg1 = (Dali::KeyFrames *)jarg1; 
@@ -37417,7 +37430,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyFrames(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyFrames__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyFrames__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::KeyFrames *arg1 = 0 ;
   Dali::KeyFrames *result = 0 ;
@@ -37449,7 +37462,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyFrames__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyFrames_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyFrames_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
   Dali::KeyFrames *arg2 = 0 ;
@@ -37483,7 +37496,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyFrames_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_KeyFrames_GetType(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_KeyFrames_GetType(void * jarg1) {
   int jresult ;
   Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
   Dali::Property::Type result;
@@ -37511,7 +37524,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_KeyFrames_GetType(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyFrames_Add__SWIG_0(void * jarg1, float jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_Add__SWIG_0(void * jarg1, float jarg2, void * jarg3) {
   Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
   float arg2 ;
   Dali::Property::Value arg3 ;
@@ -37545,7 +37558,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyFrames_Add__SWIG_0(void * jarg1, float
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyFrames_Add__SWIG_1(void * jarg1, float jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyFrames_Add__SWIG_1(void * jarg1, float jarg2, void * jarg3, void * jarg4) {
   Dali::KeyFrames *arg1 = (Dali::KeyFrames *) 0 ;
   float arg2 ;
   Dali::Property::Value arg3 ;
@@ -37587,7 +37600,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyFrames_Add__SWIG_1(void * jarg1, float
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Path_Property_POINTS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Path_Property_POINTS_get() {
   int jresult ;
   int result;
   
@@ -37597,7 +37610,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Path_Property_POINTS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Path_Property_CONTROL_POINTS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Path_Property_CONTROL_POINTS_get() {
   int jresult ;
   int result;
   
@@ -37607,7 +37620,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Path_Property_CONTROL_POINTS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Path_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Path_Property() {
   void * jresult ;
   Dali::Path::Property *result = 0 ;
   
@@ -37633,7 +37646,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Path_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Path_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Path_Property(void * jarg1) {
   Dali::Path::Property *arg1 = (Dali::Path::Property *) 0 ;
   
   arg1 = (Dali::Path::Property *)jarg1; 
@@ -37657,7 +37670,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Path_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_New() {
   void * jresult ;
   Dali::Path result;
   
@@ -37683,7 +37696,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -37717,7 +37730,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Path__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Path__SWIG_0() {
   void * jresult ;
   Dali::Path *result = 0 ;
   
@@ -37743,7 +37756,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Path__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Path(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Path(void * jarg1) {
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   
   arg1 = (Dali::Path *)jarg1; 
@@ -37767,7 +37780,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Path(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Path__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Path__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Path *arg1 = 0 ;
   Dali::Path *result = 0 ;
@@ -37799,7 +37812,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Path__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   Dali::Path *arg2 = 0 ;
@@ -37833,7 +37846,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_Assign(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Path_AddPoint(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddPoint(void * jarg1, void * jarg2) {
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -37863,7 +37876,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Path_AddPoint(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Path_AddControlPoint(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_AddControlPoint(void * jarg1, void * jarg2) {
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -37893,7 +37906,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Path_AddControlPoint(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Path_GenerateControlPoints(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_GenerateControlPoints(void * jarg1, float jarg2) {
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   float arg2 ;
   
@@ -37919,7 +37932,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Path_GenerateControlPoints(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Path_Sample(void * jarg1, float jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Path_Sample(void * jarg1, float jarg2, void * jarg3, void * jarg4) {
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   float arg2 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -37957,7 +37970,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Path_Sample(void * jarg1, float jarg2, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_GetPoint(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_GetPoint(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   size_t arg2 ;
@@ -37987,7 +38000,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_GetPoint(void * jarg1, unsigned lo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_GetControlPoint(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Path_GetControlPoint(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   size_t arg2 ;
@@ -38017,7 +38030,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Path_GetControlPoint(void * jarg1, unsi
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Path_GetPointCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Path_GetPointCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Path *arg1 = (Dali::Path *) 0 ;
   size_t result;
@@ -38045,7 +38058,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_Path_GetPointCount(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TimePeriod__SWIG_0(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimePeriod__SWIG_0(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::TimePeriod *result = 0 ;
@@ -38073,7 +38086,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TimePeriod__SWIG_0(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TimePeriod__SWIG_1(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimePeriod__SWIG_1(float jarg1, float jarg2) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -38103,7 +38116,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TimePeriod__SWIG_1(float jarg1, flo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TimePeriod(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TimePeriod(void * jarg1) {
   Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
   
   arg1 = (Dali::TimePeriod *)jarg1; 
@@ -38127,7 +38140,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TimePeriod(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimePeriod_delaySeconds_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimePeriod_delaySeconds_set(void * jarg1, float jarg2) {
   Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
   float arg2 ;
   
@@ -38137,7 +38150,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimePeriod_delaySeconds_set(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TimePeriod_delaySeconds_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TimePeriod_delaySeconds_get(void * jarg1) {
   float jresult ;
   Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
   float result;
@@ -38149,7 +38162,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TimePeriod_delaySeconds_get(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimePeriod_durationSeconds_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimePeriod_durationSeconds_set(void * jarg1, float jarg2) {
   Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
   float arg2 ;
   
@@ -38159,7 +38172,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimePeriod_durationSeconds_set(void * jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TimePeriod_durationSeconds_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TimePeriod_durationSeconds_get(void * jarg1) {
   float jresult ;
   Dali::TimePeriod *arg1 = (Dali::TimePeriod *) 0 ;
   float result;
@@ -38171,7 +38184,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TimePeriod_durationSeconds_get(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Animation__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Animation__SWIG_0() {
   void * jresult ;
   Dali::Animation *result = 0 ;
   
@@ -38197,7 +38210,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Animation__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_New(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_New(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::Animation result;
@@ -38225,7 +38238,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_New(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -38259,7 +38272,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Animation(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Animation(void * jarg1) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   
   arg1 = (Dali::Animation *)jarg1; 
@@ -38283,7 +38296,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Animation(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Animation__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Animation__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Animation *arg1 = 0 ;
   Dali::Animation *result = 0 ;
@@ -38315,7 +38328,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Animation__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Animation *arg2 = 0 ;
@@ -38349,7 +38362,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetDuration(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetDuration(void * jarg1, float jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   float arg2 ;
   
@@ -38375,7 +38388,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetDuration(void * jarg1, float
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Animation_GetDuration(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Animation_GetDuration(void * jarg1) {
   float jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   float result;
@@ -38403,7 +38416,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Animation_GetDuration(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetLooping(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetLooping(void * jarg1, unsigned int jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   bool arg2 ;
   
@@ -38429,7 +38442,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetLooping(void * jarg1, unsign
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetLoopCount(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetLoopCount(void * jarg1, int jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   int arg2 ;
   
@@ -38455,7 +38468,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetLoopCount(void * jarg1, int
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetLoopCount(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Animation_GetLoopCount(void * jarg1) {
   int jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   int result;
@@ -38483,7 +38496,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetLoopCount(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetCurrentLoop(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Animation_GetCurrentLoop(void * jarg1) {
   int jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   int result;
@@ -38511,7 +38524,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetCurrentLoop(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Animation_IsLooping(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Animation_IsLooping(void * jarg1) {
   unsigned int jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   bool result;
@@ -38539,7 +38552,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Animation_IsLooping(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetEndAction(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetEndAction(void * jarg1, int jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Animation::EndAction arg2 ;
   
@@ -38565,7 +38578,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetEndAction(void * jarg1, int
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetEndAction(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Animation_GetEndAction(void * jarg1) {
   int jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Animation::EndAction result;
@@ -38593,7 +38606,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetEndAction(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetDisconnectAction(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetDisconnectAction(void * jarg1, int jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Animation::EndAction arg2 ;
   
@@ -38619,7 +38632,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetDisconnectAction(void * jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetDisconnectAction(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Animation_GetDisconnectAction(void * jarg1) {
   int jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Animation::EndAction result;
@@ -38647,7 +38660,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetDisconnectAction(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetDefaultAlphaFunction(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetDefaultAlphaFunction(void * jarg1, void * jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::AlphaFunction arg2 ;
   Dali::AlphaFunction *argp2 ;
@@ -38679,7 +38692,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetDefaultAlphaFunction(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_GetDefaultAlphaFunction(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_GetDefaultAlphaFunction(void * jarg1) {
   void * jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::AlphaFunction result;
@@ -38707,7 +38720,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_GetDefaultAlphaFunction(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetCurrentProgress(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetCurrentProgress(void * jarg1, float jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   float arg2 ;
   
@@ -38733,7 +38746,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetCurrentProgress(void * jarg1
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Animation_GetCurrentProgress(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Animation_GetCurrentProgress(void * jarg1) {
   float jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   float result;
@@ -38761,7 +38774,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Animation_GetCurrentProgress(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetSpeedFactor(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetSpeedFactor(void * jarg1, float jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   float arg2 ;
   
@@ -38787,7 +38800,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetSpeedFactor(void * jarg1, fl
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Animation_GetSpeedFactor(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Animation_GetSpeedFactor(void * jarg1) {
   float jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   float result;
@@ -38815,7 +38828,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Animation_GetSpeedFactor(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetPlayRange(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_SetPlayRange(void * jarg1, void * jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   
@@ -38845,7 +38858,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_SetPlayRange(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_GetPlayRange(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_GetPlayRange(void * jarg1) {
   void * jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Vector2 result;
@@ -38873,7 +38886,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_GetPlayRange(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Play(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Play(void * jarg1) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   
   arg1 = (Dali::Animation *)jarg1; 
@@ -38897,7 +38910,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Play(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_PlayFrom(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_PlayFrom(void * jarg1, float jarg2) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   float arg2 ;
   
@@ -38923,7 +38936,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_PlayFrom(void * jarg1, float ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Pause(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Pause(void * jarg1) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   
   arg1 = (Dali::Animation *)jarg1; 
@@ -38947,7 +38960,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Pause(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetState(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Animation_GetState(void * jarg1) {
   int jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Animation::State result;
@@ -38975,7 +38988,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Animation_GetState(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Stop(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Stop(void * jarg1) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   
   arg1 = (Dali::Animation *)jarg1; 
@@ -38999,7 +39012,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Stop(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Clear(void * jarg1) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   
   arg1 = (Dali::Animation *)jarg1; 
@@ -39023,7 +39036,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_FinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Animation_FinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Animation::AnimationSignalType *result = 0 ;
@@ -39051,7 +39064,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Animation_FinishedSignal(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBy__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBy__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::Property::Value arg3 ;
@@ -39091,7 +39104,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBy__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBy__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBy__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::Property::Value arg3 ;
@@ -39139,7 +39152,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBy__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBy__SWIG_2(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBy__SWIG_2(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::Property::Value arg3 ;
@@ -39187,7 +39200,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBy__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBy__SWIG_3(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBy__SWIG_3(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::Property::Value arg3 ;
@@ -39243,7 +39256,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBy__SWIG_3(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateTo__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateTo__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::Property::Value arg3 ;
@@ -39283,7 +39296,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateTo__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateTo__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateTo__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::Property::Value arg3 ;
@@ -39331,7 +39344,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateTo__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateTo__SWIG_2(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateTo__SWIG_2(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::Property::Value arg3 ;
@@ -39379,7 +39392,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateTo__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateTo__SWIG_3(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateTo__SWIG_3(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::Property::Value arg3 ;
@@ -39435,7 +39448,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateTo__SWIG_3(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBetween__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::KeyFrames *arg3 = 0 ;
@@ -39473,7 +39486,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_0(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_1(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBetween__SWIG_1(void * jarg1, void * jarg2, void * jarg3, int jarg4) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::KeyFrames *arg3 = 0 ;
@@ -39513,7 +39526,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_2(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBetween__SWIG_2(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::KeyFrames *arg3 = 0 ;
@@ -39559,7 +39572,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_2(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_3(void * jarg1, void * jarg2, void * jarg3, void * jarg4, int jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBetween__SWIG_3(void * jarg1, void * jarg2, void * jarg3, void * jarg4, int jarg5) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::KeyFrames *arg3 = 0 ;
@@ -39607,7 +39620,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_3(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_4(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBetween__SWIG_4(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::KeyFrames *arg3 = 0 ;
@@ -39653,7 +39666,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_4(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_5(void * jarg1, void * jarg2, void * jarg3, void * jarg4, int jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBetween__SWIG_5(void * jarg1, void * jarg2, void * jarg3, void * jarg4, int jarg5) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::KeyFrames *arg3 = 0 ;
@@ -39701,7 +39714,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_5(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_6(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBetween__SWIG_6(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::KeyFrames *arg3 = 0 ;
@@ -39755,7 +39768,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_6(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_7(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, int jarg6) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_AnimateBetween__SWIG_7(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, int jarg6) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   Dali::KeyFrames *arg3 = 0 ;
@@ -39811,7 +39824,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_AnimateBetween__SWIG_7(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Animate__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Animate__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Actor arg2 ;
   Dali::Path arg3 ;
@@ -39857,7 +39870,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Animate__SWIG_0(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Animate__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Animate__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Actor arg2 ;
   Dali::Path arg3 ;
@@ -39911,7 +39924,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Animate__SWIG_1(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Animate__SWIG_2(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Animate__SWIG_2(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Actor arg2 ;
   Dali::Path arg3 ;
@@ -39965,7 +39978,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Animate__SWIG_2(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Animate__SWIG_3(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Animate__SWIG_3(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5, void * jarg6) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Actor arg2 ;
   Dali::Path arg3 ;
@@ -40027,7 +40040,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Animate__SWIG_3(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Show(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Show(void * jarg1, void * jarg2, float jarg3) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Actor arg2 ;
   float arg3 ;
@@ -40061,7 +40074,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Show(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Hide(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Animation_Hide(void * jarg1, void * jarg2, float jarg3) {
   Dali::Animation *arg1 = (Dali::Animation *) 0 ;
   Dali::Actor arg2 ;
   float arg3 ;
@@ -40095,7 +40108,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Animation_Hide(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_LinearConstrainer_Property_VALUE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LinearConstrainer_Property_VALUE_get() {
   int jresult ;
   int result;
   
@@ -40105,7 +40118,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_LinearConstrainer_Property_VALUE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_LinearConstrainer_Property_PROGRESS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LinearConstrainer_Property_PROGRESS_get() {
   int jresult ;
   int result;
   
@@ -40115,7 +40128,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_LinearConstrainer_Property_PROGRESS_get()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LinearConstrainer_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LinearConstrainer_Property() {
   void * jresult ;
   Dali::LinearConstrainer::Property *result = 0 ;
   
@@ -40141,7 +40154,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LinearConstrainer_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LinearConstrainer_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LinearConstrainer_Property(void * jarg1) {
   Dali::LinearConstrainer::Property *arg1 = (Dali::LinearConstrainer::Property *) 0 ;
   
   arg1 = (Dali::LinearConstrainer::Property *)jarg1; 
@@ -40165,7 +40178,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LinearConstrainer_Property(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LinearConstrainer_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_New() {
   void * jresult ;
   Dali::LinearConstrainer result;
   
@@ -40191,7 +40204,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LinearConstrainer_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LinearConstrainer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -40225,7 +40238,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LinearConstrainer_DownCast(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LinearConstrainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LinearConstrainer__SWIG_0() {
   void * jresult ;
   Dali::LinearConstrainer *result = 0 ;
   
@@ -40251,7 +40264,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LinearConstrainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LinearConstrainer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LinearConstrainer(void * jarg1) {
   Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
   
   arg1 = (Dali::LinearConstrainer *)jarg1; 
@@ -40275,7 +40288,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LinearConstrainer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LinearConstrainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LinearConstrainer__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::LinearConstrainer *arg1 = 0 ;
   Dali::LinearConstrainer *result = 0 ;
@@ -40307,7 +40320,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LinearConstrainer__SWIG_1(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LinearConstrainer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LinearConstrainer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
   Dali::LinearConstrainer *arg2 = 0 ;
@@ -40341,7 +40354,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LinearConstrainer_Assign(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LinearConstrainer_Apply__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Apply__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   SwigValueWrapper< Dali::Property > arg3 ;
@@ -40393,7 +40406,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LinearConstrainer_Apply__SWIG_0(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LinearConstrainer_Apply__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Apply__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   SwigValueWrapper< Dali::Property > arg3 ;
@@ -40439,7 +40452,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LinearConstrainer_Apply__SWIG_1(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LinearConstrainer_Remove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LinearConstrainer_Remove(void * jarg1, void * jarg2) {
   Dali::LinearConstrainer *arg1 = (Dali::LinearConstrainer *) 0 ;
   Dali::Handle *arg2 = 0 ;
   
@@ -40469,7 +40482,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LinearConstrainer_Remove(void * jarg1, vo
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PathConstrainer_Property_FORWARD_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_FORWARD_get() {
   int jresult ;
   int result;
   
@@ -40479,7 +40492,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PathConstrainer_Property_FORWARD_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PathConstrainer_Property_POINTS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_POINTS_get() {
   int jresult ;
   int result;
   
@@ -40489,7 +40502,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PathConstrainer_Property_POINTS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PathConstrainer_Property_CONTROL_POINTS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PathConstrainer_Property_CONTROL_POINTS_get() {
   int jresult ;
   int result;
   
@@ -40499,7 +40512,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PathConstrainer_Property_CONTROL_POINTS_ge
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PathConstrainer_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PathConstrainer_Property() {
   void * jresult ;
   Dali::PathConstrainer::Property *result = 0 ;
   
@@ -40525,7 +40538,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PathConstrainer_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PathConstrainer_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PathConstrainer_Property(void * jarg1) {
   Dali::PathConstrainer::Property *arg1 = (Dali::PathConstrainer::Property *) 0 ;
   
   arg1 = (Dali::PathConstrainer::Property *)jarg1; 
@@ -40549,7 +40562,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PathConstrainer_Property(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PathConstrainer_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PathConstrainer_New() {
   void * jresult ;
   Dali::PathConstrainer result;
   
@@ -40575,7 +40588,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PathConstrainer_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PathConstrainer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PathConstrainer_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -40609,7 +40622,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PathConstrainer_DownCast(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PathConstrainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PathConstrainer__SWIG_0() {
   void * jresult ;
   Dali::PathConstrainer *result = 0 ;
   
@@ -40635,7 +40648,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PathConstrainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PathConstrainer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PathConstrainer(void * jarg1) {
   Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
   
   arg1 = (Dali::PathConstrainer *)jarg1; 
@@ -40659,7 +40672,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PathConstrainer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PathConstrainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PathConstrainer__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::PathConstrainer *arg1 = 0 ;
   Dali::PathConstrainer *result = 0 ;
@@ -40691,7 +40704,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PathConstrainer__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PathConstrainer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PathConstrainer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
   Dali::PathConstrainer *arg2 = 0 ;
@@ -40725,7 +40738,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PathConstrainer_Assign(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PathConstrainer_Apply__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Apply__SWIG_0(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) {
   Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   SwigValueWrapper< Dali::Property > arg3 ;
@@ -40777,7 +40790,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PathConstrainer_Apply__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PathConstrainer_Apply__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Apply__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
   SwigValueWrapper< Dali::Property > arg2 ;
   SwigValueWrapper< Dali::Property > arg3 ;
@@ -40823,7 +40836,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PathConstrainer_Apply__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PathConstrainer_Remove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PathConstrainer_Remove(void * jarg1, void * jarg2) {
   Dali::PathConstrainer *arg1 = (Dali::PathConstrainer *) 0 ;
   Dali::Handle *arg2 = 0 ;
   
@@ -40853,7 +40866,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PathConstrainer_Remove(void * jarg1, void
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FittingModeDefault_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FittingModeDefault_get() {
   int jresult ;
   Dali::FittingMode::Type result;
   
@@ -40863,7 +40876,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FittingModeDefault_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_DEFAULT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_DEFAULT_get() {
   int jresult ;
   Dali::SamplingMode::Type result;
   
@@ -40873,7 +40886,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_DEFAULT_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BufferImage__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BufferImage__SWIG_0() {
   void * jresult ;
   Dali::BufferImage *result = 0 ;
   
@@ -40899,7 +40912,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BufferImage__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_0(unsigned int jarg1, unsigned int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_New__SWIG_0(unsigned int jarg1, unsigned int jarg2, int jarg3) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -40931,7 +40944,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_0(unsigned int ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_1(unsigned int jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_New__SWIG_1(unsigned int jarg1, unsigned int jarg2) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -40961,7 +40974,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_1(unsigned int ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_2(unsigned char* jarg1, unsigned int jarg2, unsigned int jarg3, int jarg4, unsigned int jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_New__SWIG_2(unsigned char* jarg1, unsigned int jarg2, unsigned int jarg3, int jarg4, unsigned int jarg5) {
   void * jresult ;
   Dali::PixelBuffer *arg1 = (Dali::PixelBuffer *) 0 ;
   unsigned int arg2 ;
@@ -40999,7 +41012,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_2(unsigned char*
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_3(unsigned char* jarg1, unsigned int jarg2, unsigned int jarg3, int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_New__SWIG_3(unsigned char* jarg1, unsigned int jarg2, unsigned int jarg3, int jarg4) {
   void * jresult ;
   Dali::PixelBuffer *arg1 = (Dali::PixelBuffer *) 0 ;
   unsigned int arg2 ;
@@ -41035,7 +41048,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_3(unsigned char*
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_4(unsigned char* jarg1, unsigned int jarg2, unsigned int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_New__SWIG_4(unsigned char* jarg1, unsigned int jarg2, unsigned int jarg3) {
   void * jresult ;
   Dali::PixelBuffer *arg1 = (Dali::PixelBuffer *) 0 ;
   unsigned int arg2 ;
@@ -41069,7 +41082,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_New__SWIG_4(unsigned char*
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -41103,7 +41116,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_BufferImage(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_BufferImage(void * jarg1) {
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   
   arg1 = (Dali::BufferImage *)jarg1; 
@@ -41127,7 +41140,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_BufferImage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BufferImage__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BufferImage__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::BufferImage *arg1 = 0 ;
   Dali::BufferImage *result = 0 ;
@@ -41159,7 +41172,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BufferImage__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   Dali::BufferImage *arg2 = 0 ;
@@ -41193,7 +41206,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_WHITE() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_WHITE() {
   void * jresult ;
   Dali::BufferImage result;
   
@@ -41219,7 +41232,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_WHITE() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_GetBuffer(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_BufferImage_GetBuffer(void * jarg1) {
   void * jresult ;
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   Dali::PixelBuffer *result = 0 ;
@@ -41247,7 +41260,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_BufferImage_GetBuffer(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BufferImage_GetBufferSize(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BufferImage_GetBufferSize(void * jarg1) {
   unsigned int jresult ;
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   unsigned int result;
@@ -41275,7 +41288,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BufferImage_GetBufferSize(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BufferImage_GetBufferStride(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BufferImage_GetBufferStride(void * jarg1) {
   unsigned int jresult ;
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   unsigned int result;
@@ -41303,7 +41316,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BufferImage_GetBufferStride(void
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_BufferImage_GetPixelFormat(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_BufferImage_GetPixelFormat(void * jarg1) {
   int jresult ;
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   Dali::Pixel::Format result;
@@ -41331,7 +41344,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_BufferImage_GetPixelFormat(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BufferImage_Update__SWIG_0(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BufferImage_Update__SWIG_0(void * jarg1) {
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   
   arg1 = (Dali::BufferImage *)jarg1; 
@@ -41355,7 +41368,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BufferImage_Update__SWIG_0(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BufferImage_Update__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BufferImage_Update__SWIG_1(void * jarg1, void * jarg2) {
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   Dali::RectArea arg2 ;
   Dali::RectArea *argp2 ;
@@ -41387,7 +41400,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BufferImage_Update__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BufferImage_IsDataExternal(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BufferImage_IsDataExternal(void * jarg1) {
   unsigned int jresult ;
   Dali::BufferImage *arg1 = (Dali::BufferImage *) 0 ;
   bool result;
@@ -41415,7 +41428,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BufferImage_IsDataExternal(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_EncodedBufferImage__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_EncodedBufferImage__SWIG_0() {
   void * jresult ;
   Dali::EncodedBufferImage *result = 0 ;
   
@@ -41441,7 +41454,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_EncodedBufferImage__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_New__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_EncodedBufferImage_New__SWIG_0(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   uint8_t *arg1 = (uint8_t *) (uint8_t *)0 ;
   std::size_t arg2 ;
@@ -41471,7 +41484,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_New__SWIG_0(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_New__SWIG_1(void * jarg1, unsigned long jarg2, void * jarg3, int jarg4, int jarg5, unsigned int jarg6) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_EncodedBufferImage_New__SWIG_1(void * jarg1, unsigned long jarg2, void * jarg3, int jarg4, int jarg5, unsigned int jarg6) {
   void * jresult ;
   uint8_t *arg1 = (uint8_t *) (uint8_t *)0 ;
   std::size_t arg2 ;
@@ -41515,7 +41528,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_New__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_New__SWIG_2(void * jarg1, unsigned long jarg2, void * jarg3, int jarg4, int jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_EncodedBufferImage_New__SWIG_2(void * jarg1, unsigned long jarg2, void * jarg3, int jarg4, int jarg5) {
   void * jresult ;
   uint8_t *arg1 = (uint8_t *) (uint8_t *)0 ;
   std::size_t arg2 ;
@@ -41557,7 +41570,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_New__SWIG_2(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_EncodedBufferImage_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -41591,7 +41604,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_DownCast(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_EncodedBufferImage(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_EncodedBufferImage(void * jarg1) {
   Dali::EncodedBufferImage *arg1 = (Dali::EncodedBufferImage *) 0 ;
   
   arg1 = (Dali::EncodedBufferImage *)jarg1; 
@@ -41615,7 +41628,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_EncodedBufferImage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_EncodedBufferImage__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_EncodedBufferImage__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::EncodedBufferImage *arg1 = 0 ;
   Dali::EncodedBufferImage *result = 0 ;
@@ -41647,7 +41660,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_EncodedBufferImage__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_EncodedBufferImage_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::EncodedBufferImage *arg1 = (Dali::EncodedBufferImage *) 0 ;
   Dali::EncodedBufferImage *arg2 = 0 ;
@@ -41681,7 +41694,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_Assign(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_NativeImage__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_NativeImage__SWIG_0() {
   void * jresult ;
   Dali::NativeImage *result = 0 ;
   
@@ -41707,7 +41720,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_NativeImage__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_NativeImage(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_NativeImage(void * jarg1) {
   Dali::NativeImage *arg1 = (Dali::NativeImage *) 0 ;
   
   arg1 = (Dali::NativeImage *)jarg1; 
@@ -41731,7 +41744,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_NativeImage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_NativeImage__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_NativeImage__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::NativeImage *arg1 = 0 ;
   Dali::NativeImage *result = 0 ;
@@ -41763,7 +41776,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_NativeImage__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NativeImage_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NativeImage_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::NativeImage *arg1 = (Dali::NativeImage *) 0 ;
   Dali::NativeImage *arg2 = 0 ;
@@ -41797,7 +41810,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NativeImage_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_NativeImage_CreateGlTexture(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_NativeImage_CreateGlTexture(void * jarg1) {
   Dali::NativeImage *arg1 = (Dali::NativeImage *) 0 ;
   
   arg1 = (Dali::NativeImage *)jarg1; 
@@ -41821,7 +41834,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_NativeImage_CreateGlTexture(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NativeImage_New(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NativeImage_New(void * jarg1) {
   void * jresult ;
   NativeImageInterface *arg1 = 0 ;
   Dali::NativeImage result;
@@ -41853,7 +41866,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NativeImage_New(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NativeImage_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NativeImage_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -41887,7 +41900,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NativeImage_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_NativeImage_GetCustomFragmentPreFix(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_NativeImage_GetCustomFragmentPreFix(void * jarg1) {
   char * jresult ;
   Dali::NativeImage *arg1 = (Dali::NativeImage *) 0 ;
   char *result = 0 ;
@@ -41915,7 +41928,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_NativeImage_GetCustomFragmentPreFix(voi
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_NativeImage_GetCustomSamplerTypename(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_NativeImage_GetCustomSamplerTypename(void * jarg1) {
   char * jresult ;
   Dali::NativeImage *arg1 = (Dali::NativeImage *) 0 ;
   char *result = 0 ;
@@ -41943,7 +41956,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_NativeImage_GetCustomSamplerTypename(vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_GlExtensionCreate(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GlExtensionCreate(void * jarg1) {
   unsigned int jresult ;
   Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
   bool result;
@@ -41971,7 +41984,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_GlExtensionC
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_NativeImageInterface_GlExtensionDestroy(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_NativeImageInterface_GlExtensionDestroy(void * jarg1) {
   Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
   
   arg1 = (Dali::NativeImageInterface *)jarg1; 
@@ -41995,7 +42008,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_NativeImageInterface_GlExtensionDestroy(v
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_TargetTexture(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_TargetTexture(void * jarg1) {
   unsigned int jresult ;
   Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
   unsigned int result;
@@ -42023,7 +42036,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_TargetTextur
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_NativeImageInterface_PrepareTexture(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_NativeImageInterface_PrepareTexture(void * jarg1) {
   Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
   
   arg1 = (Dali::NativeImageInterface *)jarg1; 
@@ -42047,7 +42060,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_NativeImageInterface_PrepareTexture(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_GetWidth(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GetWidth(void * jarg1) {
   unsigned int jresult ;
   Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
   unsigned int result;
@@ -42075,7 +42088,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_GetWidth(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_GetHeight(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_GetHeight(void * jarg1) {
   unsigned int jresult ;
   Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
   unsigned int result;
@@ -42103,7 +42116,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_GetHeight(vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_RequiresBlending(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NativeImageInterface_RequiresBlending(void * jarg1) {
   unsigned int jresult ;
   Dali::NativeImageInterface *arg1 = (Dali::NativeImageInterface *) 0 ;
   bool result;
@@ -42131,7 +42144,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NativeImageInterface_RequiresBlen
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_GetImageSize(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_GetImageSize(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ImageDimensions result;
@@ -42167,7 +42180,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_GetImageSize(char * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ResourceImage__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ResourceImage__SWIG_0() {
   void * jresult ;
   Dali::ResourceImage *result = 0 ;
   
@@ -42193,7 +42206,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ResourceImage__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ResourceImage(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ResourceImage(void * jarg1) {
   Dali::ResourceImage *arg1 = (Dali::ResourceImage *) 0 ;
   
   arg1 = (Dali::ResourceImage *)jarg1; 
@@ -42217,7 +42230,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ResourceImage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ResourceImage__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ResourceImage__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::ResourceImage *arg1 = 0 ;
   Dali::ResourceImage *result = 0 ;
@@ -42249,7 +42262,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ResourceImage__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::ResourceImage *arg1 = (Dali::ResourceImage *) 0 ;
   Dali::ResourceImage *arg2 = 0 ;
@@ -42283,7 +42296,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_0(char * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_New__SWIG_0(char * jarg1, unsigned int jarg2) {
   void * jresult ;
   std::string *arg1 = 0 ;
   bool arg2 ;
@@ -42321,7 +42334,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_0(char * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_1(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_New__SWIG_1(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ResourceImage result;
@@ -42357,7 +42370,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_1(char * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_2(char * jarg1, void * jarg2, int jarg3, int jarg4, unsigned int jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_New__SWIG_2(char * jarg1, void * jarg2, int jarg3, int jarg4, unsigned int jarg5) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ImageDimensions arg2 ;
@@ -42407,7 +42420,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_2(char * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_3(char * jarg1, void * jarg2, int jarg3, int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_New__SWIG_3(char * jarg1, void * jarg2, int jarg3, int jarg4) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ImageDimensions arg2 ;
@@ -42455,7 +42468,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_3(char * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_4(char * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_New__SWIG_4(char * jarg1, void * jarg2, int jarg3) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ImageDimensions arg2 ;
@@ -42501,7 +42514,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_4(char * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_5(char * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_New__SWIG_5(char * jarg1, void * jarg2) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ImageDimensions arg2 ;
@@ -42545,7 +42558,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_New__SWIG_5(char * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -42579,7 +42592,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ResourceImage_GetLoadingState(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ResourceImage_GetLoadingState(void * jarg1) {
   int jresult ;
   Dali::ResourceImage *arg1 = (Dali::ResourceImage *) 0 ;
   Dali::LoadingState result;
@@ -42607,7 +42620,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ResourceImage_GetLoadingState(void * jarg1
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_ResourceImage_GetUrl(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_ResourceImage_GetUrl(void * jarg1) {
   char * jresult ;
   Dali::ResourceImage *arg1 = (Dali::ResourceImage *) 0 ;
   std::string result;
@@ -42635,7 +42648,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_ResourceImage_GetUrl(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ResourceImage_Reload(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResourceImage_Reload(void * jarg1) {
   Dali::ResourceImage *arg1 = (Dali::ResourceImage *) 0 ;
   
   arg1 = (Dali::ResourceImage *)jarg1; 
@@ -42659,7 +42672,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ResourceImage_Reload(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_LoadingFinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceImage_LoadingFinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::ResourceImage *arg1 = (Dali::ResourceImage *) 0 ;
   Dali::ResourceImage::ResourceImageSignal *result = 0 ;
@@ -42687,7 +42700,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ResourceImage_LoadingFinishedSignal(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBufferImage__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBufferImage__SWIG_0() {
   void * jresult ;
   Dali::FrameBufferImage *result = 0 ;
   
@@ -42713,7 +42726,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBufferImage__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_0(unsigned int jarg1, unsigned int jarg2, int jarg3, int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBufferImage_New__SWIG_0(unsigned int jarg1, unsigned int jarg2, int jarg3, int jarg4) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -42747,7 +42760,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_0(unsigned i
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_1(unsigned int jarg1, unsigned int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBufferImage_New__SWIG_1(unsigned int jarg1, unsigned int jarg2, int jarg3) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -42779,7 +42792,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_1(unsigned i
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_2(unsigned int jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBufferImage_New__SWIG_2(unsigned int jarg1, unsigned int jarg2) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -42809,7 +42822,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_2(unsigned i
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_3(unsigned int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBufferImage_New__SWIG_3(unsigned int jarg1) {
   void * jresult ;
   unsigned int arg1 ;
   Dali::FrameBufferImage result;
@@ -42837,7 +42850,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_3(unsigned i
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_4() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBufferImage_New__SWIG_4() {
   void * jresult ;
   Dali::FrameBufferImage result;
   
@@ -42863,7 +42876,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_4() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_5(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBufferImage_New__SWIG_5(void * jarg1) {
   void * jresult ;
   Dali::NativeImageInterface *arg1 = 0 ;
   Dali::FrameBufferImage result;
@@ -42895,7 +42908,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_New__SWIG_5(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBufferImage_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -42929,7 +42942,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_DownCast(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FrameBufferImage(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FrameBufferImage(void * jarg1) {
   Dali::FrameBufferImage *arg1 = (Dali::FrameBufferImage *) 0 ;
   
   arg1 = (Dali::FrameBufferImage *)jarg1; 
@@ -42953,7 +42966,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FrameBufferImage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBufferImage__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FrameBufferImage__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::FrameBufferImage *arg1 = 0 ;
   Dali::FrameBufferImage *result = 0 ;
@@ -42985,7 +42998,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FrameBufferImage__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FrameBufferImage_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::FrameBufferImage *arg1 = (Dali::FrameBufferImage *) 0 ;
   Dali::FrameBufferImage *arg2 = 0 ;
@@ -43019,7 +43032,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FrameBufferImage_Assign(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_NinePatchImage__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_NinePatchImage__SWIG_0() {
   void * jresult ;
   Dali::NinePatchImage *result = 0 ;
   
@@ -43045,7 +43058,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_NinePatchImage__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_New(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NinePatchImage_New(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::NinePatchImage result;
@@ -43081,7 +43094,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_New(char * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NinePatchImage_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -43115,7 +43128,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_NinePatchImage(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_NinePatchImage(void * jarg1) {
   Dali::NinePatchImage *arg1 = (Dali::NinePatchImage *) 0 ;
   
   arg1 = (Dali::NinePatchImage *)jarg1; 
@@ -43139,7 +43152,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_NinePatchImage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_NinePatchImage__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_NinePatchImage__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::NinePatchImage *arg1 = 0 ;
   Dali::NinePatchImage *result = 0 ;
@@ -43171,7 +43184,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_NinePatchImage__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NinePatchImage_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::NinePatchImage *arg1 = (Dali::NinePatchImage *) 0 ;
   Dali::NinePatchImage *arg2 = 0 ;
@@ -43205,7 +43218,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_Assign(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_GetStretchBorders(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NinePatchImage_GetStretchBorders(void * jarg1) {
   void * jresult ;
   Dali::NinePatchImage *arg1 = (Dali::NinePatchImage *) 0 ;
   Dali::Vector4 result;
@@ -43233,7 +43246,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_GetStretchBorders(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_GetStretchPixelsX(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NinePatchImage_GetStretchPixelsX(void * jarg1) {
   void * jresult ;
   Dali::NinePatchImage *arg1 = (Dali::NinePatchImage *) 0 ;
   Dali::NinePatchImage::StretchRanges *result = 0 ;
@@ -43261,7 +43274,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_GetStretchPixelsX(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_GetStretchPixelsY(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NinePatchImage_GetStretchPixelsY(void * jarg1) {
   void * jresult ;
   Dali::NinePatchImage *arg1 = (Dali::NinePatchImage *) 0 ;
   Dali::NinePatchImage::StretchRanges *result = 0 ;
@@ -43289,7 +43302,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_GetStretchPixelsY(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_GetChildRectangle(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NinePatchImage_GetChildRectangle(void * jarg1) {
   void * jresult ;
   Dali::NinePatchImage *arg1 = (Dali::NinePatchImage *) 0 ;
   Dali::Rect< int > result;
@@ -43317,7 +43330,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_GetChildRectangle(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_CreateCroppedBufferImage(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NinePatchImage_CreateCroppedBufferImage(void * jarg1) {
   void * jresult ;
   Dali::NinePatchImage *arg1 = (Dali::NinePatchImage *) 0 ;
   Dali::BufferImage result;
@@ -43345,7 +43358,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NinePatchImage_CreateCroppedBufferImage
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NinePatchImage_IsNinePatchUrl(char * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_NinePatchImage_IsNinePatchUrl(char * jarg1) {
   unsigned int jresult ;
   std::string *arg1 = 0 ;
   bool result;
@@ -43381,7 +43394,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_NinePatchImage_IsNinePatchUrl(cha
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_TYPE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TYPE_get() {
   int jresult ;
   int result;
   
@@ -43391,7 +43404,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_TYPE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_PROJECTION_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_MODE_get() {
   int jresult ;
   int result;
   
@@ -43401,7 +43414,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_PROJECTION_MODE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_FIELD_OF_VIEW_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_FIELD_OF_VIEW_get() {
   int jresult ;
   int result;
   
@@ -43411,7 +43424,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_FIELD_OF_VIEW_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_ASPECT_RATIO_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_ASPECT_RATIO_get() {
   int jresult ;
   int result;
   
@@ -43421,7 +43434,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_ASPECT_RATIO_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_NEAR_PLANE_DISTANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_NEAR_PLANE_DISTANCE_get() {
   int jresult ;
   int result;
   
@@ -43431,7 +43444,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_NEAR_PLANE_DISTANCE_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_FAR_PLANE_DISTANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_FAR_PLANE_DISTANCE_get() {
   int jresult ;
   int result;
   
@@ -43441,7 +43454,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_FAR_PLANE_DISTANCE_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_LEFT_PLANE_DISTANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_LEFT_PLANE_DISTANCE_get() {
   int jresult ;
   int result;
   
@@ -43451,7 +43464,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_LEFT_PLANE_DISTANCE_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_RIGHT_PLANE_DISTANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_RIGHT_PLANE_DISTANCE_get() {
   int jresult ;
   int result;
   
@@ -43461,7 +43474,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_RIGHT_PLANE_DISTANCE_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_TOP_PLANE_DISTANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TOP_PLANE_DISTANCE_get() {
   int jresult ;
   int result;
   
@@ -43471,7 +43484,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_TOP_PLANE_DISTANCE_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_BOTTOM_PLANE_DISTANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_BOTTOM_PLANE_DISTANCE_get() {
   int jresult ;
   int result;
   
@@ -43481,7 +43494,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_BOTTOM_PLANE_DISTANCE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_TARGET_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_TARGET_POSITION_get() {
   int jresult ;
   int result;
   
@@ -43491,7 +43504,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_TARGET_POSITION_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_PROJECTION_MATRIX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_PROJECTION_MATRIX_get() {
   int jresult ;
   int result;
   
@@ -43501,7 +43514,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_PROJECTION_MATRIX_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_VIEW_MATRIX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_VIEW_MATRIX_get() {
   int jresult ;
   int result;
   
@@ -43511,7 +43524,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_VIEW_MATRIX_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_INVERT_Y_AXIS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_Property_INVERT_Y_AXIS_get() {
   int jresult ;
   int result;
   
@@ -43521,7 +43534,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_Property_INVERT_Y_AXIS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CameraActor_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraActor_Property() {
   void * jresult ;
   Dali::CameraActor::Property *result = 0 ;
   
@@ -43547,7 +43560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CameraActor_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_CameraActor_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CameraActor_Property(void * jarg1) {
   Dali::CameraActor::Property *arg1 = (Dali::CameraActor::Property *) 0 ;
   
   arg1 = (Dali::CameraActor::Property *)jarg1; 
@@ -43571,7 +43584,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_CameraActor_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CameraActor__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraActor__SWIG_0() {
   void * jresult ;
   Dali::CameraActor *result = 0 ;
   
@@ -43597,7 +43610,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CameraActor__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_New__SWIG_0() {
   void * jresult ;
   Dali::CameraActor result;
   
@@ -43623,7 +43636,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_New__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_New__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Size *arg1 = 0 ;
   Dali::CameraActor result;
@@ -43655,7 +43668,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_New__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -43689,7 +43702,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_CameraActor(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CameraActor(void * jarg1) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   
   arg1 = (Dali::CameraActor *)jarg1; 
@@ -43713,7 +43726,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_CameraActor(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CameraActor__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CameraActor__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::CameraActor *arg1 = 0 ;
   Dali::CameraActor *result = 0 ;
@@ -43745,7 +43758,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CameraActor__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::CameraActor *arg2 = 0 ;
@@ -43779,7 +43792,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetType(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetType(void * jarg1, int jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::Camera::Type arg2 ;
   
@@ -43805,7 +43818,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetType(void * jarg1, int jar
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_GetType(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_GetType(void * jarg1) {
   int jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::Camera::Type result;
@@ -43833,7 +43846,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_GetType(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetProjectionMode(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetProjectionMode(void * jarg1, int jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::Camera::ProjectionMode arg2 ;
   
@@ -43859,7 +43872,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetProjectionMode(void * jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_GetProjectionMode(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_CameraActor_GetProjectionMode(void * jarg1) {
   int jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::Camera::ProjectionMode result;
@@ -43887,7 +43900,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CameraActor_GetProjectionMode(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetFieldOfView(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetFieldOfView(void * jarg1, float jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
   
@@ -43913,7 +43926,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetFieldOfView(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CameraActor_GetFieldOfView(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetFieldOfView(void * jarg1) {
   float jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float result;
@@ -43941,7 +43954,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CameraActor_GetFieldOfView(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetAspectRatio(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetAspectRatio(void * jarg1, float jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
   
@@ -43967,7 +43980,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetAspectRatio(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CameraActor_GetAspectRatio(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetAspectRatio(void * jarg1) {
   float jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float result;
@@ -43995,7 +44008,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CameraActor_GetAspectRatio(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetNearClippingPlane(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetNearClippingPlane(void * jarg1, float jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
   
@@ -44021,7 +44034,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetNearClippingPlane(void * j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CameraActor_GetNearClippingPlane(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetNearClippingPlane(void * jarg1) {
   float jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float result;
@@ -44049,7 +44062,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CameraActor_GetNearClippingPlane(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetFarClippingPlane(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetFarClippingPlane(void * jarg1, float jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
   
@@ -44075,7 +44088,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetFarClippingPlane(void * ja
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CameraActor_GetFarClippingPlane(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_CameraActor_GetFarClippingPlane(void * jarg1) {
   float jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float result;
@@ -44103,7 +44116,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_CameraActor_GetFarClippingPlane(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetTargetPosition(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetTargetPosition(void * jarg1, void * jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -44133,7 +44146,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetTargetPosition(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_GetTargetPosition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CameraActor_GetTargetPosition(void * jarg1) {
   void * jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::Vector3 result;
@@ -44161,7 +44174,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CameraActor_GetTargetPosition(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetInvertYAxis(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetInvertYAxis(void * jarg1, unsigned int jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   bool arg2 ;
   
@@ -44187,7 +44200,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetInvertYAxis(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CameraActor_GetInvertYAxis(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_CameraActor_GetInvertYAxis(void * jarg1) {
   unsigned int jresult ;
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   bool result;
@@ -44215,7 +44228,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_CameraActor_GetInvertYAxis(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetPerspectiveProjection(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetPerspectiveProjection(void * jarg1, void * jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::Size *arg2 = 0 ;
   
@@ -44245,7 +44258,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetPerspectiveProjection(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetOrthographicProjection__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetOrthographicProjection__SWIG_0(void * jarg1, void * jarg2) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   Dali::Size *arg2 = 0 ;
   
@@ -44275,7 +44288,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetOrthographicProjection__SW
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetOrthographicProjection__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5, float jarg6, float jarg7) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CameraActor_SetOrthographicProjection__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5, float jarg6, float jarg7) {
   Dali::CameraActor *arg1 = (Dali::CameraActor *) 0 ;
   float arg2 ;
   float arg3 ;
@@ -44311,7 +44324,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_CameraActor_SetOrthographicProjection__SW
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StringValuePair__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_0() {
   void * jresult ;
   std::pair< std::string,Dali::Property::Value > *result = 0 ;
   
@@ -44337,7 +44350,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StringValuePair__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StringValuePair__SWIG_1(char * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_1(char * jarg1, void * jarg2) {
   void * jresult ;
   std::string arg1 ;
   Dali::Property::Value arg2 ;
@@ -44377,7 +44390,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StringValuePair__SWIG_1(char * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StringValuePair__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StringValuePair__SWIG_2(void * jarg1) {
   void * jresult ;
   std::pair< std::string,Dali::Property::Value > *arg1 = 0 ;
   std::pair< std::string,Dali::Property::Value > *result = 0 ;
@@ -44409,7 +44422,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StringValuePair__SWIG_2(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StringValuePair_first_set(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StringValuePair_first_set(void * jarg1, char * jarg2) {
   std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -44427,7 +44440,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StringValuePair_first_set(void * jarg1, c
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_StringValuePair_first_get(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_StringValuePair_first_get(void * jarg1) {
   char * jresult ;
   std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
   std::string *result = 0 ;
@@ -44439,7 +44452,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_StringValuePair_first_get(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StringValuePair_second_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StringValuePair_second_set(void * jarg1, void * jarg2) {
   std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
   Dali::Property::Value *arg2 = (Dali::Property::Value *) 0 ;
   
@@ -44449,7 +44462,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StringValuePair_second_set(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StringValuePair_second_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StringValuePair_second_get(void * jarg1) {
   void * jresult ;
   std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
   Dali::Property::Value *result = 0 ;
@@ -44461,7 +44474,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StringValuePair_second_get(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_StringValuePair(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_StringValuePair(void * jarg1) {
   std::pair< std::string,Dali::Property::Value > *arg1 = (std::pair< std::string,Dali::Property::Value > *) 0 ;
   
   arg1 = (std::pair< std::string,Dali::Property::Value > *)jarg1; 
@@ -44485,7 +44498,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_StringValuePair(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Clear(void * jarg1) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   
   arg1 = (std::vector< Dali::TouchPoint > *)jarg1; 
@@ -44509,7 +44522,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Add(void * jarg1, void * jarg2) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   Dali::TouchPoint *arg2 = 0 ;
   
@@ -44539,7 +44552,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Add(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchPointContainer_size(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TouchPointContainer_size(void * jarg1) {
   unsigned long jresult ;
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   std::vector< Dali::TouchPoint >::size_type result;
@@ -44567,7 +44580,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchPointContainer_size(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchPointContainer_capacity(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TouchPointContainer_capacity(void * jarg1) {
   unsigned long jresult ;
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   std::vector< Dali::TouchPoint >::size_type result;
@@ -44595,7 +44608,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchPointContainer_capacity(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_reserve(void * jarg1, unsigned long jarg2) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   std::vector< Dali::TouchPoint >::size_type arg2 ;
   
@@ -44621,7 +44634,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_reserve(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPointContainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_0() {
   void * jresult ;
   std::vector< Dali::TouchPoint > *result = 0 ;
   
@@ -44647,7 +44660,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPointContainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPointContainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_1(void * jarg1) {
   void * jresult ;
   std::vector< Dali::TouchPoint > *arg1 = 0 ;
   std::vector< Dali::TouchPoint > *result = 0 ;
@@ -44679,7 +44692,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPointContainer__SWIG_1(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPointContainer__SWIG_2(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchPointContainer__SWIG_2(int jarg1) {
   void * jresult ;
   int arg1 ;
   std::vector< Dali::TouchPoint > *result = 0 ;
@@ -44714,7 +44727,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchPointContainer__SWIG_2(int jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPointContainer_getitemcopy(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_getitemcopy(void * jarg1, int jarg2) {
   void * jresult ;
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
@@ -44751,7 +44764,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPointContainer_getitemcopy(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPointContainer_getitem(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_getitem(void * jarg1, int jarg2) {
   void * jresult ;
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
@@ -44788,7 +44801,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPointContainer_getitem(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
   Dali::TouchPoint *arg3 = 0 ;
@@ -44827,7 +44840,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_setitem(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_AddRange(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_AddRange(void * jarg1, void * jarg2) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   std::vector< Dali::TouchPoint > *arg2 = 0 ;
   
@@ -44857,7 +44870,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_AddRange(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPointContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
@@ -44900,7 +44913,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPointContainer_GetRange(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
   Dali::TouchPoint *arg3 = 0 ;
@@ -44939,7 +44952,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Insert(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
   std::vector< Dali::TouchPoint > *arg3 = 0 ;
@@ -44978,7 +44991,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_InsertRange(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_RemoveAt(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_RemoveAt(void * jarg1, int jarg2) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
   
@@ -45011,7 +45024,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_RemoveAt(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -45050,7 +45063,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_RemoveRange(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPointContainer_Repeat(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TouchPointContainer_Repeat(void * jarg1, int jarg2) {
   void * jresult ;
   Dali::TouchPoint *arg1 = 0 ;
   int arg2 ;
@@ -45091,7 +45104,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TouchPointContainer_Repeat(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Reverse__SWIG_0(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Reverse__SWIG_0(void * jarg1) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   
   arg1 = (std::vector< Dali::TouchPoint > *)jarg1; 
@@ -45115,7 +45128,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Reverse__SWIG_0(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -45154,7 +45167,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_Reverse__SWIG_1(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchPointContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   int arg2 ;
   std::vector< Dali::TouchPoint > *arg3 = 0 ;
@@ -45193,7 +45206,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchPointContainer_SetRange(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchPointContainer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TouchPointContainer(void * jarg1) {
   std::vector< Dali::TouchPoint > *arg1 = (std::vector< Dali::TouchPoint > *) 0 ;
   
   arg1 = (std::vector< Dali::TouchPoint > *)jarg1; 
@@ -45217,7 +45230,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchPointContainer(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectDouble__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectDouble__SWIG_0() {
   void * jresult ;
   Dali::Rect< double > *result = 0 ;
   
@@ -45243,7 +45256,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectDouble__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectDouble__SWIG_1(double jarg1, double jarg2, double jarg3, double jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectDouble__SWIG_1(double jarg1, double jarg2, double jarg3, double jarg4) {
   void * jresult ;
   double arg1 ;
   double arg2 ;
@@ -45277,7 +45290,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectDouble__SWIG_1(double jarg1, do
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectDouble__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectDouble__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Rect< double > *arg1 = 0 ;
   Dali::Rect< double > *result = 0 ;
@@ -45309,7 +45322,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectDouble__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RectDouble_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RectDouble_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   Dali::Rect< double > *arg2 = 0 ;
@@ -45343,7 +45356,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RectDouble_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_Set(void * jarg1, double jarg2, double jarg3, double jarg4, double jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_Set(void * jarg1, double jarg2, double jarg3, double jarg4, double jarg5) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   double arg3 ;
@@ -45375,7 +45388,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_Set(void * jarg1, double jarg2
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectDouble_IsEmpty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectDouble_IsEmpty(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   bool result;
@@ -45403,7 +45416,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectDouble_IsEmpty(void * jarg1)
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Left(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_Left(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45431,7 +45444,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Left(void * jarg1) {
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Right(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_Right(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45459,7 +45472,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Right(void * jarg1) {
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Top(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_Top(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45487,7 +45500,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Top(void * jarg1) {
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Bottom(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_Bottom(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45515,7 +45528,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Bottom(void * jarg1) {
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Area(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_Area(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45543,7 +45556,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_Area(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectDouble_Intersects(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectDouble_Intersects(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   Dali::Rect< double > *arg2 = 0 ;
@@ -45577,7 +45590,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectDouble_Intersects(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectDouble_Contains(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectDouble_Contains(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   Dali::Rect< double > *arg2 = 0 ;
@@ -45611,7 +45624,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectDouble_Contains(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_x_set(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_x_set(void * jarg1, double jarg2) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   
@@ -45621,7 +45634,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_x_set(void * jarg1, double jar
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_x_get(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_x_get(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45633,7 +45646,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_x_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_left_set(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_left_set(void * jarg1, double jarg2) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   
@@ -45643,7 +45656,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_left_set(void * jarg1, double
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_left_get(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_left_get(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45655,7 +45668,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_left_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_y_set(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_y_set(void * jarg1, double jarg2) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   
@@ -45665,7 +45678,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_y_set(void * jarg1, double jar
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_y_get(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_y_get(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45677,7 +45690,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_y_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_right_set(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_right_set(void * jarg1, double jarg2) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   
@@ -45687,7 +45700,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_right_set(void * jarg1, double
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_right_get(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_right_get(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45699,7 +45712,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_right_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_width_set(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_width_set(void * jarg1, double jarg2) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   
@@ -45709,7 +45722,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_width_set(void * jarg1, double
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_width_get(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_width_get(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45721,7 +45734,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_width_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_bottom_set(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_bottom_set(void * jarg1, double jarg2) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   
@@ -45731,7 +45744,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_bottom_set(void * jarg1, doubl
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_bottom_get(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_bottom_get(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45743,7 +45756,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_bottom_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_height_set(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_height_set(void * jarg1, double jarg2) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   
@@ -45753,7 +45766,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_height_set(void * jarg1, doubl
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_height_get(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_height_get(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45765,7 +45778,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_height_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_top_set(void * jarg1, double jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectDouble_top_set(void * jarg1, double jarg2) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double arg2 ;
   
@@ -45775,7 +45788,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectDouble_top_set(void * jarg1, double j
 }
 
 
-SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_top_get(void * jarg1) {
+SWIGEXPORT double SWIGSTDCALL CSharp_Dali_RectDouble_top_get(void * jarg1) {
   double jresult ;
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   double result;
@@ -45787,7 +45800,7 @@ SWIGEXPORT double SWIGSTDCALL CSharp_NUI_RectDouble_top_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RectDouble(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RectDouble(void * jarg1) {
   Dali::Rect< double > *arg1 = (Dali::Rect< double > *) 0 ;
   
   arg1 = (Dali::Rect< double > *)jarg1; 
@@ -45811,7 +45824,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RectDouble(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectInteger__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectInteger__SWIG_0() {
   void * jresult ;
   Dali::Rect< int > *result = 0 ;
   
@@ -45837,7 +45850,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectInteger__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectInteger__SWIG_1(int jarg1, int jarg2, int jarg3, int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectInteger__SWIG_1(int jarg1, int jarg2, int jarg3, int jarg4) {
   void * jresult ;
   int arg1 ;
   int arg2 ;
@@ -45871,7 +45884,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectInteger__SWIG_1(int jarg1, int
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectInteger__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectInteger__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Rect< int > *arg1 = 0 ;
   Dali::Rect< int > *result = 0 ;
@@ -45903,7 +45916,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectInteger__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RectInteger_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RectInteger_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   Dali::Rect< int > *arg2 = 0 ;
@@ -45937,7 +45950,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RectInteger_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_Set(void * jarg1, int jarg2, int jarg3, int jarg4, int jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_Set(void * jarg1, int jarg2, int jarg3, int jarg4, int jarg5) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -45969,7 +45982,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_Set(void * jarg1, int jarg2,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectInteger_IsEmpty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectInteger_IsEmpty(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   bool result;
@@ -45997,7 +46010,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectInteger_IsEmpty(void * jarg1)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Left(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_Left(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46025,7 +46038,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Left(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Right(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_Right(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46053,7 +46066,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Right(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Top(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_Top(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46081,7 +46094,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Top(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Bottom(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_Bottom(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46109,7 +46122,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Bottom(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Area(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_Area(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46137,7 +46150,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_Area(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectInteger_Intersects(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectInteger_Intersects(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   Dali::Rect< int > *arg2 = 0 ;
@@ -46171,7 +46184,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectInteger_Intersects(void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectInteger_Contains(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectInteger_Contains(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   Dali::Rect< int > *arg2 = 0 ;
@@ -46205,7 +46218,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectInteger_Contains(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_x_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_x_set(void * jarg1, int jarg2) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   
@@ -46215,7 +46228,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_x_set(void * jarg1, int jarg2
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_x_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_x_get(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46227,7 +46240,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_x_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_left_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_left_set(void * jarg1, int jarg2) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   
@@ -46237,7 +46250,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_left_set(void * jarg1, int ja
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_left_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_left_get(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46249,7 +46262,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_left_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_y_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_y_set(void * jarg1, int jarg2) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   
@@ -46259,7 +46272,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_y_set(void * jarg1, int jarg2
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_y_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_y_get(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46271,7 +46284,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_y_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_right_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_right_set(void * jarg1, int jarg2) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   
@@ -46281,7 +46294,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_right_set(void * jarg1, int j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_right_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_right_get(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46293,7 +46306,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_right_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_width_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_width_set(void * jarg1, int jarg2) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   
@@ -46303,7 +46316,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_width_set(void * jarg1, int j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_width_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_width_get(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46315,7 +46328,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_width_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_bottom_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_bottom_set(void * jarg1, int jarg2) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   
@@ -46325,7 +46338,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_bottom_set(void * jarg1, int
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_bottom_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_bottom_get(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46337,7 +46350,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_bottom_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_height_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_height_set(void * jarg1, int jarg2) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   
@@ -46347,7 +46360,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_height_set(void * jarg1, int
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_height_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_height_get(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46359,7 +46372,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_height_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_top_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectInteger_top_set(void * jarg1, int jarg2) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int arg2 ;
   
@@ -46369,7 +46382,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectInteger_top_set(void * jarg1, int jar
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_top_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RectInteger_top_get(void * jarg1) {
   int jresult ;
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   int result;
@@ -46381,7 +46394,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RectInteger_top_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RectInteger(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RectInteger(void * jarg1) {
   Dali::Rect< int > *arg1 = (Dali::Rect< int > *) 0 ;
   
   arg1 = (Dali::Rect< int > *)jarg1; 
@@ -46405,7 +46418,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RectInteger(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectUnsignedInteger__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectUnsignedInteger__SWIG_0() {
   void * jresult ;
   Dali::Rect< unsigned int > *result = 0 ;
   
@@ -46431,7 +46444,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectUnsignedInteger__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectUnsignedInteger__SWIG_1(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectUnsignedInteger__SWIG_1(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -46465,7 +46478,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectUnsignedInteger__SWIG_1(unsigne
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectUnsignedInteger__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectUnsignedInteger__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Rect< unsigned int > *arg1 = 0 ;
   Dali::Rect< unsigned int > *result = 0 ;
@@ -46497,7 +46510,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectUnsignedInteger__SWIG_2(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   Dali::Rect< unsigned int > *arg2 = 0 ;
@@ -46531,7 +46544,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Assign(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Set(void * jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4, unsigned int jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Set(void * jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4, unsigned int jarg5) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   unsigned int arg3 ;
@@ -46563,7 +46576,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Set(void * jarg1, uns
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_IsEmpty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_IsEmpty(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   bool result;
@@ -46591,7 +46604,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_IsEmpty(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Left(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Left(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46619,7 +46632,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Left(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Right(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Right(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46647,7 +46660,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Right(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Top(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Top(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46675,7 +46688,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Top(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Bottom(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Bottom(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46703,7 +46716,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Bottom(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Area(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Area(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46731,7 +46744,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Area(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Intersects(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Intersects(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   Dali::Rect< unsigned int > *arg2 = 0 ;
@@ -46765,7 +46778,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Intersects(vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Contains(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_Contains(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   Dali::Rect< unsigned int > *arg2 = 0 ;
@@ -46799,7 +46812,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_Contains(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_x_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_x_set(void * jarg1, unsigned int jarg2) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   
@@ -46809,7 +46822,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_x_set(void * jarg1, u
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_x_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_x_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46821,7 +46834,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_x_get(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_left_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_left_set(void * jarg1, unsigned int jarg2) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   
@@ -46831,7 +46844,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_left_set(void * jarg1
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_left_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_left_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46843,7 +46856,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_left_get(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_y_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_y_set(void * jarg1, unsigned int jarg2) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   
@@ -46853,7 +46866,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_y_set(void * jarg1, u
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_y_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_y_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46865,7 +46878,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_y_get(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_right_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_right_set(void * jarg1, unsigned int jarg2) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   
@@ -46875,7 +46888,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_right_set(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_right_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_right_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46887,7 +46900,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_right_get(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_width_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_width_set(void * jarg1, unsigned int jarg2) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   
@@ -46897,7 +46910,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_width_set(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_width_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_width_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46909,7 +46922,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_width_get(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_bottom_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_bottom_set(void * jarg1, unsigned int jarg2) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   
@@ -46919,7 +46932,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_bottom_set(void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_bottom_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_bottom_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46931,7 +46944,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_bottom_get(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_height_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_height_set(void * jarg1, unsigned int jarg2) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   
@@ -46941,7 +46954,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_height_set(void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_height_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_height_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46953,7 +46966,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_height_get(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_top_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_top_set(void * jarg1, unsigned int jarg2) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int arg2 ;
   
@@ -46963,7 +46976,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_top_set(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_top_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectUnsignedInteger_top_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   unsigned int result;
@@ -46975,7 +46988,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectUnsignedInteger_top_get(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RectUnsignedInteger(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RectUnsignedInteger(void * jarg1) {
   Dali::Rect< unsigned int > *arg1 = (Dali::Rect< unsigned int > *) 0 ;
   
   arg1 = (Dali::Rect< unsigned int > *)jarg1; 
@@ -46999,7 +47012,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RectUnsignedInteger(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectFloat__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectFloat__SWIG_0() {
   void * jresult ;
   Dali::Rect< float > *result = 0 ;
   
@@ -47025,7 +47038,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectFloat__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectFloat__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectFloat__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -47059,7 +47072,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectFloat__SWIG_1(float jarg1, floa
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectFloat__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RectFloat__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Rect< float > *arg1 = 0 ;
   Dali::Rect< float > *result = 0 ;
@@ -47091,7 +47104,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RectFloat__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RectFloat_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RectFloat_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   Dali::Rect< float > *arg2 = 0 ;
@@ -47125,7 +47138,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RectFloat_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_Set(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_Set(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   float arg3 ;
@@ -47157,7 +47170,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_Set(void * jarg1, float jarg2,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectFloat_IsEmpty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectFloat_IsEmpty(void * jarg1) {
   unsigned int jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   bool result;
@@ -47185,7 +47198,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectFloat_IsEmpty(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Left(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_Left(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47213,7 +47226,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Left(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Right(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_Right(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47241,7 +47254,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Right(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Top(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_Top(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47269,7 +47282,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Top(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Bottom(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_Bottom(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47297,7 +47310,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Bottom(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Area(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_Area(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47325,7 +47338,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_Area(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectFloat_Intersects(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectFloat_Intersects(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   Dali::Rect< float > *arg2 = 0 ;
@@ -47359,7 +47372,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectFloat_Intersects(void * jarg1
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectFloat_Contains(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RectFloat_Contains(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   Dali::Rect< float > *arg2 = 0 ;
@@ -47393,7 +47406,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RectFloat_Contains(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_x_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_x_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   
@@ -47403,7 +47416,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_x_set(void * jarg1, float jarg2
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_x_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_x_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47415,7 +47428,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_x_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_left_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_left_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   
@@ -47425,7 +47438,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_left_set(void * jarg1, float ja
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_left_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_left_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47437,7 +47450,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_left_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_y_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_y_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   
@@ -47447,7 +47460,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_y_set(void * jarg1, float jarg2
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_y_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_y_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47459,7 +47472,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_y_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_right_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_right_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   
@@ -47469,7 +47482,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_right_set(void * jarg1, float j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_right_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_right_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47481,7 +47494,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_right_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_width_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_width_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   
@@ -47491,7 +47504,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_width_set(void * jarg1, float j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_width_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_width_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47503,7 +47516,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_width_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_bottom_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_bottom_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   
@@ -47513,7 +47526,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_bottom_set(void * jarg1, float
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_bottom_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_bottom_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47525,7 +47538,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_bottom_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_height_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_height_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   
@@ -47535,7 +47548,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_height_set(void * jarg1, float
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_height_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_height_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47547,7 +47560,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_height_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_top_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RectFloat_top_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
   
@@ -47557,7 +47570,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RectFloat_top_set(void * jarg1, float jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_top_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RectFloat_top_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
@@ -47569,7 +47582,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RectFloat_top_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RectFloat(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RectFloat(void * jarg1) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   
   arg1 = (Dali::Rect< float > *)jarg1; 
@@ -47593,7 +47606,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RectFloat(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VectorInteger_BaseType_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorInteger_BaseType_get() {
   int jresult ;
   int result;
   
@@ -47603,7 +47616,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VectorInteger_BaseType_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorInteger__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorInteger__SWIG_0() {
   void * jresult ;
   Dali::Vector< int > *result = 0 ;
   
@@ -47629,7 +47642,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorInteger__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VectorInteger(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorInteger(void * jarg1) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   
   arg1 = (Dali::Vector< int > *)jarg1; 
@@ -47653,7 +47666,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VectorInteger(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorInteger__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorInteger__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Vector< int > *arg1 = 0 ;
   Dali::Vector< int > *result = 0 ;
@@ -47685,7 +47698,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorInteger__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int > *arg2 = 0 ;
@@ -47719,7 +47732,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_Begin(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_Begin(void * jarg1) {
   void * jresult ;
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::Iterator result;
@@ -47747,7 +47760,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_Begin(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_End(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_End(void * jarg1) {
   void * jresult ;
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::Iterator result;
@@ -47775,7 +47788,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_End(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::SizeType arg2 ;
@@ -47805,7 +47818,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_ValueOfIndex__SWIG_0(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_PushBack(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_PushBack(void * jarg1, int jarg2) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::ItemType *arg2 = 0 ;
   Dali::Vector< int >::ItemType temp2 ;
@@ -47833,7 +47846,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_PushBack(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Insert__SWIG_0(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Insert__SWIG_0(void * jarg1, void * jarg2, int jarg3) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
   Dali::Vector< int >::ItemType *arg3 = 0 ;
@@ -47863,7 +47876,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Insert__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
   Dali::Vector< int >::Iterator arg3 = (Dali::Vector< int >::Iterator) 0 ;
@@ -47893,7 +47906,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Insert__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Reserve(void * jarg1, unsigned long jarg2) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::SizeType arg2 ;
   
@@ -47919,7 +47932,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Reserve(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::SizeType arg2 ;
   
@@ -47945,7 +47958,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Resize__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Resize__SWIG_1(void * jarg1, unsigned long jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Resize__SWIG_1(void * jarg1, unsigned long jarg2, int jarg3) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::SizeType arg2 ;
   Dali::Vector< int >::ItemType *arg3 = 0 ;
@@ -47975,7 +47988,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Resize__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_Erase__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_Erase__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
@@ -48005,7 +48018,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_Erase__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorInteger_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
@@ -48037,7 +48050,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorInteger_Erase__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Remove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Remove(void * jarg1, void * jarg2) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int >::Iterator arg2 = (Dali::Vector< int >::Iterator) 0 ;
   
@@ -48063,7 +48076,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Remove(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Swap(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Swap(void * jarg1, void * jarg2) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   Dali::Vector< int > *arg2 = 0 ;
   
@@ -48093,7 +48106,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Swap(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Clear(void * jarg1) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   
   arg1 = (Dali::Vector< int > *)jarg1; 
@@ -48117,7 +48130,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Release(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorInteger_Release(void * jarg1) {
   Dali::Vector< int > *arg1 = (Dali::Vector< int > *) 0 ;
   
   arg1 = (Dali::Vector< int > *)jarg1; 
@@ -48141,7 +48154,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorInteger_Release(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VectorFloat_BaseType_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorFloat_BaseType_get() {
   int jresult ;
   int result;
   
@@ -48151,7 +48164,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VectorFloat_BaseType_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorFloat__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorFloat__SWIG_0() {
   void * jresult ;
   Dali::Vector< float > *result = 0 ;
   
@@ -48177,7 +48190,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorFloat__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VectorFloat(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorFloat(void * jarg1) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   
   arg1 = (Dali::Vector< float > *)jarg1; 
@@ -48201,7 +48214,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VectorFloat(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorFloat__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorFloat__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Vector< float > *arg1 = 0 ;
   Dali::Vector< float > *result = 0 ;
@@ -48233,7 +48246,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorFloat__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float > *arg2 = 0 ;
@@ -48267,7 +48280,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_Begin(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Begin(void * jarg1) {
   void * jresult ;
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::Iterator result;
@@ -48295,7 +48308,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_Begin(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_End(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_End(void * jarg1) {
   void * jresult ;
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::Iterator result;
@@ -48323,7 +48336,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_End(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::SizeType arg2 ;
@@ -48353,7 +48366,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_ValueOfIndex__SWIG_0(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_PushBack(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_PushBack(void * jarg1, float jarg2) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::ItemType *arg2 = 0 ;
   Dali::Vector< float >::ItemType temp2 ;
@@ -48381,7 +48394,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_PushBack(void * jarg1, float
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Insert__SWIG_0(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Insert__SWIG_0(void * jarg1, void * jarg2, float jarg3) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
   Dali::Vector< float >::ItemType *arg3 = 0 ;
@@ -48411,7 +48424,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Insert__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
   Dali::Vector< float >::Iterator arg3 = (Dali::Vector< float >::Iterator) 0 ;
@@ -48441,7 +48454,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Insert__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Reserve(void * jarg1, unsigned long jarg2) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::SizeType arg2 ;
   
@@ -48467,7 +48480,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Reserve(void * jarg1, unsigne
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::SizeType arg2 ;
   
@@ -48493,7 +48506,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Resize__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Resize__SWIG_1(void * jarg1, unsigned long jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Resize__SWIG_1(void * jarg1, unsigned long jarg2, float jarg3) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::SizeType arg2 ;
   Dali::Vector< float >::ItemType *arg3 = 0 ;
@@ -48523,7 +48536,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Resize__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_Erase__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Erase__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
@@ -48553,7 +48566,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_Erase__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorFloat_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
@@ -48585,7 +48598,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorFloat_Erase__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Remove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Remove(void * jarg1, void * jarg2) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float >::Iterator arg2 = (Dali::Vector< float >::Iterator) 0 ;
   
@@ -48611,7 +48624,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Remove(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Swap(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Swap(void * jarg1, void * jarg2) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   Dali::Vector< float > *arg2 = 0 ;
   
@@ -48641,7 +48654,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Swap(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Clear(void * jarg1) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   
   arg1 = (Dali::Vector< float > *)jarg1; 
@@ -48665,7 +48678,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Release(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorFloat_Release(void * jarg1) {
   Dali::Vector< float > *arg1 = (Dali::Vector< float > *) 0 ;
   
   arg1 = (Dali::Vector< float > *)jarg1; 
@@ -48689,7 +48702,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorFloat_Release(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_BaseType_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_BaseType_get() {
   int jresult ;
   int result;
   
@@ -48699,7 +48712,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_BaseType_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorUnsignedChar__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUnsignedChar__SWIG_0() {
   void * jresult ;
   Dali::Vector< unsigned char > *result = 0 ;
   
@@ -48725,7 +48738,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorUnsignedChar__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VectorUnsignedChar(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorUnsignedChar(void * jarg1) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   
   arg1 = (Dali::Vector< unsigned char > *)jarg1; 
@@ -48749,7 +48762,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VectorUnsignedChar(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorUnsignedChar__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUnsignedChar__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Vector< unsigned char > *arg1 = 0 ;
   Dali::Vector< unsigned char > *result = 0 ;
@@ -48781,7 +48794,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorUnsignedChar__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char > *arg2 = 0 ;
@@ -48815,7 +48828,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Assign(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Begin(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Begin(void * jarg1) {
   void * jresult ;
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::Iterator result;
@@ -48843,7 +48856,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Begin(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_End(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_End(void * jarg1) {
   void * jresult ;
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::Iterator result;
@@ -48871,7 +48884,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_End(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::SizeType arg2 ;
@@ -48901,7 +48914,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_ValueOfIndex__SWIG_0
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_PushBack(void * jarg1, unsigned char jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_PushBack(void * jarg1, unsigned char jarg2) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::ItemType *arg2 = 0 ;
   Dali::Vector< unsigned char >::ItemType temp2 ;
@@ -48929,7 +48942,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_PushBack(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Insert__SWIG_0(void * jarg1, unsigned char* jarg2, unsigned char jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Insert__SWIG_0(void * jarg1, unsigned char* jarg2, unsigned char jarg3) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
   Dali::Vector< unsigned char >::ItemType *arg3 = 0 ;
@@ -48961,7 +48974,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Insert__SWIG_0(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Insert__SWIG_1(void * jarg1, unsigned char* jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Insert__SWIG_1(void * jarg1, unsigned char* jarg2, void * jarg3, void * jarg4) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
   Dali::Vector< unsigned char >::Iterator arg3 = (Dali::Vector< unsigned char >::Iterator) 0 ;
@@ -48993,7 +49006,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Insert__SWIG_1(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Reserve(void * jarg1, unsigned long jarg2) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::SizeType arg2 ;
   
@@ -49019,7 +49032,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Reserve(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::SizeType arg2 ;
   
@@ -49045,7 +49058,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Resize__SWIG_0(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Resize__SWIG_1(void * jarg1, unsigned long jarg2, unsigned char jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Resize__SWIG_1(void * jarg1, unsigned long jarg2, unsigned char jarg3) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::SizeType arg2 ;
   Dali::Vector< unsigned char >::ItemType *arg3 = 0 ;
@@ -49075,7 +49088,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Resize__SWIG_1(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Erase__SWIG_0(void * jarg1, unsigned char* jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Erase__SWIG_0(void * jarg1, unsigned char* jarg2) {
   void * jresult ;
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
@@ -49107,7 +49120,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Erase__SWIG_0(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Erase__SWIG_1(void * jarg1, unsigned char* jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Erase__SWIG_1(void * jarg1, unsigned char* jarg2, void * jarg3) {
   void * jresult ;
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
@@ -49141,7 +49154,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Erase__SWIG_1(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Remove(void * jarg1, unsigned char* jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Remove(void * jarg1, unsigned char* jarg2) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char >::Iterator arg2 = (Dali::Vector< unsigned char >::Iterator) 0 ;
   
@@ -49169,7 +49182,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Remove(void * jarg1, u
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Swap(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Swap(void * jarg1, void * jarg2) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   Dali::Vector< unsigned char > *arg2 = 0 ;
   
@@ -49199,7 +49212,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Swap(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Clear(void * jarg1) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   
   arg1 = (Dali::Vector< unsigned char > *)jarg1; 
@@ -49223,7 +49236,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Release(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUnsignedChar_Release(void * jarg1) {
   Dali::Vector< unsigned char > *arg1 = (Dali::Vector< unsigned char > *) 0 ;
   
   arg1 = (Dali::Vector< unsigned char > *)jarg1; 
@@ -49247,7 +49260,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUnsignedChar_Release(void * jarg1)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VectorUint16Pair_BaseType_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VectorUint16Pair_BaseType_get() {
   int jresult ;
   int result;
   
@@ -49257,7 +49270,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VectorUint16Pair_BaseType_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorUint16Pair__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUint16Pair__SWIG_0() {
   void * jresult ;
   Dali::Vector< Dali::Uint16Pair > *result = 0 ;
   
@@ -49283,7 +49296,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorUint16Pair__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VectorUint16Pair(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VectorUint16Pair(void * jarg1) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   
   arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1; 
@@ -49307,7 +49320,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VectorUint16Pair(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorUint16Pair__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VectorUint16Pair__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Vector< Dali::Uint16Pair > *arg1 = 0 ;
   Dali::Vector< Dali::Uint16Pair > *result = 0 ;
@@ -49339,7 +49352,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VectorUint16Pair__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair > *arg2 = 0 ;
@@ -49373,7 +49386,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Assign(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Begin(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Begin(void * jarg1) {
   void * jresult ;
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::Iterator result;
@@ -49401,7 +49414,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Begin(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_End(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_End(void * jarg1) {
   void * jresult ;
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::Iterator result;
@@ -49429,7 +49442,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_End(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_ValueOfIndex__SWIG_0(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
@@ -49459,7 +49472,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_ValueOfIndex__SWIG_0(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_PushBack(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_PushBack(void * jarg1, void * jarg2) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::ItemType *arg2 = 0 ;
   
@@ -49489,7 +49502,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_PushBack(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Insert__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Insert__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
   Dali::Vector< Dali::Uint16Pair >::ItemType *arg3 = 0 ;
@@ -49521,7 +49534,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Insert__SWIG_0(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Insert__SWIG_1(void * jarg1, void * jarg2, void * jarg3, void * jarg4) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
   Dali::Vector< Dali::Uint16Pair >::Iterator arg3 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
@@ -49551,7 +49564,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Insert__SWIG_1(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Reserve(void * jarg1, unsigned long jarg2) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
   
@@ -49577,7 +49590,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Reserve(void * jarg1, un
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Resize__SWIG_0(void * jarg1, unsigned long jarg2) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
   
@@ -49603,7 +49616,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Resize__SWIG_0(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Resize__SWIG_1(void * jarg1, unsigned long jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Resize__SWIG_1(void * jarg1, unsigned long jarg2, void * jarg3) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::SizeType arg2 ;
   Dali::Vector< Dali::Uint16Pair >::ItemType *arg3 = 0 ;
@@ -49635,7 +49648,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Resize__SWIG_1(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Erase__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Erase__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
@@ -49665,7 +49678,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Erase__SWIG_0(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Erase__SWIG_1(void * jarg1, void * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
@@ -49697,7 +49710,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Erase__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Remove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Remove(void * jarg1, void * jarg2) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair >::Iterator arg2 = (Dali::Vector< Dali::Uint16Pair >::Iterator) 0 ;
   
@@ -49723,7 +49736,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Remove(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Swap(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Swap(void * jarg1, void * jarg2) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   Dali::Vector< Dali::Uint16Pair > *arg2 = 0 ;
   
@@ -49753,7 +49766,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Swap(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Clear(void * jarg1) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   
   arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1; 
@@ -49777,7 +49790,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Release(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VectorUint16Pair_Release(void * jarg1) {
   Dali::Vector< Dali::Uint16Pair > *arg1 = (Dali::Vector< Dali::Uint16Pair > *) 0 ;
   
   arg1 = (Dali::Vector< Dali::Uint16Pair > *)jarg1; 
@@ -49801,7 +49814,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VectorUint16Pair_Release(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VoidSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VoidSignal() {
   void * jresult ;
   Dali::Signal< void () > *result = 0 ;
   
@@ -49827,7 +49840,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VoidSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VoidSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VoidSignal(void * jarg1) {
   Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   
   arg1 = (Dali::Signal< void () > *)jarg1; 
@@ -49851,7 +49864,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VoidSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_VoidSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_VoidSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   bool result;
@@ -49879,7 +49892,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_VoidSignal_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VoidSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VoidSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   std::size_t result;
@@ -49907,7 +49920,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VoidSignal_GetConnectionCount(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VoidSignal_Connect__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Connect__SWIG_0(void * jarg1, void * jarg2) {
   Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   void (*arg2)() = (void (*)()) 0 ;
   
@@ -49933,7 +49946,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VoidSignal_Connect__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VoidSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   void (*arg2)() = (void (*)()) 0 ;
   
@@ -49959,7 +49972,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VoidSignal_Disconnect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VoidSignal_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   Dali::ConnectionTrackerInterface *arg2 = (Dali::ConnectionTrackerInterface *) 0 ;
   Dali::FunctorDelegate *arg3 = (Dali::FunctorDelegate *) 0 ;
@@ -49987,7 +50000,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VoidSignal_Connect__SWIG_4(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VoidSignal_Emit(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Emit(void * jarg1) {
   Dali::Signal< void () > *arg1 = (Dali::Signal< void () > *) 0 ;
   
   arg1 = (Dali::Signal< void () > *)jarg1; 
@@ -50011,7 +50024,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VoidSignal_Emit(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BoolSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BoolSignal() {
   void * jresult ;
   Dali::Signal< bool () > *result = 0 ;
   
@@ -50037,7 +50050,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_BoolSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_BoolSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_BoolSignal(void * jarg1) {
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   
   arg1 = (Dali::Signal< bool () > *)jarg1; 
@@ -50061,7 +50074,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_BoolSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BoolSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BoolSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   bool result;
@@ -50089,7 +50102,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BoolSignal_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_BoolSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_BoolSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   std::size_t result;
@@ -50117,7 +50130,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_BoolSignal_GetConnectionCount(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BoolSignal_Connect__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BoolSignal_Connect__SWIG_0(void * jarg1, void * jarg2) {
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   bool (*arg2)() = (bool (*)()) 0 ;
   
@@ -50143,7 +50156,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BoolSignal_Connect__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BoolSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BoolSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   bool (*arg2)() = (bool (*)()) 0 ;
   
@@ -50169,7 +50182,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BoolSignal_Disconnect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BoolSignal_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BoolSignal_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   Dali::ConnectionTrackerInterface *arg2 = (Dali::ConnectionTrackerInterface *) 0 ;
   Dali::FunctorDelegate *arg3 = (Dali::FunctorDelegate *) 0 ;
@@ -50197,7 +50210,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_BoolSignal_Connect__SWIG_4(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BoolSignal_Emit(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BoolSignal_Emit(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   bool result;
@@ -50225,7 +50238,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_BoolSignal_Emit(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FloatSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_FloatSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
   bool result;
@@ -50253,7 +50266,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FloatSignal_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_FloatSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_FloatSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
   std::size_t result;
@@ -50281,7 +50294,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_FloatSignal_GetConnectionCount(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FloatSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
   void (*arg2)(float) = (void (*)(float)) 0 ;
   
@@ -50307,7 +50320,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FloatSignal_Connect(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FloatSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
   void (*arg2)(float) = (void (*)(float)) 0 ;
   
@@ -50333,7 +50346,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FloatSignal_Disconnect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FloatSignal_Emit(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FloatSignal_Emit(void * jarg1, float jarg2) {
   Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
   float arg2 ;
   
@@ -50359,7 +50372,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FloatSignal_Emit(void * jarg1, float jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FloatSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FloatSignal() {
   void * jresult ;
   Dali::Signal< void (float) > *result = 0 ;
   
@@ -50385,7 +50398,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FloatSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FloatSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FloatSignal(void * jarg1) {
   Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ;
   
   arg1 = (Dali::Signal< void (float) > *)jarg1; 
@@ -50409,7 +50422,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FloatSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
   bool result;
@@ -50437,7 +50450,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_Empty(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
   std::size_t result;
@@ -50465,7 +50478,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_GetConnectio
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
   void (*arg2)(Dali::BaseHandle) = (void (*)(Dali::BaseHandle)) 0 ;
   
@@ -50491,7 +50504,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_Connect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
   void (*arg2)(Dali::BaseHandle) = (void (*)(Dali::BaseHandle)) 0 ;
   
@@ -50517,7 +50530,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_Disconnect(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectCreatedSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
   Dali::BaseHandle arg2 ;
   Dali::BaseHandle *argp2 ;
@@ -50549,7 +50562,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectCreatedSignal_Emit(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ObjectCreatedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectCreatedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::BaseHandle) > *result = 0 ;
   
@@ -50575,7 +50588,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ObjectCreatedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ObjectCreatedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ObjectCreatedSignal(void * jarg1) {
   Dali::Signal< void (Dali::BaseHandle) > *arg1 = (Dali::Signal< void (Dali::BaseHandle) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::BaseHandle) > *)jarg1; 
@@ -50599,7 +50612,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ObjectCreatedSignal(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ObjectDestroyedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::RefObject const *) > *arg1 = (Dali::Signal< void (Dali::RefObject const *) > *) 0 ;
   bool result;
@@ -50627,7 +50640,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_Empty(void
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ObjectDestroyedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::RefObject const *) > *arg1 = (Dali::Signal< void (Dali::RefObject const *) > *) 0 ;
   std::size_t result;
@@ -50655,7 +50668,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_GetConnect
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectDestroyedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::RefObject const *) > *arg1 = (Dali::Signal< void (Dali::RefObject const *) > *) 0 ;
   void (*arg2)(Dali::RefObject const *) = (void (*)(Dali::RefObject const *)) 0 ;
   
@@ -50681,7 +50694,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_Connect(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectDestroyedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::RefObject const *) > *arg1 = (Dali::Signal< void (Dali::RefObject const *) > *) 0 ;
   void (*arg2)(Dali::RefObject const *) = (void (*)(Dali::RefObject const *)) 0 ;
   
@@ -50707,7 +50720,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_Disconnect(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ObjectDestroyedSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::RefObject const *) > *arg1 = (Dali::Signal< void (Dali::RefObject const *) > *) 0 ;
   Dali::RefObject *arg2 = (Dali::RefObject *) 0 ;
   
@@ -50733,7 +50746,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ObjectDestroyedSignal_Emit(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ObjectDestroyedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ObjectDestroyedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::RefObject const *) > *result = 0 ;
   
@@ -50759,7 +50772,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ObjectDestroyedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ObjectDestroyedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ObjectDestroyedSignal(void * jarg1) {
   Dali::Signal< void (Dali::RefObject const *) > *arg1 = (Dali::Signal< void (Dali::RefObject const *) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::RefObject const *) > *)jarg1; 
@@ -50783,7 +50796,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ObjectDestroyedSignal(void * jarg1
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
   bool result;
@@ -50811,7 +50824,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_Empty(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
   std::size_t result;
@@ -50839,7 +50852,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_GetConnecti
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
   void (*arg2)(Dali::PropertyNotification &) = (void (*)(Dali::PropertyNotification &)) 0 ;
   
@@ -50865,7 +50878,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_Connect(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
   void (*arg2)(Dali::PropertyNotification &) = (void (*)(Dali::PropertyNotification &)) 0 ;
   
@@ -50891,7 +50904,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_Disconnect(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PropertyNotifySignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
   Dali::PropertyNotification *arg2 = 0 ;
   
@@ -50921,7 +50934,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PropertyNotifySignal_Emit(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyNotifySignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PropertyNotifySignal() {
   void * jresult ;
   Dali::Signal< void (Dali::PropertyNotification &) > *result = 0 ;
   
@@ -50947,7 +50960,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PropertyNotifySignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyNotifySignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PropertyNotifySignal(void * jarg1) {
   Dali::Signal< void (Dali::PropertyNotification &) > *arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::PropertyNotification &) > *)jarg1; 
@@ -50971,7 +50984,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PropertyNotifySignal(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ImageSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ImageSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Image) > *arg1 = (Dali::Signal< void (Dali::Image) > *) 0 ;
   bool result;
@@ -50999,7 +51012,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ImageSignal_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ImageSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ImageSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Image) > *arg1 = (Dali::Signal< void (Dali::Image) > *) 0 ;
   std::size_t result;
@@ -51027,7 +51040,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ImageSignal_GetConnectionCount(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Image) > *arg1 = (Dali::Signal< void (Dali::Image) > *) 0 ;
   void (*arg2)(Dali::Image) = (void (*)(Dali::Image)) 0 ;
   
@@ -51053,7 +51066,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageSignal_Connect(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Image) > *arg1 = (Dali::Signal< void (Dali::Image) > *) 0 ;
   void (*arg2)(Dali::Image) = (void (*)(Dali::Image)) 0 ;
   
@@ -51079,7 +51092,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageSignal_Disconnect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Image) > *arg1 = (Dali::Signal< void (Dali::Image) > *) 0 ;
   Dali::Image arg2 ;
   Dali::Image *argp2 ;
@@ -51111,7 +51124,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageSignal_Emit(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ImageSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ImageSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Image) > *result = 0 ;
   
@@ -51137,7 +51150,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ImageSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ImageSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ImageSignal(void * jarg1) {
   Dali::Signal< void (Dali::Image) > *arg1 = (Dali::Signal< void (Dali::Image) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Image) > *)jarg1; 
@@ -51161,7 +51174,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ImageSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTaskSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RenderTaskSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::RenderTask &) > *result = 0 ;
   
@@ -51187,7 +51200,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RenderTaskSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RenderTaskSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RenderTaskSignal(void * jarg1) {
   Dali::Signal< void (Dali::RenderTask &) > *arg1 = (Dali::Signal< void (Dali::RenderTask &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::RenderTask &) > *)jarg1; 
@@ -51211,7 +51224,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RenderTaskSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   bool result;
@@ -51239,7 +51252,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_Em
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   std::size_t result;
@@ -51267,7 +51280,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_G
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::LongPressGesture const &) = (void (*)(Dali::Actor,Dali::LongPressGesture const &)) 0 ;
   
@@ -51293,7 +51306,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_Connect(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::LongPressGesture const &) = (void (*)(Dali::Actor,Dali::LongPressGesture const &)) 0 ;
   
@@ -51319,7 +51332,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_Disconnect
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LongPressGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   Dali::Actor arg2 ;
   Dali::LongPressGesture *arg3 = 0 ;
@@ -51357,7 +51370,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_LongPressGestureDetectedSignal_Emit(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGestureDetectedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGestureDetectedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *result = 0 ;
   
@@ -51383,7 +51396,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_LongPressGestureDetectedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LongPressGestureDetectedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LongPressGestureDetectedSignal(void * jarg1) {
   Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Actor,Dali::LongPressGesture const &) > *)jarg1; 
@@ -51407,7 +51420,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_LongPressGestureDetectedSignal(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *) 0 ;
   bool result;
@@ -51435,7 +51448,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_Empty(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *) 0 ;
   std::size_t result;
@@ -51463,7 +51476,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_GetConnecti
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *) 0 ;
   bool (*arg2)(Dali::Actor,Dali::TouchData const &) = (bool (*)(Dali::Actor,Dali::TouchData const &)) 0 ;
   
@@ -51489,7 +51502,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_Connect(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *) 0 ;
   bool (*arg2)(Dali::Actor,Dali::TouchData const &) = (bool (*)(Dali::Actor,Dali::TouchData const &)) 0 ;
   
@@ -51515,7 +51528,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_Disconnect(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *) 0 ;
   Dali::Actor arg2 ;
@@ -51557,7 +51570,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorTouchDataSignal_Emit(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorTouchDataSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorTouchDataSignal() {
   void * jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *result = 0 ;
   
@@ -51583,7 +51596,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorTouchDataSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorTouchDataSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorTouchDataSignal(void * jarg1) {
   Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *) 0 ;
   
   arg1 = (Dali::Signal< bool (Dali::Actor,Dali::TouchData const &) > *)jarg1; 
@@ -51607,7 +51620,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorTouchDataSignal(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ActorHoverSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *) 0 ;
   bool result;
@@ -51635,7 +51648,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_Empty(void
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorHoverSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *) 0 ;
   std::size_t result;
@@ -51663,7 +51676,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_GetConnect
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorHoverSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *) 0 ;
   bool (*arg2)(Dali::Actor,Dali::HoverEvent const &) = (bool (*)(Dali::Actor,Dali::HoverEvent const &)) 0 ;
   
@@ -51689,7 +51702,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_Connect(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorHoverSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *) 0 ;
   bool (*arg2)(Dali::Actor,Dali::HoverEvent const &) = (bool (*)(Dali::Actor,Dali::HoverEvent const &)) 0 ;
   
@@ -51715,7 +51728,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_Disconnect(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ActorHoverSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *) 0 ;
   Dali::Actor arg2 ;
@@ -51757,7 +51770,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorHoverEventSignal_Emit(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorHoverEventSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorHoverSignal() {
   void * jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *result = 0 ;
   
@@ -51783,7 +51796,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorHoverEventSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorHoverEventSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorHoverSignal(void * jarg1) {
   Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *) 0 ;
   
   arg1 = (Dali::Signal< bool (Dali::Actor,Dali::HoverEvent const &) > *)jarg1; 
@@ -51807,7 +51820,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorHoverEventSignal(void * jarg1
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ActorWheelSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *) 0 ;
   bool result;
@@ -51835,7 +51848,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_Empty(void
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorWheelSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *) 0 ;
   std::size_t result;
@@ -51863,7 +51876,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_GetConnect
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorWheelSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *) 0 ;
   bool (*arg2)(Dali::Actor,Dali::WheelEvent const &) = (bool (*)(Dali::Actor,Dali::WheelEvent const &)) 0 ;
   
@@ -51889,7 +51902,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_Connect(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorWheelSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *) 0 ;
   bool (*arg2)(Dali::Actor,Dali::WheelEvent const &) = (bool (*)(Dali::Actor,Dali::WheelEvent const &)) 0 ;
   
@@ -51915,7 +51928,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_Disconnect(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ActorWheelSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *) 0 ;
   Dali::Actor arg2 ;
@@ -51957,7 +51970,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorWheelEventSignal_Emit(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorWheelEventSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorWheelSignal() {
   void * jresult ;
   Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *result = 0 ;
   
@@ -51983,7 +51996,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorWheelEventSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorWheelEventSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorWheelSignal(void * jarg1) {
   Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *) 0 ;
   
   arg1 = (Dali::Signal< bool (Dali::Actor,Dali::WheelEvent const &) > *)jarg1; 
@@ -52007,7 +52020,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorWheelEventSignal(void * jarg1
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ActorSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor) > *) 0 ;
   bool result;
@@ -52035,7 +52048,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ActorSignal_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor) > *) 0 ;
   std::size_t result;
@@ -52063,7 +52076,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorSignal_GetConnectionCount(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor) > *) 0 ;
   void (*arg2)(Dali::Actor) = (void (*)(Dali::Actor)) 0 ;
   
@@ -52089,7 +52102,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorSignal_Connect(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor) > *) 0 ;
   void (*arg2)(Dali::Actor) = (void (*)(Dali::Actor)) 0 ;
   
@@ -52115,7 +52128,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorSignal_Disconnect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor) > *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -52147,7 +52160,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorSignal_Emit(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Actor) > *result = 0 ;
   
@@ -52173,7 +52186,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorSignal(void * jarg1) {
   Dali::Signal< void (Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Actor) > *)jarg1; 
@@ -52197,7 +52210,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyEventSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_KeyEventSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
   bool result;
@@ -52225,7 +52238,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyEventSignal_Empty(void * jarg1
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_KeyEventSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_KeyEventSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
   std::size_t result;
@@ -52253,7 +52266,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_KeyEventSignal_GetConnectionCoun
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEventSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
   void (*arg2)(Dali::KeyEvent const &) = (void (*)(Dali::KeyEvent const &)) 0 ;
   
@@ -52279,7 +52292,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEventSignal_Connect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEventSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
   void (*arg2)(Dali::KeyEvent const &) = (void (*)(Dali::KeyEvent const &)) 0 ;
   
@@ -52305,7 +52318,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEventSignal_Disconnect(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEventSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyEventSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
   Dali::KeyEvent *arg2 = 0 ;
   
@@ -52335,7 +52348,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyEventSignal_Emit(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyEventSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyEventSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::KeyEvent const &) > *result = 0 ;
   
@@ -52361,7 +52374,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyEventSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyEventSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyEventSignal(void * jarg1) {
   Dali::Signal< void (Dali::KeyEvent const &) > *arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::KeyEvent const &) > *)jarg1; 
@@ -52385,7 +52398,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyEventSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TouchSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TouchSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::TouchData const &) > *arg1 = (Dali::Signal< void (Dali::TouchData const &) > *) 0 ;
   bool result;
@@ -52413,7 +52426,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TouchSignal_Empty(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TouchSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::TouchData const &) > *arg1 = (Dali::Signal< void (Dali::TouchData const &) > *) 0 ;
   std::size_t result;
@@ -52441,7 +52454,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TouchSignal_GetConnectionCount(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::TouchData const &) > *arg1 = (Dali::Signal< void (Dali::TouchData const &) > *) 0 ;
   void (*arg2)(Dali::TouchData const &) = (void (*)(Dali::TouchData const &)) 0 ;
   
@@ -52467,7 +52480,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchSignal_Connect(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::TouchData const &) > *arg1 = (Dali::Signal< void (Dali::TouchData const &) > *) 0 ;
   void (*arg2)(Dali::TouchData const &) = (void (*)(Dali::TouchData const &)) 0 ;
   
@@ -52493,7 +52506,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchSignal_Disconnect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::TouchData const &) > *arg1 = (Dali::Signal< void (Dali::TouchData const &) > *) 0 ;
   Dali::TouchData *arg2 = 0 ;
   
@@ -52523,7 +52536,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TouchSignal_Emit(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::TouchData const &) > *result = 0 ;
   
@@ -52549,7 +52562,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TouchSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TouchSignal(void * jarg1) {
   Dali::Signal< void (Dali::TouchData const &) > *arg1 = (Dali::Signal< void (Dali::TouchData const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::TouchData const &) > *)jarg1; 
@@ -52573,7 +52586,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TouchSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_StageWheelSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
   bool result;
@@ -52601,7 +52614,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_Empty(void
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_StageWheelSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
   std::size_t result;
@@ -52629,7 +52642,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_GetConnect
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
   void (*arg2)(Dali::WheelEvent const &) = (void (*)(Dali::WheelEvent const &)) 0 ;
   
@@ -52655,7 +52668,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_Connect(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
   void (*arg2)(Dali::WheelEvent const &) = (void (*)(Dali::WheelEvent const &)) 0 ;
   
@@ -52681,7 +52694,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_Disconnect(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StageWheelSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
   Dali::WheelEvent *arg2 = 0 ;
   
@@ -52711,7 +52724,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StageWheelEventSignal_Emit(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StageWheelEventSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StageWheelSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::WheelEvent const &) > *result = 0 ;
   
@@ -52737,7 +52750,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StageWheelEventSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_StageWheelEventSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_StageWheelSignal(void * jarg1) {
   Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *)jarg1; 
@@ -52761,7 +52774,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_StageWheelEventSignal(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleThresholdPair__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_0() {
   void * jresult ;
   std::pair< Dali::Radian,Dali::Radian > *result = 0 ;
   
@@ -52787,7 +52800,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleThresholdPair__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleThresholdPair__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Radian arg1 ;
   Dali::Radian arg2 ;
@@ -52829,7 +52842,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleThresholdPair__SWIG_1(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleThresholdPair__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AngleThresholdPair__SWIG_2(void * jarg1) {
   void * jresult ;
   std::pair< Dali::Radian,Dali::Radian > *arg1 = 0 ;
   std::pair< Dali::Radian,Dali::Radian > *result = 0 ;
@@ -52861,7 +52874,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AngleThresholdPair__SWIG_2(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AngleThresholdPair_first_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleThresholdPair_first_set(void * jarg1, void * jarg2) {
   std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
   Dali::Radian *arg2 = (Dali::Radian *) 0 ;
   
@@ -52871,7 +52884,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AngleThresholdPair_first_set(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AngleThresholdPair_first_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleThresholdPair_first_get(void * jarg1) {
   void * jresult ;
   std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
   Dali::Radian *result = 0 ;
@@ -52883,7 +52896,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AngleThresholdPair_first_get(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AngleThresholdPair_second_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AngleThresholdPair_second_set(void * jarg1, void * jarg2) {
   std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
   Dali::Radian *arg2 = (Dali::Radian *) 0 ;
   
@@ -52893,7 +52906,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AngleThresholdPair_second_set(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AngleThresholdPair_second_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AngleThresholdPair_second_get(void * jarg1) {
   void * jresult ;
   std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
   Dali::Radian *result = 0 ;
@@ -52905,7 +52918,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AngleThresholdPair_second_get(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AngleThresholdPair(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AngleThresholdPair(void * jarg1) {
   std::pair< Dali::Radian,Dali::Radian > *arg1 = (std::pair< Dali::Radian,Dali::Radian > *) 0 ;
   
   arg1 = (std::pair< Dali::Radian,Dali::Radian > *)jarg1; 
@@ -52929,7 +52942,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AngleThresholdPair(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
   bool result;
@@ -52957,7 +52970,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_Empty(vo
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
   std::size_t result;
@@ -52985,7 +52998,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_GetConn
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::PanGesture const &) = (void (*)(Dali::Actor,Dali::PanGesture const &)) 0 ;
   
@@ -53011,7 +53024,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_Connect(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::PanGesture const &) = (void (*)(Dali::Actor,Dali::PanGesture const &)) 0 ;
   
@@ -53037,7 +53050,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_Disconnect(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PanGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
   Dali::Actor arg2 ;
   Dali::PanGesture *arg3 = 0 ;
@@ -53075,7 +53088,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PanGestureDetectedSignal_Emit(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGestureDetectedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGestureDetectedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *result = 0 ;
   
@@ -53101,7 +53114,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PanGestureDetectedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PanGestureDetectedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PanGestureDetectedSignal(void * jarg1) {
   Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Actor,Dali::PanGesture const &) > *)jarg1; 
@@ -53125,7 +53138,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PanGestureDetectedSignal(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
   bool result;
@@ -53153,7 +53166,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_Empty(
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
   std::size_t result;
@@ -53181,7 +53194,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_GetCo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::PinchGesture const &) = (void (*)(Dali::Actor,Dali::PinchGesture const &)) 0 ;
   
@@ -53207,7 +53220,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_Connect(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::PinchGesture const &) = (void (*)(Dali::Actor,Dali::PinchGesture const &)) 0 ;
   
@@ -53233,7 +53246,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_Disconnect(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PinchGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
   Dali::Actor arg2 ;
   Dali::PinchGesture *arg3 = 0 ;
@@ -53271,7 +53284,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PinchGestureDetectedSignal_Emit(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGestureDetectedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGestureDetectedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *result = 0 ;
   
@@ -53297,7 +53310,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PinchGestureDetectedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PinchGestureDetectedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PinchGestureDetectedSignal(void * jarg1) {
   Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Actor,Dali::PinchGesture const &) > *)jarg1; 
@@ -53321,7 +53334,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PinchGestureDetectedSignal(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
   bool result;
@@ -53349,7 +53362,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_Empty(vo
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
   std::size_t result;
@@ -53377,7 +53390,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_GetConn
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::TapGesture const &) = (void (*)(Dali::Actor,Dali::TapGesture const &)) 0 ;
   
@@ -53403,7 +53416,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_Connect(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::TapGesture const &) = (void (*)(Dali::Actor,Dali::TapGesture const &)) 0 ;
   
@@ -53429,7 +53442,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_Disconnect(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TapGestureDetectedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
   Dali::Actor arg2 ;
   Dali::TapGesture *arg3 = 0 ;
@@ -53467,7 +53480,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TapGestureDetectedSignal_Emit(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGestureDetectedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGestureDetectedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *result = 0 ;
   
@@ -53493,7 +53506,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TapGestureDetectedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TapGestureDetectedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TapGestureDetectedSignal(void * jarg1) {
   Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Actor,Dali::TapGesture const &) > *)jarg1; 
@@ -53517,7 +53530,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TapGestureDetectedSignal(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AnimationSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AnimationSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Animation &) > *arg1 = (Dali::Signal< void (Dali::Animation &) > *) 0 ;
   bool result;
@@ -53545,7 +53558,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AnimationSignal_Empty(void * jarg
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_AnimationSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_AnimationSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Animation &) > *arg1 = (Dali::Signal< void (Dali::Animation &) > *) 0 ;
   std::size_t result;
@@ -53573,7 +53586,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_AnimationSignal_GetConnectionCou
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AnimationSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AnimationSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Animation &) > *arg1 = (Dali::Signal< void (Dali::Animation &) > *) 0 ;
   void (*arg2)(Dali::Animation &) = (void (*)(Dali::Animation &)) 0 ;
   
@@ -53599,7 +53612,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AnimationSignal_Connect(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AnimationSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AnimationSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Animation &) > *arg1 = (Dali::Signal< void (Dali::Animation &) > *) 0 ;
   void (*arg2)(Dali::Animation &) = (void (*)(Dali::Animation &)) 0 ;
   
@@ -53625,7 +53638,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AnimationSignal_Disconnect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AnimationSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AnimationSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Animation &) > *arg1 = (Dali::Signal< void (Dali::Animation &) > *) 0 ;
   Dali::Animation *arg2 = 0 ;
   
@@ -53655,7 +53668,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AnimationSignal_Emit(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimationSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AnimationSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Animation &) > *result = 0 ;
   
@@ -53681,7 +53694,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AnimationSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AnimationSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AnimationSignal(void * jarg1) {
   Dali::Signal< void (Dali::Animation &) > *arg1 = (Dali::Signal< void (Dali::Animation &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Animation &) > *)jarg1; 
@@ -53705,7 +53718,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AnimationSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ResourceImageSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ResourceImageSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::ResourceImage) > *arg1 = (Dali::Signal< void (Dali::ResourceImage) > *) 0 ;
   bool result;
@@ -53733,7 +53746,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ResourceImageSignal_Empty(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ResourceImageSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ResourceImageSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::ResourceImage) > *arg1 = (Dali::Signal< void (Dali::ResourceImage) > *) 0 ;
   std::size_t result;
@@ -53761,7 +53774,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ResourceImageSignal_GetConnectio
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ResourceImageSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResourceImageSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::ResourceImage) > *arg1 = (Dali::Signal< void (Dali::ResourceImage) > *) 0 ;
   void (*arg2)(Dali::ResourceImage) = (void (*)(Dali::ResourceImage)) 0 ;
   
@@ -53787,7 +53800,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ResourceImageSignal_Connect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ResourceImageSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResourceImageSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::ResourceImage) > *arg1 = (Dali::Signal< void (Dali::ResourceImage) > *) 0 ;
   void (*arg2)(Dali::ResourceImage) = (void (*)(Dali::ResourceImage)) 0 ;
   
@@ -53813,7 +53826,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ResourceImageSignal_Disconnect(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ResourceImageSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResourceImageSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::ResourceImage) > *arg1 = (Dali::Signal< void (Dali::ResourceImage) > *) 0 ;
   Dali::ResourceImage arg2 ;
   Dali::ResourceImage *argp2 ;
@@ -53845,7 +53858,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ResourceImageSignal_Emit(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ResourceImageSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ResourceImageSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::ResourceImage) > *result = 0 ;
   
@@ -53871,7 +53884,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ResourceImageSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ResourceImageSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ResourceImageSignal(void * jarg1) {
   Dali::Signal< void (Dali::ResourceImage) > *arg1 = (Dali::Signal< void (Dali::ResourceImage) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::ResourceImage) > *)jarg1; 
@@ -53895,7 +53908,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ResourceImageSignal(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Timer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Timer__SWIG_0() {
   void * jresult ;
   Dali::Timer *result = 0 ;
   
@@ -53921,7 +53934,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Timer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Timer_New(unsigned int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Timer_New(unsigned int jarg1) {
   void * jresult ;
   unsigned int arg1 ;
   Dali::Timer result;
@@ -53949,7 +53962,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Timer_New(unsigned int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Timer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Timer__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Timer *arg1 = 0 ;
   Dali::Timer *result = 0 ;
@@ -53981,7 +53994,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Timer__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Timer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Timer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Timer *arg1 = (Dali::Timer *) 0 ;
   Dali::Timer *arg2 = 0 ;
@@ -54015,7 +54028,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Timer_Assign(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Timer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Timer(void * jarg1) {
   Dali::Timer *arg1 = (Dali::Timer *) 0 ;
   
   arg1 = (Dali::Timer *)jarg1; 
@@ -54039,7 +54052,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Timer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Timer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Timer_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -54073,7 +54086,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Timer_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Timer_Start(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Timer_Start(void * jarg1) {
   Dali::Timer *arg1 = (Dali::Timer *) 0 ;
   
   arg1 = (Dali::Timer *)jarg1; 
@@ -54097,7 +54110,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Timer_Start(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Timer_Stop(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Timer_Stop(void * jarg1) {
   Dali::Timer *arg1 = (Dali::Timer *) 0 ;
   
   arg1 = (Dali::Timer *)jarg1; 
@@ -54121,7 +54134,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Timer_Stop(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Timer_SetInterval(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Timer_SetInterval(void * jarg1, unsigned int jarg2) {
   Dali::Timer *arg1 = (Dali::Timer *) 0 ;
   unsigned int arg2 ;
   
@@ -54147,7 +54160,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Timer_SetInterval(void * jarg1, unsigned
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Timer_GetInterval(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Timer_GetInterval(void * jarg1) {
   unsigned int jresult ;
   Dali::Timer *arg1 = (Dali::Timer *) 0 ;
   unsigned int result;
@@ -54175,7 +54188,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Timer_GetInterval(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Timer_IsRunning(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Timer_IsRunning(void * jarg1) {
   unsigned int jresult ;
   Dali::Timer *arg1 = (Dali::Timer *) 0 ;
   bool result;
@@ -54203,7 +54216,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Timer_IsRunning(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Timer_TickSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Timer_TickSignal(void * jarg1) {
   void * jresult ;
   Dali::Timer *arg1 = (Dali::Timer *) 0 ;
   Dali::Timer::TimerSignalType *result = 0 ;
@@ -54231,7 +54244,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Timer_TickSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_DragAndDropDetector() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_DragAndDropDetector() {
   void * jresult ;
   Dali::DragAndDropDetector *result = 0 ;
   
@@ -54257,7 +54270,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_DragAndDropDetector() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_DragAndDropDetector(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_DragAndDropDetector(void * jarg1) {
   Dali::DragAndDropDetector *arg1 = (Dali::DragAndDropDetector *) 0 ;
   
   arg1 = (Dali::DragAndDropDetector *)jarg1; 
@@ -54281,7 +54294,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_DragAndDropDetector(void * jarg1)
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_GetContent(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_DragAndDropDetector_GetContent(void * jarg1) {
   char * jresult ;
   Dali::DragAndDropDetector *arg1 = (Dali::DragAndDropDetector *) 0 ;
   std::string *result = 0 ;
@@ -54309,7 +54322,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_GetContent(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_GetCurrentScreenPosition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_DragAndDropDetector_GetCurrentScreenPosition(void * jarg1) {
   void * jresult ;
   Dali::DragAndDropDetector *arg1 = (Dali::DragAndDropDetector *) 0 ;
   Dali::Vector2 result;
@@ -54337,7 +54350,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_GetCurrentScreenPos
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_EnteredSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_DragAndDropDetector_EnteredSignal(void * jarg1) {
   void * jresult ;
   Dali::DragAndDropDetector *arg1 = (Dali::DragAndDropDetector *) 0 ;
   Dali::DragAndDropDetector::DragAndDropSignal *result = 0 ;
@@ -54365,7 +54378,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_EnteredSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_ExitedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_DragAndDropDetector_ExitedSignal(void * jarg1) {
   void * jresult ;
   Dali::DragAndDropDetector *arg1 = (Dali::DragAndDropDetector *) 0 ;
   Dali::DragAndDropDetector::DragAndDropSignal *result = 0 ;
@@ -54393,7 +54406,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_ExitedSignal(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_MovedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_DragAndDropDetector_MovedSignal(void * jarg1) {
   void * jresult ;
   Dali::DragAndDropDetector *arg1 = (Dali::DragAndDropDetector *) 0 ;
   Dali::DragAndDropDetector::DragAndDropSignal *result = 0 ;
@@ -54421,7 +54434,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_MovedSignal(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_DroppedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_DragAndDropDetector_DroppedSignal(void * jarg1) {
   void * jresult ;
   Dali::DragAndDropDetector *arg1 = (Dali::DragAndDropDetector *) 0 ;
   Dali::DragAndDropDetector::DragAndDropSignal *result = 0 ;
@@ -54449,7 +54462,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_DroppedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ApplicationExtensions__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ApplicationExtensions__SWIG_0() {
   void * jresult ;
   Dali::ApplicationExtensions *result = 0 ;
   
@@ -54475,7 +54488,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ApplicationExtensions__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ApplicationExtensions__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ApplicationExtensions__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::ApplicationExtensions *result = 0 ;
@@ -54503,7 +54516,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ApplicationExtensions__SWIG_1(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ApplicationExtensions(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ApplicationExtensions(void * jarg1) {
   Dali::ApplicationExtensions *arg1 = (Dali::ApplicationExtensions *) 0 ;
   
   arg1 = (Dali::ApplicationExtensions *)jarg1; 
@@ -54527,7 +54540,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ApplicationExtensions(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_Init(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationExtensions_Init(void * jarg1) {
   Dali::ApplicationExtensions *arg1 = (Dali::ApplicationExtensions *) 0 ;
   
   arg1 = (Dali::ApplicationExtensions *)jarg1; 
@@ -54551,7 +54564,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_Init(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_Terminate(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationExtensions_Terminate(void * jarg1) {
   Dali::ApplicationExtensions *arg1 = (Dali::ApplicationExtensions *) 0 ;
   
   arg1 = (Dali::ApplicationExtensions *)jarg1; 
@@ -54575,7 +54588,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_Terminate(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_Pause(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationExtensions_Pause(void * jarg1) {
   Dali::ApplicationExtensions *arg1 = (Dali::ApplicationExtensions *) 0 ;
   
   arg1 = (Dali::ApplicationExtensions *)jarg1; 
@@ -54599,7 +54612,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_Pause(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_Resume(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationExtensions_Resume(void * jarg1) {
   Dali::ApplicationExtensions *arg1 = (Dali::ApplicationExtensions *) 0 ;
   
   arg1 = (Dali::ApplicationExtensions *)jarg1; 
@@ -54623,7 +54636,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_Resume(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_LanguageChange(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationExtensions_LanguageChange(void * jarg1) {
   Dali::ApplicationExtensions *arg1 = (Dali::ApplicationExtensions *) 0 ;
   
   arg1 = (Dali::ApplicationExtensions *)jarg1; 
@@ -54647,7 +54660,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationExtensions_LanguageChange(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_New__SWIG_0(void * jarg1, char * jarg2, unsigned int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_0(void * jarg1, char * jarg2, unsigned int jarg3) {
   void * jresult ;
   Dali::PositionSize arg1 ;
   std::string *arg2 = 0 ;
@@ -54693,7 +54706,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_New__SWIG_0(void * jarg1, char *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_New__SWIG_1(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_1(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::PositionSize arg1 ;
   std::string *arg2 = 0 ;
@@ -54737,7 +54750,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_New__SWIG_1(void * jarg1, char *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_New__SWIG_2(void * jarg1, char * jarg2, char * jarg3, unsigned int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_2(void * jarg1, char * jarg2, char * jarg3, unsigned int jarg4) {
   void * jresult ;
   Dali::PositionSize arg1 ;
   std::string *arg2 = 0 ;
@@ -54793,7 +54806,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_New__SWIG_2(void * jarg1, char *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_New__SWIG_3(void * jarg1, char * jarg2, char * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_New__SWIG_3(void * jarg1, char * jarg2, char * jarg3) {
   void * jresult ;
   Dali::PositionSize arg1 ;
   std::string *arg2 = 0 ;
@@ -54847,7 +54860,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_New__SWIG_3(void * jarg1, char *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Window__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Window__SWIG_0() {
   void * jresult ;
   Dali::Window *result = 0 ;
   
@@ -54873,7 +54886,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Window__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Window(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Window(void * jarg1) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   
   arg1 = (Dali::Window *)jarg1; 
@@ -54897,7 +54910,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Window(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Window__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Window__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Window *arg1 = 0 ;
   Dali::Window *result = 0 ;
@@ -54929,7 +54942,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Window__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window *arg2 = 0 ;
@@ -54963,7 +54976,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_Assign(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_ShowIndicator(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_ShowIndicator(void * jarg1, int jarg2) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window::IndicatorVisibleMode arg2 ;
   
@@ -54989,7 +55002,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_ShowIndicator(void * jarg1, int ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_SetIndicatorBgOpacity(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetIndicatorBgOpacity(void * jarg1, int jarg2) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window::IndicatorBgOpacity arg2 ;
   
@@ -55015,7 +55028,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_SetIndicatorBgOpacity(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_RotateIndicator(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_RotateIndicator(void * jarg1, int jarg2) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window::WindowOrientation arg2 ;
   
@@ -55041,7 +55054,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_RotateIndicator(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_SetClass(void * jarg1, char * jarg2, char * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetClass(void * jarg1, char * jarg2, char * jarg3) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   std::string arg2 ;
   std::string arg3 ;
@@ -55077,7 +55090,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_SetClass(void * jarg1, char * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_Raise(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Raise(void * jarg1) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   
   arg1 = (Dali::Window *)jarg1; 
@@ -55101,7 +55114,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_Raise(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_Lower(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Lower(void * jarg1) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   
   arg1 = (Dali::Window *)jarg1; 
@@ -55125,7 +55138,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_Lower(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_Activate(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Activate(void * jarg1) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   
   arg1 = (Dali::Window *)jarg1; 
@@ -55149,7 +55162,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_Activate(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_AddAvailableOrientation(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_AddAvailableOrientation(void * jarg1, int jarg2) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window::WindowOrientation arg2 ;
   
@@ -55175,7 +55188,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_AddAvailableOrientation(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_RemoveAvailableOrientation(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_RemoveAvailableOrientation(void * jarg1, int jarg2) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window::WindowOrientation arg2 ;
   
@@ -55201,7 +55214,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_RemoveAvailableOrientation(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_SetPreferredOrientation(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetPreferredOrientation(void * jarg1, int jarg2) {
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window::WindowOrientation arg2 ;
   
@@ -55227,7 +55240,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Window_SetPreferredOrientation(void * jar
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Window_GetPreferredOrientation(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Window_GetPreferredOrientation(void * jarg1) {
   int jresult ;
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window::WindowOrientation result;
@@ -55255,7 +55268,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Window_GetPreferredOrientation(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_GetDragAndDropDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetDragAndDropDetector(void * jarg1) {
   void * jresult ;
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::DragAndDropDetector result;
@@ -55283,7 +55296,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_GetDragAndDropDetector(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_GetNativeHandle(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetNativeHandle(void * jarg1) {
   void * jresult ;
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Any result;
@@ -55311,7 +55324,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_GetNativeHandle(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_IndicatorVisibilityChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_IndicatorVisibilityChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Window *arg1 = (Dali::Window *) 0 ;
   Dali::Window::IndicatorSignalType *result = 0 ;
@@ -55339,7 +55352,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Window_IndicatorVisibilityChangedSignal
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_New__SWIG_0() {
   void * jresult ;
   Dali::Application result;
   
@@ -55365,7 +55378,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_New__SWIG_1(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_New__SWIG_1(int jarg1) {
   void * jresult ;
   int *arg1 = (int *) 0 ;
   char ***arg2 ;
@@ -55413,7 +55426,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_New__SWIG_1(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_New__SWIG_2(int jarg1, char * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_New__SWIG_2(int jarg1, char * jarg3) {
   void * jresult ;
   int *arg1 = (int *) 0 ;
   char ***arg2 ;
@@ -55471,7 +55484,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_New__SWIG_2(int jarg1, char
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_New__SWIG_3(int jarg1, char * jarg3, int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_New__SWIG_3(int jarg1, char * jarg3, int jarg4) {
   void * jresult ;
   int *arg1 = (int *) 0 ;
   char ***arg2 ;
@@ -55531,7 +55544,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_New__SWIG_3(int jarg1, char
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Application__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Application__SWIG_0() {
   void * jresult ;
   Dali::Application *result = 0 ;
   
@@ -55557,7 +55570,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Application__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Application__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Application__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = 0 ;
   Dali::Application *result = 0 ;
@@ -55589,7 +55602,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Application__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application *arg2 = 0 ;
@@ -55623,7 +55636,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Application(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Application(void * jarg1) {
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   
   arg1 = (Dali::Application *)jarg1; 
@@ -55647,7 +55660,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Application(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_MainLoop__SWIG_0(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_MainLoop__SWIG_0(void * jarg1) {
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   
   arg1 = (Dali::Application *)jarg1; 
@@ -55671,7 +55684,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_MainLoop__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_MainLoop__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_MainLoop__SWIG_1(void * jarg1, void * jarg2) {
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Configuration::ContextLoss arg2 ;
   Configuration::ContextLoss *argp2 ;
@@ -55703,7 +55716,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_MainLoop__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_Lower(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_Lower(void * jarg1) {
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   
   arg1 = (Dali::Application *)jarg1; 
@@ -55727,7 +55740,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_Lower(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_Quit(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_Quit(void * jarg1) {
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   
   arg1 = (Dali::Application *)jarg1; 
@@ -55751,7 +55764,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_Quit(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Application_AddIdle(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Application_AddIdle(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::CallbackBase *arg2 = (Dali::CallbackBase *) 0 ;
@@ -55781,7 +55794,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Application_AddIdle(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_GetWindow(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_GetWindow(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Window result;
@@ -55809,7 +55822,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_GetWindow(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_ReplaceWindow(void * jarg1, void * jarg2, char * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_ReplaceWindow(void * jarg1, void * jarg2, char * jarg3) {
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::PositionSize arg2 ;
   std::string *arg3 = 0 ;
@@ -55851,7 +55864,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_ReplaceWindow(void * jarg1, v
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Application_GetResourcePath() {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Application_GetResourcePath() {
   char * jresult ;
   std::string result;
   
@@ -55877,7 +55890,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Application_GetResourcePath() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_SetViewMode(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_SetViewMode(void * jarg1, int jarg2) {
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::ViewMode arg2 ;
   
@@ -55903,7 +55916,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_SetViewMode(void * jarg1, int
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Application_GetViewMode(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Application_GetViewMode(void * jarg1) {
   int jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::ViewMode result;
@@ -55931,7 +55944,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Application_GetViewMode(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_SetStereoBase(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Application_SetStereoBase(void * jarg1, float jarg2) {
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   float arg2 ;
   
@@ -55957,7 +55970,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Application_SetStereoBase(void * jarg1, f
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Application_GetStereoBase(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Application_GetStereoBase(void * jarg1) {
   float jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   float result;
@@ -55985,7 +55998,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Application_GetStereoBase(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_InitSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_InitSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56013,7 +56026,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_InitSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_TerminateSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_TerminateSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56041,7 +56054,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_TerminateSignal(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_PauseSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_PauseSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56069,7 +56082,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_PauseSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_ResumeSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_ResumeSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56097,7 +56110,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_ResumeSignal(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_ResetSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_ResetSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56125,7 +56138,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_ResetSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_ResizeSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_ResizeSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56153,7 +56166,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_ResizeSignal(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_AppControlSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_AppControlSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppControlSignalType *result = 0 ;
@@ -56181,7 +56194,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_AppControlSignal(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_LanguageChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_LanguageChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56209,7 +56222,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_LanguageChangedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_RegionChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_RegionChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56237,7 +56250,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_RegionChangedSignal(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_BatteryLowSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_BatteryLowSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56265,7 +56278,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_BatteryLowSignal(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_MemoryLowSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_MemoryLowSignal(void * jarg1) {
   void * jresult ;
   Dali::Application *arg1 = (Dali::Application *) 0 ;
   Dali::Application::AppSignalType *result = 0 ;
@@ -56293,7 +56306,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Application_MemoryLowSignal(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ApplicationSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ApplicationSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Application &) > *arg1 = (Dali::Signal< void (Dali::Application &) > *) 0 ;
   bool result;
@@ -56321,7 +56334,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ApplicationSignal_Empty(void * ja
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ApplicationSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ApplicationSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Application &) > *arg1 = (Dali::Signal< void (Dali::Application &) > *) 0 ;
   std::size_t result;
@@ -56349,7 +56362,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ApplicationSignal_GetConnectionC
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Application &) > *arg1 = (Dali::Signal< void (Dali::Application &) > *) 0 ;
   void (*arg2)(Dali::Application &) = (void (*)(Dali::Application &)) 0 ;
   
@@ -56375,7 +56388,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationSignal_Connect(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Application &) > *arg1 = (Dali::Signal< void (Dali::Application &) > *) 0 ;
   void (*arg2)(Dali::Application &) = (void (*)(Dali::Application &)) 0 ;
   
@@ -56401,7 +56414,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationSignal_Disconnect(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Application &) > *arg1 = (Dali::Signal< void (Dali::Application &) > *) 0 ;
   Dali::Application *arg2 = 0 ;
   
@@ -56431,7 +56444,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationSignal_Emit(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ApplicationSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ApplicationSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Application &) > *result = 0 ;
   
@@ -56457,7 +56470,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ApplicationSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ApplicationSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ApplicationSignal(void * jarg1) {
   Dali::Signal< void (Dali::Application &) > *arg1 = (Dali::Signal< void (Dali::Application &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Application &) > *)jarg1; 
@@ -56481,7 +56494,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ApplicationSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ApplicationControlSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Application &,void *) > *arg1 = (Dali::Signal< void (Dali::Application &,void *) > *) 0 ;
   bool result;
@@ -56509,7 +56522,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_Empty(vo
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ApplicationControlSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Application &,void *) > *arg1 = (Dali::Signal< void (Dali::Application &,void *) > *) 0 ;
   std::size_t result;
@@ -56537,7 +56550,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_GetConn
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationControlSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Application &,void *) > *arg1 = (Dali::Signal< void (Dali::Application &,void *) > *) 0 ;
   void (*arg2)(Dali::Application &,void *) = (void (*)(Dali::Application &,void *)) 0 ;
   
@@ -56563,7 +56576,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_Connect(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationControlSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Application &,void *) > *arg1 = (Dali::Signal< void (Dali::Application &,void *) > *) 0 ;
   void (*arg2)(Dali::Application &,void *) = (void (*)(Dali::Application &,void *)) 0 ;
   
@@ -56589,7 +56602,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_Disconnect(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ApplicationControlSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< void (Dali::Application &,void *) > *arg1 = (Dali::Signal< void (Dali::Application &,void *) > *) 0 ;
   Dali::Application *arg2 = 0 ;
   void *arg3 = (void *) 0 ;
@@ -56621,7 +56634,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ApplicationControlSignal_Emit(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ApplicationControlSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ApplicationControlSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Application &,void *) > *result = 0 ;
   
@@ -56647,7 +56660,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ApplicationControlSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ApplicationControlSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ApplicationControlSignal(void * jarg1) {
   Dali::Signal< void (Dali::Application &,void *) > *arg1 = (Dali::Signal< void (Dali::Application &,void *) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Application &,void *) > *)jarg1; 
@@ -56671,7 +56684,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ApplicationControlSignal(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TimerSignalType() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimerSignalType() {
   void * jresult ;
   Dali::Signal< bool () > *result = 0 ;
   
@@ -56697,7 +56710,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TimerSignalType() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TimerSignalType(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TimerSignalType(void * jarg1) {
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   
   arg1 = (Dali::Signal< bool () > *)jarg1; 
@@ -56721,7 +56734,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TimerSignalType(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TimerSignalType_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TimerSignalType_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   bool result;
@@ -56749,7 +56762,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TimerSignalType_Empty(void * jarg
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TimerSignalType_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TimerSignalType_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   std::size_t result;
@@ -56777,7 +56790,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TimerSignalType_GetConnectionCou
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimerSignalType_Connect__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Connect__SWIG_0(void * jarg1, void * jarg2) {
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   bool (*arg2)() = (bool (*)()) 0 ;
   
@@ -56803,7 +56816,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimerSignalType_Connect__SWIG_0(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimerSignalType_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   bool (*arg2)() = (bool (*)()) 0 ;
   
@@ -56829,7 +56842,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimerSignalType_Disconnect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimerSignalType_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   Dali::ConnectionTrackerInterface *arg2 = (Dali::ConnectionTrackerInterface *) 0 ;
   Dali::FunctorDelegate *arg3 = (Dali::FunctorDelegate *) 0 ;
@@ -56857,7 +56870,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TimerSignalType_Connect__SWIG_4(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TimerSignalType_Emit(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TimerSignalType_Emit(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ;
   bool result;
@@ -56885,7 +56898,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TimerSignalType_Emit(void * jarg1
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VISUAL_PROPERTY_TYPE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VISUAL_PROPERTY_TYPE_get() {
   int jresult ;
   int result;
   
@@ -56911,7 +56924,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VISUAL_PROPERTY_TYPE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VISUAL_PROPERTY_SHADER_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VISUAL_PROPERTY_SHADER_get() {
   int jresult ;
   int result;
   
@@ -56937,7 +56950,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VISUAL_PROPERTY_SHADER_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VERTEX_SHADER_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VISUAL_SHADER_VERTEX_get() {
   int jresult ;
   int result;
   
@@ -56963,7 +56976,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VERTEX_SHADER_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FRAGMENT_SHADER_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VISUAL_SHADER_FRAGMENT_get() {
   int jresult ;
   int result;
   
@@ -56989,7 +57002,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FRAGMENT_SHADER_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SUBDIVIDE_GRID_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VISUAL_SHADER_SUBDIVIDE_GRID_X_get() {
   int jresult ;
   int result;
   
@@ -57015,7 +57028,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SUBDIVIDE_GRID_X_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SUBDIVIDE_GRID_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VISUAL_SHADER_SUBDIVIDE_GRID_Y_get() {
   int jresult ;
   int result;
   
@@ -57041,7 +57054,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SUBDIVIDE_GRID_Y_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_HINTS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VISUAL_SHADER_HINTS_get() {
   int jresult ;
   int result;
   
@@ -57067,7 +57080,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_HINTS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_BORDER_VISUAL_COLOR_get() {
   int jresult ;
   int result;
   
@@ -57093,7 +57106,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_BORDER_VISUAL_SIZE_get() {
   int jresult ;
   int result;
   
@@ -57119,7 +57132,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ANTI_ALIASING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_BORDER_VISUAL_ANTI_ALIASING_get() {
   int jresult ;
   int result;
   
@@ -57145,7 +57158,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ANTI_ALIASING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_MIX_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_COLOR_VISUAL_MIX_COLOR_get() {
   int jresult ;
   int result;
   
@@ -57171,7 +57184,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_MIX_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_START_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GRADIENT_VISUAL_START_POSITION_get() {
   int jresult ;
   int result;
   
@@ -57197,7 +57210,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_START_POSITION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_END_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GRADIENT_VISUAL_END_POSITION_get() {
   int jresult ;
   int result;
   
@@ -57223,7 +57236,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_END_POSITION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CENTER_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GRADIENT_VISUAL_CENTER_get() {
   int jresult ;
   int result;
   
@@ -57249,7 +57262,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_CENTER_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RADIUS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GRADIENT_VISUAL_RADIUS_get() {
   int jresult ;
   int result;
   
@@ -57275,7 +57288,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RADIUS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_STOP_OFFSET_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GRADIENT_VISUAL_STOP_OFFSET_get() {
   int jresult ;
   int result;
   
@@ -57301,7 +57314,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_STOP_OFFSET_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_STOP_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GRADIENT_VISUAL_STOP_COLOR_get() {
   int jresult ;
   int result;
   
@@ -57327,7 +57340,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_STOP_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_UNITS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GRADIENT_VISUAL_UNITS_get() {
   int jresult ;
   int result;
   
@@ -57353,7 +57366,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_UNITS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SPREAD_METHOD_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GRADIENT_VISUAL_SPREAD_METHOD_get() {
   int jresult ;
   int result;
   
@@ -57379,7 +57392,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SPREAD_METHOD_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_URL_get() {
   int jresult ;
   int result;
   
@@ -57405,7 +57418,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_FITTING_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_FITTING_MODE_get() {
   int jresult ;
   int result;
   
@@ -57431,7 +57444,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_FITTING_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_SAMPLING_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_SAMPLING_MODE_get() {
   int jresult ;
   int result;
   
@@ -57457,7 +57470,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_SAMPLING_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_DESIRED_WIDTH_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_DESIRED_WIDTH_get() {
   int jresult ;
   int result;
   
@@ -57483,7 +57496,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_DESIRED_WIDTH_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_DESIRED_HEIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_DESIRED_HEIGHT_get() {
   int jresult ;
   int result;
   
@@ -57509,7 +57522,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_DESIRED_HEIGHT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_SYNCHRONOUS_LOADING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_SYNCHRONOUS_LOADING_get() {
   int jresult ;
   int result;
   
@@ -57535,7 +57548,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_SYNCHRONOUS_LOADING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_BORDER_ONLY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_BORDER_ONLY_get() {
   int jresult ;
   int result;
   
@@ -57561,7 +57574,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_BORDER_ONLY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_BATCHING_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_BATCHING_ENABLED_get() {
   int jresult ;
   int result;
   
@@ -57587,7 +57600,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_BATCHING_ENABLED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_PIXEL_AREA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_PIXEL_AREA_get() {
   int jresult ;
   int result;
   
@@ -57613,7 +57626,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_PIXEL_AREA_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_WRAP_MODE_U_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_WRAP_MODE_U_get() {
   int jresult ;
   int result;
   
@@ -57639,7 +57652,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_WRAP_MODE_U_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_WRAP_MODE_V_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_IMAGE_VISUAL_WRAP_MODE_V_get() {
   int jresult ;
   int result;
   
@@ -57665,7 +57678,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_IMAGE_VISUAL_WRAP_MODE_V_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_OBJECT_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MESH_VISUAL_OBJECT_URL_get() {
   int jresult ;
   int result;
   
@@ -57691,7 +57704,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_OBJECT_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_MATERIAL_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MESH_VISUAL_MATERIAL_URL_get() {
   int jresult ;
   int result;
   
@@ -57717,7 +57730,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_MATERIAL_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TEXTURES_PATH_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MESH_VISUAL_TEXTURES_PATH_get() {
   int jresult ;
   int result;
   
@@ -57743,7 +57756,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TEXTURES_PATH_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SHADING_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MESH_VISUAL_SHADING_MODE_get() {
   int jresult ;
   int result;
   
@@ -57769,7 +57782,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SHADING_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_USE_MIPMAPPING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MESH_VISUAL_USE_MIPMAPPING_get() {
   int jresult ;
   int result;
   
@@ -57795,7 +57808,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_USE_MIPMAPPING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_USE_SOFT_NORMALS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MESH_VISUAL_USE_SOFT_NORMALS_get() {
   int jresult ;
   int result;
   
@@ -57821,7 +57834,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_USE_SOFT_NORMALS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_LIGHT_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MESH_VISUAL_LIGHT_POSITION_get() {
   int jresult ;
   int result;
   
@@ -57847,7 +57860,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_LIGHT_POSITION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SHAPE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_SHAPE_get() {
   int jresult ;
   int result;
   
@@ -57873,7 +57886,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SHAPE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PRIMITIVE_VISUAL_MIX_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_MIX_COLOR_get() {
   int jresult ;
   int result;
   
@@ -57899,7 +57912,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PRIMITIVE_VISUAL_MIX_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SLICES_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_SLICES_get() {
   int jresult ;
   int result;
   
@@ -57925,7 +57938,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SLICES_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_STACKS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_STACKS_get() {
   int jresult ;
   int result;
   
@@ -57951,7 +57964,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_STACKS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_TOP_RADIUS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_SCALE_TOP_RADIUS_get() {
   int jresult ;
   int result;
   
@@ -57977,7 +57990,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_TOP_RADIUS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_BOTTOM_RADIUS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS_get() {
   int jresult ;
   int result;
   
@@ -58003,7 +58016,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_BOTTOM_RADIUS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_HEIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_SCALE_HEIGHT_get() {
   int jresult ;
   int result;
   
@@ -58029,7 +58042,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_HEIGHT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_RADIUS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_SCALE_RADIUS_get() {
   int jresult ;
   int result;
   
@@ -58055,7 +58068,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_RADIUS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_DIMENSIONS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_SCALE_DIMENSIONS_get() {
   int jresult ;
   int result;
   
@@ -58081,7 +58094,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_SCALE_DIMENSIONS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_BEVEL_PERCENTAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_BEVEL_PERCENTAGE_get() {
   int jresult ;
   int result;
   
@@ -58107,7 +58120,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_BEVEL_PERCENTAGE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_BEVEL_SMOOTHNESS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS_get() {
   int jresult ;
   int result;
   
@@ -58133,7 +58146,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_BEVEL_SMOOTHNESS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PRIMITIVE_VISUAL_LIGHT_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PRIMITIVE_VISUAL_LIGHT_POSITION_get() {
   int jresult ;
   int result;
   
@@ -58158,111 +58171,112 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PRIMITIVE_VISUAL_LIGHT_POSITION_get() {
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TEXT_get() {
-  int jresult ;
-  int result;
-  
-  {
-    try {
-      result = (int)Dali::Toolkit::TextVisual::Property::TEXT;
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (int)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FONT_FAMILY_get() {
-  int jresult ;
-  int result;
-  
-  {
-    try {
-      result = (int)Dali::Toolkit::TextVisual::Property::FONT_FAMILY;
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (int)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FONT_STYLE_get() {
-  int jresult ;
-  int result;
-  
-  {
-    try {
-      result = (int)Dali::Toolkit::TextVisual::Property::FONT_STYLE;
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (int)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_POINT_SIZE_get() {
-  int jresult ;
-  int result;
-  
-  {
-    try {
-      result = (int)Dali::Toolkit::TextVisual::Property::POINT_SIZE;
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (int)result; 
-  return jresult;
-}
-
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_MULTI_LINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_TEXT_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::TextVisual::Property::TEXT;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_FONT_FAMILY_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::TextVisual::Property::FONT_FAMILY;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_FONT_STYLE_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::TextVisual::Property::FONT_STYLE;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_POINT_SIZE_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::TextVisual::Property::POINT_SIZE;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_MULTI_LINE_get() {
   int jresult ;
   int result;
   
@@ -58288,7 +58302,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_MULTI_LINE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_HORIZONTAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_HORIZONTAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -58314,7 +58328,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_HORIZONTAL_ALIGNMENT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VERTICAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_VERTICAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -58340,7 +58354,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VERTICAL_ALIGNMENT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TEXT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_TEXT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -58366,7 +58380,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TEXT_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ENABLE_MARKUP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TEXT_VISUAL_ENABLE_MARKUP_get() {
   int jresult ;
   int result;
   
@@ -58392,7 +58406,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ENABLE_MARKUP_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Builder() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Builder() {
   void * jresult ;
   Dali::Toolkit::Builder *result = 0 ;
   
@@ -58418,7 +58432,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Builder() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_New() {
   void * jresult ;
   Dali::Toolkit::Builder result;
   
@@ -58444,7 +58458,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_New() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Builder(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Builder(void * jarg1) {
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   
   arg1 = (Dali::Toolkit::Builder *)jarg1; 
@@ -58468,7 +58482,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Builder(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_LoadFromString__SWIG_0(void * jarg1, char * jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Builder_LoadFromString__SWIG_0(void * jarg1, char * jarg2, int jarg3) {
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
   Dali::Toolkit::Builder::UIFormat arg3 ;
@@ -58504,7 +58518,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_LoadFromString__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_LoadFromString__SWIG_1(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Builder_LoadFromString__SWIG_1(void * jarg1, char * jarg2) {
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -58538,7 +58552,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_LoadFromString__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_AddConstants(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Builder_AddConstants(void * jarg1, void * jarg2) {
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
   
@@ -58568,7 +58582,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_AddConstants(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_AddConstant(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Builder_AddConstant(void * jarg1, char * jarg2, void * jarg3) {
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
   Dali::Property::Value *arg3 = 0 ;
@@ -58608,7 +58622,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_AddConstant(void * jarg1, char *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetConstants(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_GetConstants(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   Dali::Property::Map *result = 0 ;
@@ -58636,7 +58650,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetConstants(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetConstant(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_GetConstant(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -58674,7 +58688,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetConstant(void * jarg1, char
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateAnimation__SWIG_0(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_CreateAnimation__SWIG_0(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -58712,7 +58726,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateAnimation__SWIG_0(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateAnimation__SWIG_1(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_CreateAnimation__SWIG_1(void * jarg1, char * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -58756,7 +58770,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateAnimation__SWIG_1(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateAnimation__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_CreateAnimation__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -58802,7 +58816,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateAnimation__SWIG_2(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateAnimation__SWIG_3(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_CreateAnimation__SWIG_3(void * jarg1, char * jarg2, void * jarg3, void * jarg4) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -58854,7 +58868,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateAnimation__SWIG_3(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_Create__SWIG_0(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_Create__SWIG_0(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -58892,7 +58906,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_Create__SWIG_0(void * jarg1, ch
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_Create__SWIG_1(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_Create__SWIG_1(void * jarg1, char * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -58936,7 +58950,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_Create__SWIG_1(void * jarg1, ch
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateFromJson(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_CreateFromJson(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -58974,7 +58988,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_CreateFromJson(void * jarg1, ch
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Builder_ApplyStyle(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Builder_ApplyStyle(void * jarg1, char * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -59018,7 +59032,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Builder_ApplyStyle(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Builder_ApplyFromJson(void * jarg1, void * jarg2, char * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Builder_ApplyFromJson(void * jarg1, void * jarg2, char * jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   Dali::Handle *arg2 = 0 ;
@@ -59062,7 +59076,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Builder_ApplyFromJson(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_AddActors__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Builder_AddActors__SWIG_0(void * jarg1, void * jarg2) {
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -59094,7 +59108,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_AddActors__SWIG_0(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_AddActors__SWIG_1(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Builder_AddActors__SWIG_1(void * jarg1, char * jarg2, void * jarg3) {
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
   Dali::Actor arg3 ;
@@ -59136,7 +59150,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_AddActors__SWIG_1(void * jarg1, c
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_CreateRenderTask(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Builder_CreateRenderTask(void * jarg1, char * jarg2) {
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -59170,7 +59184,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Builder_CreateRenderTask(void * jarg1, ch
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetFrameBufferImage(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_GetFrameBufferImage(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -59208,7 +59222,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetFrameBufferImage(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetPath(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_GetPath(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -59246,7 +59260,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetPath(void * jarg1, char * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetPathConstrainer(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_GetPathConstrainer(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -59284,7 +59298,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetPathConstrainer(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetLinearConstrainer(void * jarg1, char * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_GetLinearConstrainer(void * jarg1, char * jarg2) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   std::string *arg2 = 0 ;
@@ -59322,7 +59336,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_GetLinearConstrainer(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_QuitSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Builder_QuitSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Builder *arg1 = (Dali::Toolkit::Builder *) 0 ;
   Dali::Toolkit::Builder::BuilderSignalType *result = 0 ;
@@ -59350,7 +59364,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Builder_QuitSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TransitionData__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TransitionData__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::TransitionData *result = 0 ;
   
@@ -59376,7 +59390,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TransitionData__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TransitionData(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TransitionData(void * jarg1) {
   Dali::Toolkit::TransitionData *arg1 = (Dali::Toolkit::TransitionData *) 0 ;
   
   arg1 = (Dali::Toolkit::TransitionData *)jarg1; 
@@ -59400,7 +59414,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TransitionData(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_New__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TransitionData_New__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Property::Map *arg1 = 0 ;
   Dali::Toolkit::TransitionData result;
@@ -59432,7 +59446,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_New__SWIG_0(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_New__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TransitionData_New__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Property::Array *arg1 = 0 ;
   Dali::Toolkit::TransitionData result;
@@ -59464,7 +59478,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_New__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TransitionData_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -59498,7 +59512,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TransitionData__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TransitionData__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TransitionData *arg1 = 0 ;
   Dali::Toolkit::TransitionData *result = 0 ;
@@ -59530,7 +59544,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TransitionData__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TransitionData_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::TransitionData *arg1 = (Dali::Toolkit::TransitionData *) 0 ;
   Dali::Toolkit::TransitionData *arg2 = 0 ;
@@ -59564,7 +59578,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_Assign(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TransitionData_Count(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TransitionData_Count(void * jarg1) {
   unsigned long jresult ;
   Dali::Toolkit::TransitionData *arg1 = (Dali::Toolkit::TransitionData *) 0 ;
   size_t result;
@@ -59592,7 +59606,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TransitionData_Count(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_GetAnimatorAt(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TransitionData_GetAnimatorAt(void * jarg1, unsigned long jarg2) {
   void * jresult ;
   Dali::Toolkit::TransitionData *arg1 = (Dali::Toolkit::TransitionData *) 0 ;
   size_t arg2 ;
@@ -59622,7 +59636,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TransitionData_GetAnimatorAt(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TransitionData__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TransitionData__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::TransitionData *arg1 = (Dali::Toolkit::Internal::TransitionData *) 0 ;
   Dali::Toolkit::TransitionData *result = 0 ;
@@ -59650,7 +59664,371 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TransitionData__SWIG_2(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_New() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_CONTENT_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::CONTENT;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_LAYOUT_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::LAYOUT;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_WAIT_TIME_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::WAIT_TIME;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_BACKGROUND_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::BACKGROUND;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_TAIL_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::TAIL;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_POSITION_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::POSITION;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_HOVER_POINT_OFFSET_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::HOVER_POINT_OFFSET;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_MOVEMENT_THRESHOLD_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::MOVEMENT_THRESHOLD;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_DISAPPEAR_ON_MOVEMENT_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Property::DISAPPEAR_ON_MOVEMENT;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_BACKGROUND_VISUAL_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Background::Property::VISUAL;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_BACKGROUND_BORDER_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Background::Property::BORDER;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_TAIL_VISIBILITY_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Tail::Property::VISIBILITY;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_TAIL_ABOVE_VISUAL_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Tail::Property::ABOVE_VISUAL;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TOOLTIP_TAIL_BELOW_VISUAL_get() {
+  int jresult ;
+  int result;
+  
+  {
+    try {
+      result = (int)Dali::Toolkit::Tooltip::Tail::Property::BELOW_VISUAL;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_New() {
   void * jresult ;
   Dali::Toolkit::Control result;
   
@@ -59676,7 +60054,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_New() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetStyleName(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SetStyleName(void * jarg1, char * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -59710,7 +60088,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetStyleName(void * jarg1, char
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_ViewImpl_GetStyleName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_ViewImpl_GetStyleName(void * jarg1) {
   char * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   std::string *result = 0 ;
@@ -59738,7 +60116,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_ViewImpl_GetStyleName(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetBackgroundColor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SetBackgroundColor(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
   
@@ -59768,7 +60146,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetBackgroundColor(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetBackgroundColor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetBackgroundColor(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Vector4 result;
@@ -59796,7 +60174,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetBackgroundColor(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetBackgroundImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SetBackgroundImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Image arg2 ;
   Dali::Image *argp2 ;
@@ -59828,7 +60206,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetBackgroundImage(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetBackground(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SetBackground(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
   
@@ -59858,7 +60236,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetBackground(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_ClearBackground(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_ClearBackground(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -59882,7 +60260,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_ClearBackground(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_EnableGestureDetection(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_EnableGestureDetection(void * jarg1, int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Gesture::Type arg2 ;
   
@@ -59908,7 +60286,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_EnableGestureDetection(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_DisableGestureDetection(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_DisableGestureDetection(void * jarg1, int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Gesture::Type arg2 ;
   
@@ -59934,7 +60312,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_DisableGestureDetection(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetPinchGestureDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetPinchGestureDetector(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::PinchGestureDetector result;
@@ -59962,7 +60340,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetPinchGestureDetector(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetPanGestureDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetPanGestureDetector(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::PanGestureDetector result;
@@ -59990,7 +60368,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetPanGestureDetector(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetTapGestureDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetTapGestureDetector(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::TapGestureDetector result;
@@ -60018,7 +60396,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetTapGestureDetector(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetLongPressGestureDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetLongPressGestureDetector(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::LongPressGestureDetector result;
@@ -60046,7 +60424,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetLongPressGestureDetector(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetKeyboardNavigationSupport(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SetKeyboardNavigationSupport(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool arg2 ;
   
@@ -60072,7 +60450,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetKeyboardNavigationSupport(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_IsKeyboardNavigationSupported(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_IsKeyboardNavigationSupported(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -60100,7 +60478,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_IsKeyboardNavigationSupp
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetKeyInputFocus(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SetKeyInputFocus(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -60124,7 +60502,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetKeyInputFocus(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_HasKeyInputFocus(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_HasKeyInputFocus(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -60152,7 +60530,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_HasKeyInputFocus(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_ClearKeyInputFocus(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_ClearKeyInputFocus(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -60176,7 +60554,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_ClearKeyInputFocus(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetAsKeyboardFocusGroup(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SetAsKeyboardFocusGroup(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool arg2 ;
   
@@ -60202,7 +60580,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SetAsKeyboardFocusGroup(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_IsKeyboardFocusGroup(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_IsKeyboardFocusGroup(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -60230,7 +60608,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_IsKeyboardFocusGroup(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_AccessibilityActivate(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_AccessibilityActivate(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -60254,7 +60632,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_AccessibilityActivate(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_KeyboardEnter(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_KeyboardEnter(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -60278,7 +60656,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_KeyboardEnter(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_KeyEventSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_KeyEventSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Toolkit::Control::KeyEventSignalType *result = 0 ;
@@ -60306,7 +60684,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_KeyEventSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_KeyInputFocusGainedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_KeyInputFocusGainedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Toolkit::Control::KeyInputFocusSignalType *result = 0 ;
@@ -60334,7 +60712,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_KeyInputFocusGainedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_KeyInputFocusLostSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_KeyInputFocusLostSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Toolkit::Control::KeyInputFocusSignalType *result = 0 ;
@@ -60362,7 +60740,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_KeyInputFocusLostSignal(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_EmitKeyEventSignal(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_EmitKeyEventSignal(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::KeyEvent *arg2 = 0 ;
@@ -60396,7 +60774,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_EmitKeyEventSignal(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStageConnection(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageConnection(void * jarg1, int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   int arg2 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -60424,7 +60802,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStageConnection(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStageConnectionSwigExplicitViewImpl(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageConnectionSwigExplicitViewImpl(void * jarg1, int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   int arg2 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -60452,7 +60830,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStageConnectionSwigExplicitVie
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStageDisconnection(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageDisconnection(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   SwigDirector_ViewImpl *darg = 0;
   
@@ -60478,7 +60856,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStageDisconnection(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   SwigDirector_ViewImpl *darg = 0;
   
@@ -60504,7 +60882,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStageDisconnectionSwigExplicit
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnChildAdd(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnChildAdd(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -60536,7 +60914,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnChildAdd(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnChildAddSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnChildAddSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -60568,7 +60946,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnChildAddSwigExplicitViewImpl(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnChildRemove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnChildRemove(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -60600,7 +60978,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnChildRemove(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnChildRemoveSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnChildRemoveSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -60632,7 +61010,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnChildRemoveSwigExplicitViewImp
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPropertySet(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnPropertySet(void * jarg1, int jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Property::Index arg2 ;
   Dali::Property::Value arg3 ;
@@ -60668,7 +61046,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPropertySet(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPropertySetSwigExplicitViewImpl(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnPropertySetSwigExplicitViewImpl(void * jarg1, int jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Property::Index arg2 ;
   Dali::Property::Value arg3 ;
@@ -60704,7 +61082,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPropertySetSwigExplicitViewImp
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSizeSet(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSizeSet(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -60736,7 +61114,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSizeSet(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSizeSetSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSizeSetSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -60768,7 +61146,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSizeSetSwigExplicitViewImpl(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSizeAnimation(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSizeAnimation(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Animation *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -60806,7 +61184,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSizeAnimation(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSizeAnimationSwigExplicitViewImpl(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSizeAnimationSwigExplicitViewImpl(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Animation *arg2 = 0 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -60844,7 +61222,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSizeAnimationSwigExplicitViewI
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnTouchEvent(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnTouchEvent(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::TouchEvent *arg2 = 0 ;
@@ -60880,7 +61258,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnTouchEvent(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnTouchEventSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnTouchEventSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::TouchEvent *arg2 = 0 ;
@@ -60916,7 +61294,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnTouchEventSwigExplicit
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnHoverEvent(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnHoverEvent(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::HoverEvent *arg2 = 0 ;
@@ -60952,7 +61330,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnHoverEvent(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnHoverEventSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnHoverEventSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::HoverEvent *arg2 = 0 ;
@@ -60988,7 +61366,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnHoverEventSwigExplicit
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyEvent(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyEvent(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::KeyEvent *arg2 = 0 ;
@@ -61024,7 +61402,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyEvent(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyEventSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyEventSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::KeyEvent *arg2 = 0 ;
@@ -61060,7 +61438,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyEventSwigExplicitVi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnWheelEvent(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnWheelEvent(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::WheelEvent *arg2 = 0 ;
@@ -61096,7 +61474,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnWheelEvent(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnWheelEventSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnWheelEventSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::WheelEvent *arg2 = 0 ;
@@ -61132,7 +61510,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnWheelEventSwigExplicit
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnRelayout(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnRelayout(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   Dali::RelayoutContainer *arg3 = 0 ;
@@ -61170,7 +61548,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnRelayout(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnRelayoutSwigExplicitViewImpl(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnRelayoutSwigExplicitViewImpl(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   Dali::RelayoutContainer *arg3 = 0 ;
@@ -61208,7 +61586,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnRelayoutSwigExplicitViewImpl(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSetResizePolicy(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSetResizePolicy(void * jarg1, int jarg2, int jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::ResizePolicy::Type arg2 ;
   Dali::Dimension::Type arg3 ;
@@ -61238,7 +61616,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSetResizePolicy(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSetResizePolicySwigExplicitViewImpl(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSetResizePolicySwigExplicitViewImpl(void * jarg1, int jarg2, int jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::ResizePolicy::Type arg2 ;
   Dali::Dimension::Type arg3 ;
@@ -61268,7 +61646,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnSetResizePolicySwigExplicitVie
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetNaturalSize(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetNaturalSize(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -61298,7 +61676,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetNaturalSize(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetNaturalSizeSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetNaturalSizeSwigExplicitViewImpl(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -61328,7 +61706,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetNaturalSizeSwigExplicitView
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_CalculateChildSize(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ViewImpl_CalculateChildSize(void * jarg1, void * jarg2, int jarg3) {
   float jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
@@ -61366,7 +61744,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_CalculateChildSize(void * jarg1
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_CalculateChildSizeSwigExplicitViewImpl(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ViewImpl_CalculateChildSizeSwigExplicitViewImpl(void * jarg1, void * jarg2, int jarg3) {
   float jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
@@ -61404,7 +61782,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_CalculateChildSizeSwigExplicitV
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_GetHeightForWidth(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ViewImpl_GetHeightForWidth(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   float arg2 ;
@@ -61436,7 +61814,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_GetHeightForWidth(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_GetHeightForWidthSwigExplicitViewImpl(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ViewImpl_GetHeightForWidthSwigExplicitViewImpl(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   float arg2 ;
@@ -61468,7 +61846,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_GetHeightForWidthSwigExplicitVi
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_GetWidthForHeight(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ViewImpl_GetWidthForHeight(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   float arg2 ;
@@ -61500,7 +61878,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_GetWidthForHeight(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_GetWidthForHeightSwigExplicitViewImpl(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ViewImpl_GetWidthForHeightSwigExplicitViewImpl(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   float arg2 ;
@@ -61532,7 +61910,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ViewImpl_GetWidthForHeightSwigExplicitVi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_RelayoutDependentOnChildren__SWIG_0(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_RelayoutDependentOnChildren__SWIG_0(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Dimension::Type arg2 ;
@@ -61564,7 +61942,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_RelayoutDependentOnChild
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_0(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_0(void * jarg1, int jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Dimension::Type arg2 ;
@@ -61596,7 +61974,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_RelayoutDependentOnChild
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_RelayoutDependentOnChildren__SWIG_1(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_RelayoutDependentOnChildren__SWIG_1(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -61626,7 +62004,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_RelayoutDependentOnChild
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_1(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_1(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -61656,7 +62034,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_RelayoutDependentOnChild
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnCalculateRelayoutSize(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnCalculateRelayoutSize(void * jarg1, int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Dimension::Type arg2 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -61684,7 +62062,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnCalculateRelayoutSize(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnCalculateRelayoutSizeSwigExplicitViewImpl(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnCalculateRelayoutSizeSwigExplicitViewImpl(void * jarg1, int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Dimension::Type arg2 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -61712,7 +62090,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnCalculateRelayoutSizeSwigExpli
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnLayoutNegotiated(void * jarg1, float jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnLayoutNegotiated(void * jarg1, float jarg2, int jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   float arg2 ;
   Dali::Dimension::Type arg3 ;
@@ -61742,7 +62120,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnLayoutNegotiated(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnLayoutNegotiatedSwigExplicitViewImpl(void * jarg1, float jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnLayoutNegotiatedSwigExplicitViewImpl(void * jarg1, float jarg2, int jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   float arg2 ;
   Dali::Dimension::Type arg3 ;
@@ -61772,7 +62150,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnLayoutNegotiatedSwigExplicitVi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnInitialize(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnInitialize(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -61796,7 +62174,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnInitialize(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnInitializeSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnInitializeSwigExplicitViewImpl(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -61820,7 +62198,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnInitializeSwigExplicitViewImpl
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnControlChildAdd(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnControlChildAdd(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -61850,7 +62228,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnControlChildAdd(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnControlChildAddSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnControlChildAddSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -61880,7 +62258,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnControlChildAddSwigExplicitVie
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnControlChildRemove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnControlChildRemove(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -61910,7 +62288,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnControlChildRemove(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnControlChildRemoveSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnControlChildRemoveSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -61940,7 +62318,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnControlChildRemoveSwigExplicit
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStyleChange(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStyleChange(void * jarg1, void * jarg2, int jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Toolkit::StyleManager arg2 ;
   Dali::StyleChange::Type arg3 ;
@@ -61974,7 +62352,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStyleChange(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStyleChangeSwigExplicitViewImpl(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStyleChangeSwigExplicitViewImpl(void * jarg1, void * jarg2, int jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Toolkit::StyleManager arg2 ;
   Dali::StyleChange::Type arg3 ;
@@ -62008,7 +62386,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnStyleChangeSwigExplicitViewImp
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityActivated(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityActivated(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -62036,7 +62414,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityActivated
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityActivatedSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityActivatedSwigExplicitViewImpl(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -62064,7 +62442,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityActivated
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityPan(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityPan(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::PanGesture arg2 ;
@@ -62100,7 +62478,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityPan(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityPanSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityPanSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::PanGesture arg2 ;
@@ -62136,7 +62514,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityPanSwigEx
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityTouch(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityTouch(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::TouchEvent *arg2 = 0 ;
@@ -62170,7 +62548,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityTouch(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityTouchSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityTouchSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::TouchEvent *arg2 = 0 ;
@@ -62204,7 +62582,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityTouchSwig
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityValueChange(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityValueChange(void * jarg1, unsigned int jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool arg2 ;
@@ -62234,7 +62612,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityValueChan
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityValueChangeSwigExplicitViewImpl(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityValueChangeSwigExplicitViewImpl(void * jarg1, unsigned int jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool arg2 ;
@@ -62264,7 +62642,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityValueChan
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityZoom(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityZoom(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -62292,7 +62670,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityZoom(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityZoomSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnAccessibilityZoomSwigExplicitViewImpl(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -62320,7 +62698,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnAccessibilityZoomSwigE
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyInputFocusGained(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyInputFocusGained(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -62344,7 +62722,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyInputFocusGained(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyInputFocusGainedSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyInputFocusGainedSwigExplicitViewImpl(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -62368,7 +62746,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyInputFocusGainedSwigExplici
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyInputFocusLost(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyInputFocusLost(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -62392,7 +62770,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyInputFocusLost(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyInputFocusLostSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyInputFocusLostSwigExplicitViewImpl(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Internal::Control *)jarg1; 
@@ -62416,7 +62794,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyInputFocusLostSwigExplicitV
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetNextKeyboardFocusableActor(void * jarg1, void * jarg2, int jarg3, unsigned int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetNextKeyboardFocusableActor(void * jarg1, void * jarg2, int jarg3, unsigned int jarg4) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor arg2 ;
@@ -62456,7 +62834,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetNextKeyboardFocusableActor(
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(void * jarg1, void * jarg2, int jarg3, unsigned int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(void * jarg1, void * jarg2, int jarg3, unsigned int jarg4) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor arg2 ;
@@ -62496,7 +62874,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ViewImpl_GetNextKeyboardFocusableActorS
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyboardFocusChangeCommitted(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyboardFocusChangeCommitted(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -62528,7 +62906,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyboardFocusChangeCommitted(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -62560,7 +62938,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyboardFocusChangeCommittedSw
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyboardEnter(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyboardEnter(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -62588,7 +62966,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyboardEnter(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyboardEnterSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewImpl_OnKeyboardEnterSwigExplicitViewImpl(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   bool result;
@@ -62616,7 +62994,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ViewImpl_OnKeyboardEnterSwigExpli
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPinch(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnPinch(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::PinchGesture *arg2 = 0 ;
   
@@ -62646,7 +63024,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPinch(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPinchSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnPinchSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::PinchGesture *arg2 = 0 ;
   
@@ -62676,7 +63054,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPinchSwigExplicitViewImpl(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPan(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnPan(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::PanGesture *arg2 = 0 ;
   
@@ -62706,7 +63084,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPan(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPanSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnPanSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::PanGesture *arg2 = 0 ;
   
@@ -62736,7 +63114,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnPanSwigExplicitViewImpl(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnTap(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnTap(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::TapGesture *arg2 = 0 ;
   
@@ -62766,7 +63144,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnTap(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnTapSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnTapSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::TapGesture *arg2 = 0 ;
   
@@ -62796,7 +63174,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnTapSwigExplicitViewImpl(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnLongPress(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnLongPress(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::LongPressGesture *arg2 = 0 ;
   
@@ -62826,7 +63204,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnLongPress(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnLongPressSwigExplicitViewImpl(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnLongPressSwigExplicitViewImpl(void * jarg1, void * jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::LongPressGesture *arg2 = 0 ;
   
@@ -62856,7 +63234,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_OnLongPressSwigExplicitViewImpl(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SignalConnected(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
   Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
@@ -62884,7 +63262,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SignalConnected(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SignalConnectedSwigExplicitViewImpl(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SignalConnectedSwigExplicitViewImpl(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
   Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
@@ -62912,7 +63290,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SignalConnectedSwigExplicitViewI
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SignalDisconnected(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
   Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
@@ -62940,7 +63318,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SignalDisconnected(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SignalDisconnectedSwigExplicitViewImpl(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_SignalDisconnectedSwigExplicitViewImpl(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   Dali::SlotObserver *arg2 = (Dali::SlotObserver *) 0 ;
   Dali::CallbackBase *arg3 = (Dali::CallbackBase *) 0 ;
@@ -62968,7 +63346,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_SignalDisconnectedSwigExplicitVi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_director_connect(void *objarg, SwigDirector_ViewImpl::SWIG_Callback0_t callback0, SwigDirector_ViewImpl::SWIG_Callback1_t callback1, SwigDirector_ViewImpl::SWIG_Callback2_t callback2, SwigDirector_ViewImpl::SWIG_Callback3_t callback3, SwigDirector_ViewImpl::SWIG_Callback4_t callback4, SwigDirector_ViewImpl::SWIG_Callback5_t callback5, SwigDirector_ViewImpl::SWIG_Callback6_t callback6, SwigDirector_ViewImpl::SWIG_Callback7_t callback7, SwigDirector_ViewImpl::SWIG_Callback8_t callback8, SwigDirector_ViewImpl::SWIG_Callback9_t callback9, SwigDirector_ViewImpl::SWIG_Callback10_t callback10, SwigDirector_ViewImpl::SWIG_Callback11_t callback11, SwigDirector_ViewImpl::SWIG_Callback12_t callback12, SwigDirector_ViewImpl::SWIG_Callback13_t callback13, SwigDirector_ViewImpl::SWIG_Callback14_t callback14, SwigDirector_ViewImpl::SWIG_Callback15_t callback15, SwigDirector_ViewImpl::SWIG_Callback16_t callback16, SwigDirector_ViewImpl::SWIG_Callback17_t callback17, SwigDirector_ViewImpl::SWIG_Callback18_t callback18, SwigDirector_ViewImpl::SWIG_Callback19_t callback19, SwigDirector_ViewImpl::SWIG_Callback20_t callback20, SwigDirector_ViewImpl::SWIG_Callback21_t callback21, SwigDirector_ViewImpl::SWIG_Callback22_t callback22, SwigDirector_ViewImpl::SWIG_Callback23_t callback23, SwigDirector_ViewImpl::SWIG_Callback24_t callback24, SwigDirector_ViewImpl::SWIG_Callback25_t callback25, SwigDirector_ViewImpl::SWIG_Callback26_t callback26, SwigDirector_ViewImpl::SWIG_Callback27_t callback27, SwigDirector_ViewImpl::SWIG_Callback28_t callback28, SwigDirector_ViewImpl::SWIG_Callback29_t callback29, SwigDirector_ViewImpl::SWIG_Callback30_t callback30, SwigDirector_ViewImpl::SWIG_Callback31_t callback31, SwigDirector_ViewImpl::SWIG_Callback32_t callback32, SwigDirector_ViewImpl::SWIG_Callback33_t callback33, SwigDirector_ViewImpl::SWIG_Callback34_t callback34, SwigDirector_ViewImpl::SWIG_Callback35_t callback35, SwigDirector_ViewImpl::SWIG_Callback36_t callback36, SwigDirector_ViewImpl::SWIG_Callback37_t callback37, SwigDirector_ViewImpl::SWIG_Callback38_t callback38, SwigDirector_ViewImpl::SWIG_Callback39_t callback39, SwigDirector_ViewImpl::SWIG_Callback40_t callback40) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_director_connect(void *objarg, SwigDirector_ViewImpl::SWIG_Callback0_t callback0, SwigDirector_ViewImpl::SWIG_Callback1_t callback1, SwigDirector_ViewImpl::SWIG_Callback2_t callback2, SwigDirector_ViewImpl::SWIG_Callback3_t callback3, SwigDirector_ViewImpl::SWIG_Callback4_t callback4, SwigDirector_ViewImpl::SWIG_Callback5_t callback5, SwigDirector_ViewImpl::SWIG_Callback6_t callback6, SwigDirector_ViewImpl::SWIG_Callback7_t callback7, SwigDirector_ViewImpl::SWIG_Callback8_t callback8, SwigDirector_ViewImpl::SWIG_Callback9_t callback9, SwigDirector_ViewImpl::SWIG_Callback10_t callback10, SwigDirector_ViewImpl::SWIG_Callback11_t callback11, SwigDirector_ViewImpl::SWIG_Callback12_t callback12, SwigDirector_ViewImpl::SWIG_Callback13_t callback13, SwigDirector_ViewImpl::SWIG_Callback14_t callback14, SwigDirector_ViewImpl::SWIG_Callback15_t callback15, SwigDirector_ViewImpl::SWIG_Callback16_t callback16, SwigDirector_ViewImpl::SWIG_Callback17_t callback17, SwigDirector_ViewImpl::SWIG_Callback18_t callback18, SwigDirector_ViewImpl::SWIG_Callback19_t callback19, SwigDirector_ViewImpl::SWIG_Callback20_t callback20, SwigDirector_ViewImpl::SWIG_Callback21_t callback21, SwigDirector_ViewImpl::SWIG_Callback22_t callback22, SwigDirector_ViewImpl::SWIG_Callback23_t callback23, SwigDirector_ViewImpl::SWIG_Callback24_t callback24, SwigDirector_ViewImpl::SWIG_Callback25_t callback25, SwigDirector_ViewImpl::SWIG_Callback26_t callback26, SwigDirector_ViewImpl::SWIG_Callback27_t callback27, SwigDirector_ViewImpl::SWIG_Callback28_t callback28, SwigDirector_ViewImpl::SWIG_Callback29_t callback29, SwigDirector_ViewImpl::SWIG_Callback30_t callback30, SwigDirector_ViewImpl::SWIG_Callback31_t callback31, SwigDirector_ViewImpl::SWIG_Callback32_t callback32, SwigDirector_ViewImpl::SWIG_Callback33_t callback33, SwigDirector_ViewImpl::SWIG_Callback34_t callback34, SwigDirector_ViewImpl::SWIG_Callback35_t callback35, SwigDirector_ViewImpl::SWIG_Callback36_t callback36, SwigDirector_ViewImpl::SWIG_Callback37_t callback37, SwigDirector_ViewImpl::SWIG_Callback38_t callback38, SwigDirector_ViewImpl::SWIG_Callback39_t callback39, SwigDirector_ViewImpl::SWIG_Callback40_t callback40) {
   Dali::Toolkit::Internal::Control *obj = (Dali::Toolkit::Internal::Control *)objarg;
   SwigDirector_ViewImpl *director = dynamic_cast<SwigDirector_ViewImpl *>(obj);
   if (director) {
@@ -62977,7 +63355,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ViewImpl_director_connect(void *objarg, S
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GetImplementation__SWIG_0(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetImplementation__SWIG_0(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = 0 ;
   Dali::Toolkit::Internal::Control *result = 0 ;
@@ -63009,7 +63387,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GetImplementation__SWIG_0(void * jarg1)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_STYLE_NAME_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_View_Property_STYLE_NAME_get() {
   int jresult ;
   int result;
   
@@ -63019,7 +63397,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_STYLE_NAME_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_BACKGROUND_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_View_Property_BACKGROUND_COLOR_get() {
   int jresult ;
   int result;
   
@@ -63029,7 +63407,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_BACKGROUND_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_BACKGROUND_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_View_Property_BACKGROUND_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -63039,7 +63417,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_BACKGROUND_IMAGE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_KEY_INPUT_FOCUS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_View_Property_KEY_INPUT_FOCUS_get() {
   int jresult ;
   int result;
   
@@ -63049,7 +63427,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_KEY_INPUT_FOCUS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_BACKGROUND_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_View_Property_BACKGROUND_get() {
   int jresult ;
   int result;
   
@@ -63059,7 +63437,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_View_Property_BACKGROUND_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View_Property() {
   void * jresult ;
   Dali::Toolkit::Control::Property *result = 0 ;
   
@@ -63085,7 +63463,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_View_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_View_Property(void * jarg1) {
   Dali::Toolkit::Control::Property *arg1 = (Dali::Toolkit::Control::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::Control::Property *)jarg1; 
@@ -63109,7 +63487,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_View_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View_KeyboardFocus() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View_KeyboardFocus() {
   void * jresult ;
   Dali::Toolkit::Control::KeyboardFocus *result = 0 ;
   
@@ -63135,7 +63513,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View_KeyboardFocus() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_View_KeyboardFocus(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_View_KeyboardFocus(void * jarg1) {
   Dali::Toolkit::Control::KeyboardFocus *arg1 = (Dali::Toolkit::Control::KeyboardFocus *) 0 ;
   
   arg1 = (Dali::Toolkit::Control::KeyboardFocus *)jarg1; 
@@ -63159,7 +63537,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_View_KeyboardFocus(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_New() {
   void * jresult ;
   Dali::Toolkit::Control result;
   
@@ -63185,7 +63563,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Control *result = 0 ;
   
@@ -63211,7 +63589,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = 0 ;
   Dali::Toolkit::Control *result = 0 ;
@@ -63243,7 +63621,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_View(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_View(void * jarg1) {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Control *)jarg1; 
@@ -63267,7 +63645,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_View(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::Toolkit::Control *arg2 = 0 ;
@@ -63301,7 +63679,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_Assign(void * jarg1, void * jarg2)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -63335,7 +63713,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_SetKeyInputFocus(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_SetKeyInputFocus(void * jarg1) {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Control *)jarg1; 
@@ -63359,7 +63737,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_SetKeyInputFocus(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_View_HasKeyInputFocus(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_View_HasKeyInputFocus(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   bool result;
@@ -63387,7 +63765,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_View_HasKeyInputFocus(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_ClearKeyInputFocus(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_ClearKeyInputFocus(void * jarg1) {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Control *)jarg1; 
@@ -63411,7 +63789,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_ClearKeyInputFocus(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetPinchGestureDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_GetPinchGestureDetector(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::PinchGestureDetector result;
@@ -63439,7 +63817,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetPinchGestureDetector(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetPanGestureDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_GetPanGestureDetector(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::PanGestureDetector result;
@@ -63467,7 +63845,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetPanGestureDetector(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetTapGestureDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_GetTapGestureDetector(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::TapGestureDetector result;
@@ -63495,7 +63873,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetTapGestureDetector(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetLongPressGestureDetector(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_GetLongPressGestureDetector(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::LongPressGestureDetector result;
@@ -63523,7 +63901,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetLongPressGestureDetector(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_SetStyleName(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_SetStyleName(void * jarg1, char * jarg2) {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -63557,7 +63935,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_SetStyleName(void * jarg1, char * ja
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_View_GetStyleName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_View_GetStyleName(void * jarg1) {
   char * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   std::string *result = 0 ;
@@ -63585,7 +63963,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_View_GetStyleName(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_SetBackgroundColor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_SetBackgroundColor(void * jarg1, void * jarg2) {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
   
@@ -63615,7 +63993,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_SetBackgroundColor(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetBackgroundColor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_GetBackgroundColor(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::Vector4 result;
@@ -63643,7 +64021,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_GetBackgroundColor(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_SetBackgroundImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_SetBackgroundImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::Image arg2 ;
   Dali::Image *argp2 ;
@@ -63675,7 +64053,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_SetBackgroundImage(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_ClearBackground(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_ClearBackground(void * jarg1) {
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   
   arg1 = (Dali::Toolkit::Control *)jarg1; 
@@ -63699,7 +64077,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_View_ClearBackground(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_KeyEventSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_KeyEventSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::Toolkit::Control::KeyEventSignalType *result = 0 ;
@@ -63727,7 +64105,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_KeyEventSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_KeyInputFocusGainedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_KeyInputFocusGainedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::Toolkit::Control::KeyInputFocusSignalType *result = 0 ;
@@ -63755,7 +64133,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_KeyInputFocusGainedSignal(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_KeyInputFocusLostSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_KeyInputFocusLostSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
   Dali::Toolkit::Control::KeyInputFocusSignalType *result = 0 ;
@@ -63783,7 +64161,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_View_KeyInputFocusLostSignal(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Control *arg1 = 0 ;
   Dali::Toolkit::Control *result = 0 ;
@@ -63815,7 +64193,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_View__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyInputFocusManager() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyInputFocusManager() {
   void * jresult ;
   Dali::Toolkit::KeyInputFocusManager *result = 0 ;
   
@@ -63841,7 +64219,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyInputFocusManager() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyInputFocusManager(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyInputFocusManager(void * jarg1) {
   Dali::Toolkit::KeyInputFocusManager *arg1 = (Dali::Toolkit::KeyInputFocusManager *) 0 ;
   
   arg1 = (Dali::Toolkit::KeyInputFocusManager *)jarg1; 
@@ -63865,7 +64243,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyInputFocusManager(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_Get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_Get() {
   void * jresult ;
   Dali::Toolkit::KeyInputFocusManager result;
   
@@ -63891,7 +64269,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_Get() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_SetFocus(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_SetFocus(void * jarg1, void * jarg2) {
   Dali::Toolkit::KeyInputFocusManager *arg1 = (Dali::Toolkit::KeyInputFocusManager *) 0 ;
   Dali::Toolkit::Control arg2 ;
   Dali::Toolkit::Control *argp2 ;
@@ -63923,7 +64301,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_SetFocus(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_GetCurrentFocusControl(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_GetCurrentFocusControl(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::KeyInputFocusManager *arg1 = (Dali::Toolkit::KeyInputFocusManager *) 0 ;
   Dali::Toolkit::Control result;
@@ -63951,7 +64329,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_GetCurrentFocusCon
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_RemoveFocus(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_RemoveFocus(void * jarg1, void * jarg2) {
   Dali::Toolkit::KeyInputFocusManager *arg1 = (Dali::Toolkit::KeyInputFocusManager *) 0 ;
   Dali::Toolkit::Control arg2 ;
   Dali::Toolkit::Control *argp2 ;
@@ -63983,7 +64361,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_RemoveFocus(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_IsKeyboardListener(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_IsKeyboardListener(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::KeyInputFocusManager *arg1 = (Dali::Toolkit::KeyInputFocusManager *) 0 ;
   Dali::Toolkit::Control arg2 ;
@@ -64019,7 +64397,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_IsKeyboardLi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_KeyInputFocusChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_KeyInputFocusChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::KeyInputFocusManager *arg1 = (Dali::Toolkit::KeyInputFocusManager *) 0 ;
   Dali::Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType *result = 0 ;
@@ -64047,7 +64425,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_KeyInputFocusChang
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_UnhandledKeyEventSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_UnhandledKeyEventSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::KeyInputFocusManager *arg1 = (Dali::Toolkit::KeyInputFocusManager *) 0 ;
   Dali::Toolkit::KeyInputFocusManager::UnhandledKeyEventSignalType *result = 0 ;
@@ -64075,7 +64453,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_UnhandledKeyEventS
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Alignment_Padding__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Alignment_Padding__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Alignment::Padding *result = 0 ;
   
@@ -64101,7 +64479,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Alignment_Padding__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Alignment_Padding__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Alignment_Padding__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -64135,7 +64513,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Alignment_Padding__SWIG_1(float jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_Padding_left_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Alignment_Padding_left_set(void * jarg1, float jarg2) {
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   float arg2 ;
   
@@ -64145,7 +64523,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_Padding_left_set(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Alignment_Padding_left_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Alignment_Padding_left_get(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   float result;
@@ -64157,7 +64535,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Alignment_Padding_left_get(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_Padding_right_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Alignment_Padding_right_set(void * jarg1, float jarg2) {
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   float arg2 ;
   
@@ -64167,7 +64545,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_Padding_right_set(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Alignment_Padding_right_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Alignment_Padding_right_get(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   float result;
@@ -64179,7 +64557,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Alignment_Padding_right_get(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_Padding_top_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Alignment_Padding_top_set(void * jarg1, float jarg2) {
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   float arg2 ;
   
@@ -64189,7 +64567,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_Padding_top_set(void * jarg1, f
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Alignment_Padding_top_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Alignment_Padding_top_get(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   float result;
@@ -64201,7 +64579,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Alignment_Padding_top_get(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_Padding_bottom_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Alignment_Padding_bottom_set(void * jarg1, float jarg2) {
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   float arg2 ;
   
@@ -64211,7 +64589,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_Padding_bottom_set(void * jarg1
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Alignment_Padding_bottom_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Alignment_Padding_bottom_get(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   float result;
@@ -64223,7 +64601,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Alignment_Padding_bottom_get(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Alignment_Padding(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Alignment_Padding(void * jarg1) {
   Dali::Toolkit::Alignment::Padding *arg1 = (Dali::Toolkit::Alignment::Padding *) 0 ;
   
   arg1 = (Dali::Toolkit::Alignment::Padding *)jarg1; 
@@ -64247,7 +64625,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Alignment_Padding(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Alignment__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Alignment__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Alignment *result = 0 ;
   
@@ -64273,7 +64651,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Alignment__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_New__SWIG_0(int jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Alignment_New__SWIG_0(int jarg1, int jarg2) {
   void * jresult ;
   Dali::Toolkit::Alignment::Type arg1 ;
   Dali::Toolkit::Alignment::Type arg2 ;
@@ -64303,7 +64681,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_New__SWIG_0(int jarg1, int ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_New__SWIG_1(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Alignment_New__SWIG_1(int jarg1) {
   void * jresult ;
   Dali::Toolkit::Alignment::Type arg1 ;
   Dali::Toolkit::Alignment result;
@@ -64331,7 +64709,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_New__SWIG_1(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_New__SWIG_2() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Alignment_New__SWIG_2() {
   void * jresult ;
   Dali::Toolkit::Alignment result;
   
@@ -64357,7 +64735,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_New__SWIG_2() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Alignment__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Alignment__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Alignment *arg1 = 0 ;
   Dali::Toolkit::Alignment *result = 0 ;
@@ -64389,7 +64767,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Alignment__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Alignment(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Alignment(void * jarg1) {
   Dali::Toolkit::Alignment *arg1 = (Dali::Toolkit::Alignment *) 0 ;
   
   arg1 = (Dali::Toolkit::Alignment *)jarg1; 
@@ -64413,7 +64791,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Alignment(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Alignment_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -64447,7 +64825,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_SetAlignmentType(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Alignment_SetAlignmentType(void * jarg1, int jarg2) {
   Dali::Toolkit::Alignment *arg1 = (Dali::Toolkit::Alignment *) 0 ;
   Dali::Toolkit::Alignment::Type arg2 ;
   
@@ -64473,7 +64851,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_SetAlignmentType(void * jarg1,
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Alignment_GetAlignmentType(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Alignment_GetAlignmentType(void * jarg1) {
   int jresult ;
   Dali::Toolkit::Alignment *arg1 = (Dali::Toolkit::Alignment *) 0 ;
   Dali::Toolkit::Alignment::Type result;
@@ -64501,7 +64879,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Alignment_GetAlignmentType(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_SetScaling(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Alignment_SetScaling(void * jarg1, int jarg2) {
   Dali::Toolkit::Alignment *arg1 = (Dali::Toolkit::Alignment *) 0 ;
   Dali::Toolkit::Alignment::Scaling arg2 ;
   
@@ -64527,7 +64905,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_SetScaling(void * jarg1, int ja
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Alignment_GetScaling(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Alignment_GetScaling(void * jarg1) {
   int jresult ;
   Dali::Toolkit::Alignment *arg1 = (Dali::Toolkit::Alignment *) 0 ;
   Dali::Toolkit::Alignment::Scaling result;
@@ -64555,7 +64933,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Alignment_GetScaling(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_SetPadding(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Alignment_SetPadding(void * jarg1, void * jarg2) {
   Dali::Toolkit::Alignment *arg1 = (Dali::Toolkit::Alignment *) 0 ;
   Dali::Toolkit::Alignment::Padding *arg2 = 0 ;
   
@@ -64585,7 +64963,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Alignment_SetPadding(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_GetPadding(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Alignment_GetPadding(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Alignment *arg1 = (Dali::Toolkit::Alignment *) 0 ;
   Dali::Toolkit::Alignment::Padding *result = 0 ;
@@ -64613,7 +64991,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_GetPadding(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Alignment_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::Alignment *arg1 = (Dali::Toolkit::Alignment *) 0 ;
   Dali::Toolkit::Alignment *arg2 = 0 ;
@@ -64647,7 +65025,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Alignment_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_DISABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_DISABLED_get() {
   int jresult ;
   int result;
   
@@ -64657,7 +65035,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_DISABLED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_AUTO_REPEATING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_AUTO_REPEATING_get() {
   int jresult ;
   int result;
   
@@ -64667,7 +65045,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_AUTO_REPEATING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_INITIAL_AUTO_REPEATING_DELAY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_INITIAL_AUTO_REPEATING_DELAY_get() {
   int jresult ;
   int result;
   
@@ -64677,7 +65055,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_INITIAL_AUTO_REPEATING_DEL
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_NEXT_AUTO_REPEATING_DELAY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_NEXT_AUTO_REPEATING_DELAY_get() {
   int jresult ;
   int result;
   
@@ -64687,7 +65065,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_NEXT_AUTO_REPEATING_DELAY_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_TOGGLABLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_TOGGLABLE_get() {
   int jresult ;
   int result;
   
@@ -64697,7 +65075,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_TOGGLABLE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_SELECTED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_SELECTED_get() {
   int jresult ;
   int result;
   
@@ -64707,7 +65085,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_SELECTED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_UNSELECTED_STATE_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_UNSELECTED_STATE_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -64717,7 +65095,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_UNSELECTED_STATE_IMAGE_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_SELECTED_STATE_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_SELECTED_STATE_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -64727,7 +65105,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_SELECTED_STATE_IMAGE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_DISABLED_STATE_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_DISABLED_STATE_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -64737,7 +65115,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_DISABLED_STATE_IMAGE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_UNSELECTED_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_UNSELECTED_COLOR_get() {
   int jresult ;
   int result;
   
@@ -64747,7 +65125,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_UNSELECTED_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_SELECTED_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_SELECTED_COLOR_get() {
   int jresult ;
   int result;
   
@@ -64757,7 +65135,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_SELECTED_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_LABEL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_LABEL_get() {
   int jresult ;
   int result;
   
@@ -64767,7 +65145,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_LABEL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_LABEL_TEXT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Button_Property_LABEL_TEXT_get() {
   int jresult ;
   int result;
   
@@ -64777,7 +65155,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Button_Property_LABEL_TEXT_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Button_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Button_Property() {
   void * jresult ;
   Dali::Toolkit::Button::Property *result = 0 ;
   
@@ -64803,7 +65181,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Button_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Button_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Button_Property(void * jarg1) {
   Dali::Toolkit::Button::Property *arg1 = (Dali::Toolkit::Button::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::Button::Property *)jarg1; 
@@ -64827,7 +65205,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Button_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Button__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Button__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Button *result = 0 ;
   
@@ -64853,7 +65231,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Button__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Button__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Button__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Button *arg1 = 0 ;
   Dali::Toolkit::Button *result = 0 ;
@@ -64885,7 +65263,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Button__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Button_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Toolkit::Button *arg2 = 0 ;
@@ -64919,7 +65297,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_Assign(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Button_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -64953,7 +65331,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Button(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Button(void * jarg1) {
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   
   arg1 = (Dali::Toolkit::Button *)jarg1; 
@@ -64977,7 +65355,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Button(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Button_IsDisabled(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Button_IsDisabled(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   bool result;
@@ -65005,7 +65383,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Button_IsDisabled(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Button_IsAutoRepeating(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Button_IsAutoRepeating(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   bool result;
@@ -65033,7 +65411,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Button_IsAutoRepeating(void * jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Button_GetInitialAutoRepeatingDelay(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Button_GetInitialAutoRepeatingDelay(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   float result;
@@ -65061,7 +65439,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Button_GetInitialAutoRepeatingDelay(void
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Button_GetNextAutoRepeatingDelay(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Button_GetNextAutoRepeatingDelay(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   float result;
@@ -65089,7 +65467,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Button_GetNextAutoRepeatingDelay(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Button_IsTogglableButton(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Button_IsTogglableButton(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   bool result;
@@ -65117,7 +65495,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Button_IsTogglableButton(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Button_IsSelected(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Button_IsSelected(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   bool result;
@@ -65145,7 +65523,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Button_IsSelected(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Button_GetAnimationTime(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Button_GetAnimationTime(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   float result;
@@ -65173,7 +65551,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Button_GetAnimationTime(void * jarg1) {
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Button_GetLabelText(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_Button_GetLabelText(void * jarg1) {
   char * jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   std::string result;
@@ -65201,7 +65579,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_Button_GetLabelText(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Button_SetLabel(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Button_SetLabel(void * jarg1, void * jarg2) {
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -65233,7 +65611,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Button_SetLabel(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Button_SetButtonImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Button_SetButtonImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Image arg2 ;
   Dali::Image *argp2 ;
@@ -65265,7 +65643,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Button_SetButtonImage(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Button_SetSelectedImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Button_SetSelectedImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Image arg2 ;
   Dali::Image *argp2 ;
@@ -65297,7 +65675,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Button_SetSelectedImage(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_GetButtonImage(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Button_GetButtonImage(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Actor result;
@@ -65325,7 +65703,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_GetButtonImage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_GetSelectedImage(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Button_GetSelectedImage(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Actor result;
@@ -65353,7 +65731,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_GetSelectedImage(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_PressedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Button_PressedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Toolkit::Button::ButtonSignalType *result = 0 ;
@@ -65381,7 +65759,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_PressedSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_ReleasedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Button_ReleasedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Toolkit::Button::ButtonSignalType *result = 0 ;
@@ -65409,7 +65787,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_ReleasedSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_ClickedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Button_ClickedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Toolkit::Button::ButtonSignalType *result = 0 ;
@@ -65437,7 +65815,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_ClickedSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_StateChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Button_StateChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Button *arg1 = (Dali::Toolkit::Button *) 0 ;
   Dali::Toolkit::Button::ButtonSignalType *result = 0 ;
@@ -65465,7 +65843,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Button_StateChangedSignal(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CheckBoxButton__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CheckBoxButton__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::CheckBoxButton *result = 0 ;
   
@@ -65491,7 +65869,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CheckBoxButton__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CheckBoxButton__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_CheckBoxButton__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::CheckBoxButton *arg1 = 0 ;
   Dali::Toolkit::CheckBoxButton *result = 0 ;
@@ -65523,7 +65901,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_CheckBoxButton__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CheckBoxButton_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CheckBoxButton_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::CheckBoxButton *arg1 = (Dali::Toolkit::CheckBoxButton *) 0 ;
   Dali::Toolkit::CheckBoxButton *arg2 = 0 ;
@@ -65557,7 +65935,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CheckBoxButton_Assign(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_CheckBoxButton(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_CheckBoxButton(void * jarg1) {
   Dali::Toolkit::CheckBoxButton *arg1 = (Dali::Toolkit::CheckBoxButton *) 0 ;
   
   arg1 = (Dali::Toolkit::CheckBoxButton *)jarg1; 
@@ -65581,7 +65959,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_CheckBoxButton(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CheckBoxButton_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CheckBoxButton_New() {
   void * jresult ;
   Dali::Toolkit::CheckBoxButton result;
   
@@ -65607,7 +65985,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CheckBoxButton_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CheckBoxButton_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CheckBoxButton_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -65641,7 +66019,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_CheckBoxButton_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_UNSELECTED_ICON_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PushButton_Property_UNSELECTED_ICON_get() {
   int jresult ;
   int result;
   
@@ -65651,7 +66029,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_UNSELECTED_ICON_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_SELECTED_ICON_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PushButton_Property_SELECTED_ICON_get() {
   int jresult ;
   int result;
   
@@ -65661,7 +66039,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_SELECTED_ICON_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_ICON_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PushButton_Property_ICON_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -65671,7 +66049,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_ICON_ALIGNMENT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_LABEL_PADDING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PushButton_Property_LABEL_PADDING_get() {
   int jresult ;
   int result;
   
@@ -65681,7 +66059,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_LABEL_PADDING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_ICON_PADDING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PushButton_Property_ICON_PADDING_get() {
   int jresult ;
   int result;
   
@@ -65691,7 +66069,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PushButton_Property_ICON_PADDING_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PushButton_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PushButton_Property() {
   void * jresult ;
   Dali::Toolkit::PushButton::Property *result = 0 ;
   
@@ -65717,7 +66095,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PushButton_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PushButton_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PushButton_Property(void * jarg1) {
   Dali::Toolkit::PushButton::Property *arg1 = (Dali::Toolkit::PushButton::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::PushButton::Property *)jarg1; 
@@ -65741,7 +66119,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PushButton_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PushButton__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PushButton__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::PushButton *result = 0 ;
   
@@ -65767,7 +66145,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PushButton__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PushButton__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PushButton__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::PushButton *arg1 = 0 ;
   Dali::Toolkit::PushButton *result = 0 ;
@@ -65799,7 +66177,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PushButton__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PushButton_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PushButton_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Toolkit::PushButton *arg2 = 0 ;
@@ -65833,7 +66211,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PushButton_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PushButton(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PushButton(void * jarg1) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   
   arg1 = (Dali::Toolkit::PushButton *)jarg1; 
@@ -65857,7 +66235,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PushButton(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PushButton_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PushButton_New() {
   void * jresult ;
   Dali::Toolkit::PushButton result;
   
@@ -65883,7 +66261,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PushButton_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PushButton_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PushButton_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -65917,7 +66295,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PushButton_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetButtonImage__SWIG_0_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetButtonImage__SWIG_0_0(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Image arg2 ;
   Dali::Image *argp2 ;
@@ -65949,7 +66327,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetButtonImage__SWIG_0_0(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetButtonImage__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetButtonImage__SWIG_1(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -65981,7 +66359,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetButtonImage__SWIG_1(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetBackgroundImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetBackgroundImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -66013,7 +66391,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetBackgroundImage(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetSelectedImage__SWIG_0_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetSelectedImage__SWIG_0_0(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Image arg2 ;
   Dali::Image *argp2 ;
@@ -66045,7 +66423,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetSelectedImage__SWIG_0_0(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetSelectedImage__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetSelectedImage__SWIG_1(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -66077,7 +66455,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetSelectedImage__SWIG_1(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetSelectedBackgroundImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetSelectedBackgroundImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -66109,7 +66487,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetSelectedBackgroundImage(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetDisabledBackgroundImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetDisabledBackgroundImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -66141,7 +66519,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetDisabledBackgroundImage(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetDisabledImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetDisabledImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -66173,7 +66551,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetDisabledImage(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetDisabledSelectedImage(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PushButton_SetDisabledSelectedImage(void * jarg1, void * jarg2) {
   Dali::Toolkit::PushButton *arg1 = (Dali::Toolkit::PushButton *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -66205,7 +66583,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PushButton_SetDisabledSelectedImage(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RadioButton__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RadioButton__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::RadioButton *result = 0 ;
   
@@ -66231,7 +66609,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RadioButton__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RadioButton__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RadioButton__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::RadioButton *arg1 = 0 ;
   Dali::Toolkit::RadioButton *result = 0 ;
@@ -66263,7 +66641,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RadioButton__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RadioButton_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RadioButton_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::RadioButton *arg1 = (Dali::Toolkit::RadioButton *) 0 ;
   Dali::Toolkit::RadioButton *arg2 = 0 ;
@@ -66297,7 +66675,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RadioButton_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RadioButton(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RadioButton(void * jarg1) {
   Dali::Toolkit::RadioButton *arg1 = (Dali::Toolkit::RadioButton *) 0 ;
   
   arg1 = (Dali::Toolkit::RadioButton *)jarg1; 
@@ -66321,7 +66699,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RadioButton(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RadioButton_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RadioButton_New__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::RadioButton result;
   
@@ -66347,7 +66725,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RadioButton_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RadioButton_New__SWIG_1(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RadioButton_New__SWIG_1(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::Toolkit::RadioButton result;
@@ -66383,7 +66761,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RadioButton_New__SWIG_1(char * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RadioButton_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RadioButton_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -66417,7 +66795,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RadioButton_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_CONTENT_DIRECTION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_Property_CONTENT_DIRECTION_get() {
   int jresult ;
   int result;
   
@@ -66427,7 +66805,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_CONTENT_DIRECTION_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_FLEX_DIRECTION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_Property_FLEX_DIRECTION_get() {
   int jresult ;
   int result;
   
@@ -66437,7 +66815,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_FLEX_DIRECTION_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_FLEX_WRAP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_Property_FLEX_WRAP_get() {
   int jresult ;
   int result;
   
@@ -66447,7 +66825,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_FLEX_WRAP_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_JUSTIFY_CONTENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_Property_JUSTIFY_CONTENT_get() {
   int jresult ;
   int result;
   
@@ -66457,7 +66835,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_JUSTIFY_CONTENT_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_ALIGN_ITEMS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_Property_ALIGN_ITEMS_get() {
   int jresult ;
   int result;
   
@@ -66467,7 +66845,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_ALIGN_ITEMS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_ALIGN_CONTENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_Property_ALIGN_CONTENT_get() {
   int jresult ;
   int result;
   
@@ -66477,7 +66855,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_Property_ALIGN_CONTENT_get()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FlexContainer_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FlexContainer_Property() {
   void * jresult ;
   Dali::Toolkit::FlexContainer::Property *result = 0 ;
   
@@ -66503,7 +66881,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FlexContainer_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FlexContainer_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FlexContainer_Property(void * jarg1) {
   Dali::Toolkit::FlexContainer::Property *arg1 = (Dali::Toolkit::FlexContainer::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::FlexContainer::Property *)jarg1; 
@@ -66527,7 +66905,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FlexContainer_Property(void * jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_ChildProperty_FLEX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_ChildProperty_FLEX_get() {
   int jresult ;
   int result;
   
@@ -66537,7 +66915,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_ChildProperty_FLEX_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_ChildProperty_ALIGN_SELF_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_ChildProperty_ALIGN_SELF_get() {
   int jresult ;
   int result;
   
@@ -66547,7 +66925,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_ChildProperty_ALIGN_SELF_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_ChildProperty_FLEX_MARGIN_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_FlexContainer_ChildProperty_FLEX_MARGIN_get() {
   int jresult ;
   int result;
   
@@ -66557,7 +66935,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_FlexContainer_ChildProperty_FLEX_MARGIN_ge
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FlexContainer_ChildProperty() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FlexContainer_ChildProperty() {
   void * jresult ;
   Dali::Toolkit::FlexContainer::ChildProperty *result = 0 ;
   
@@ -66583,7 +66961,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FlexContainer_ChildProperty() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FlexContainer_ChildProperty(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FlexContainer_ChildProperty(void * jarg1) {
   Dali::Toolkit::FlexContainer::ChildProperty *arg1 = (Dali::Toolkit::FlexContainer::ChildProperty *) 0 ;
   
   arg1 = (Dali::Toolkit::FlexContainer::ChildProperty *)jarg1; 
@@ -66607,7 +66985,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FlexContainer_ChildProperty(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FlexContainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FlexContainer__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::FlexContainer *result = 0 ;
   
@@ -66633,7 +67011,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FlexContainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FlexContainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FlexContainer__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::FlexContainer *arg1 = 0 ;
   Dali::Toolkit::FlexContainer *result = 0 ;
@@ -66665,7 +67043,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FlexContainer__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FlexContainer_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexContainer_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::FlexContainer *arg1 = (Dali::Toolkit::FlexContainer *) 0 ;
   Dali::Toolkit::FlexContainer *arg2 = 0 ;
@@ -66699,7 +67077,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FlexContainer_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FlexContainer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FlexContainer(void * jarg1) {
   Dali::Toolkit::FlexContainer *arg1 = (Dali::Toolkit::FlexContainer *) 0 ;
   
   arg1 = (Dali::Toolkit::FlexContainer *)jarg1; 
@@ -66723,7 +67101,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FlexContainer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FlexContainer_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexContainer_New() {
   void * jresult ;
   Dali::Toolkit::FlexContainer result;
   
@@ -66749,7 +67127,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FlexContainer_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FlexContainer_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexContainer_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -66783,7 +67161,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_FlexContainer_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ImageView_Property_RESOURCE_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ImageView_Property_RESOURCE_URL_get() {
   int jresult ;
   int result;
   
@@ -66793,7 +67171,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ImageView_Property_RESOURCE_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ImageView_Property_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ImageView_Property_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -66803,7 +67181,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ImageView_Property_IMAGE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ImageView_Property_PRE_MULTIPLIED_ALPHA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ImageView_Property_PRE_MULTIPLIED_ALPHA_get() {
   int jresult ;
   int result;
   
@@ -66813,7 +67191,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ImageView_Property_PRE_MULTIPLIED_ALPHA_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ImageView_Property_PIXEL_AREA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ImageView_Property_PIXEL_AREA_get() {
   int jresult ;
   int result;
   
@@ -66823,7 +67201,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ImageView_Property_PIXEL_AREA_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ImageView_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ImageView_Property() {
   void * jresult ;
   Dali::Toolkit::ImageView::Property *result = 0 ;
   
@@ -66849,7 +67227,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ImageView_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ImageView_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ImageView_Property(void * jarg1) {
   Dali::Toolkit::ImageView::Property *arg1 = (Dali::Toolkit::ImageView::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::ImageView::Property *)jarg1; 
@@ -66873,7 +67251,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ImageView_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ImageView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ImageView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::ImageView *result = 0 ;
   
@@ -66899,7 +67277,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ImageView__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::ImageView result;
   
@@ -66925,7 +67303,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_New__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Image arg1 ;
   Dali::Image *argp1 ;
@@ -66959,7 +67337,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_New__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_New__SWIG_2(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_2(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::Toolkit::ImageView result;
@@ -66995,7 +67373,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_New__SWIG_2(char * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_New__SWIG_3(char * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_New__SWIG_3(char * jarg1, void * jarg2) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ImageDimensions arg2 ;
@@ -67039,7 +67417,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_New__SWIG_3(char * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ImageView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ImageView(void * jarg1) {
   Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
   
   arg1 = (Dali::Toolkit::ImageView *)jarg1; 
@@ -67063,7 +67441,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ImageView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ImageView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ImageView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ImageView *arg1 = 0 ;
   Dali::Toolkit::ImageView *result = 0 ;
@@ -67095,7 +67473,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ImageView__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
   Dali::Toolkit::ImageView *arg2 = 0 ;
@@ -67129,7 +67507,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -67163,7 +67541,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageView_SetImage__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageView_SetImage__SWIG_0(void * jarg1, void * jarg2) {
   Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
   Dali::Image arg2 ;
   Dali::Image *argp2 ;
@@ -67195,7 +67573,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageView_SetImage__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageView_SetImage__SWIG_1(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageView_SetImage__SWIG_1(void * jarg1, char * jarg2) {
   Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -67229,7 +67607,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageView_SetImage__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageView_SetImage__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImageView_SetImage__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
   Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
   std::string *arg2 = 0 ;
   Dali::ImageDimensions arg3 ;
@@ -67271,7 +67649,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ImageView_SetImage__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_GetImage(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ImageView_GetImage(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ImageView *arg1 = (Dali::Toolkit::ImageView *) 0 ;
   Dali::Image result;
@@ -67299,7 +67677,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ImageView_GetImage(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_GEOMETRY_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_GEOMETRY_URL_get() {
   int jresult ;
   int result;
   
@@ -67309,7 +67687,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_GEOMETRY_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_MATERIAL_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_MATERIAL_URL_get() {
   int jresult ;
   int result;
   
@@ -67319,7 +67697,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_MATERIAL_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_IMAGES_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_IMAGES_URL_get() {
   int jresult ;
   int result;
   
@@ -67329,7 +67707,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_IMAGES_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_ILLUMINATION_TYPE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_ILLUMINATION_TYPE_get() {
   int jresult ;
   int result;
   
@@ -67339,7 +67717,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_ILLUMINATION_TYPE_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_TEXTURE0_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE0_URL_get() {
   int jresult ;
   int result;
   
@@ -67349,7 +67727,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_TEXTURE0_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_TEXTURE1_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE1_URL_get() {
   int jresult ;
   int result;
   
@@ -67359,7 +67737,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_TEXTURE1_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_TEXTURE2_URL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_TEXTURE2_URL_get() {
   int jresult ;
   int result;
   
@@ -67369,7 +67747,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_TEXTURE2_URL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_LIGHT_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Model3dView_Property_LIGHT_POSITION_get() {
   int jresult ;
   int result;
   
@@ -67379,7 +67757,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Model3dView_Property_LIGHT_POSITION_get()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Model3dView_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Model3dView_Property() {
   void * jresult ;
   Dali::Toolkit::Model3dView::Property *result = 0 ;
   
@@ -67405,7 +67783,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Model3dView_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Model3dView_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Model3dView_Property(void * jarg1) {
   Dali::Toolkit::Model3dView::Property *arg1 = (Dali::Toolkit::Model3dView::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::Model3dView::Property *)jarg1; 
@@ -67429,7 +67807,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Model3dView_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Model3dView_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Model3dView_New__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Model3dView result;
   
@@ -67455,7 +67833,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Model3dView_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Model3dView_New__SWIG_1(char * jarg1, char * jarg2, char * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Model3dView_New__SWIG_1(char * jarg1, char * jarg2, char * jarg3) {
   void * jresult ;
   std::string *arg1 = 0 ;
   std::string *arg2 = 0 ;
@@ -67511,7 +67889,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Model3dView_New__SWIG_1(char * jarg1, c
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Model3dView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Model3dView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Model3dView *result = 0 ;
   
@@ -67537,7 +67915,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Model3dView__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Model3dView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Model3dView(void * jarg1) {
   Dali::Toolkit::Model3dView *arg1 = (Dali::Toolkit::Model3dView *) 0 ;
   
   arg1 = (Dali::Toolkit::Model3dView *)jarg1; 
@@ -67561,7 +67939,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Model3dView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Model3dView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Model3dView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Model3dView *arg1 = 0 ;
   Dali::Toolkit::Model3dView *result = 0 ;
@@ -67593,7 +67971,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Model3dView__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Model3dView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Model3dView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::Model3dView *arg1 = (Dali::Toolkit::Model3dView *) 0 ;
   Dali::Toolkit::Model3dView *arg2 = 0 ;
@@ -67627,7 +68005,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Model3dView_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Model3dView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Model3dView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -67661,7 +68039,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Model3dView_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_SCROLL_DIRECTION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_SCROLL_DIRECTION_get() {
   int jresult ;
   int result;
   
@@ -67671,7 +68049,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_SCROLL_DIRECTION_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_HEIGHT_POLICY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_HEIGHT_POLICY_get() {
   int jresult ;
   int result;
   
@@ -67681,7 +68059,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_HEIGHT_POLICY
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_FIXED_HEIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_FIXED_HEIGHT_get() {
   int jresult ;
   int result;
   
@@ -67691,7 +68069,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_FIXED_HEIGHT_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_SHOW_DURATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_SHOW_DURATION_get() {
   int jresult ;
   int result;
   
@@ -67701,7 +68079,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_SHOW_DURATION
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_HIDE_DURATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_HIDE_DURATION_get() {
   int jresult ;
   int result;
   
@@ -67711,7 +68089,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_HIDE_DURATION
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_SCROLL_POSITION_INTERVALS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_SCROLL_POSITION_INTERVALS_get() {
   int jresult ;
   int result;
   
@@ -67721,7 +68099,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_SCROLL_POSITION_INTERVA
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_MINIMUM_HEIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_MINIMUM_HEIGHT_get() {
   int jresult ;
   int result;
   
@@ -67731,7 +68109,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_MINIMUM_HEIGH
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_START_PADDING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_START_PADDING_get() {
   int jresult ;
   int result;
   
@@ -67741,7 +68119,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_START_PADDING
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_END_PADDING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_Property_INDICATOR_END_PADDING_get() {
   int jresult ;
   int result;
   
@@ -67751,7 +68129,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_Property_INDICATOR_END_PADDING_g
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollBar_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollBar_Property() {
   void * jresult ;
   Dali::Toolkit::ScrollBar::Property *result = 0 ;
   
@@ -67777,7 +68155,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollBar_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollBar_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollBar_Property(void * jarg1) {
   Dali::Toolkit::ScrollBar::Property *arg1 = (Dali::Toolkit::ScrollBar::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollBar::Property *)jarg1; 
@@ -67801,7 +68179,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollBar_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollBar__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollBar__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::ScrollBar *result = 0 ;
   
@@ -67827,7 +68205,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollBar__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollBar__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollBar__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollBar *arg1 = 0 ;
   Dali::Toolkit::ScrollBar *result = 0 ;
@@ -67859,7 +68237,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollBar__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Toolkit::ScrollBar *arg2 = 0 ;
@@ -67893,7 +68271,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollBar(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollBar(void * jarg1) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollBar *)jarg1; 
@@ -67917,7 +68295,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollBar(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_New__SWIG_0(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_New__SWIG_0(int jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollBar::Direction arg1 ;
   Dali::Toolkit::ScrollBar result;
@@ -67945,7 +68323,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_New__SWIG_0(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_New__SWIG_1() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_New__SWIG_1() {
   void * jresult ;
   Dali::Toolkit::ScrollBar result;
   
@@ -67971,7 +68349,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_New__SWIG_1() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -68005,7 +68383,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetScrollPropertySource(void * jarg1, void * jarg2, int jarg3, int jarg4, int jarg5, int jarg6) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetScrollPropertySource(void * jarg1, void * jarg2, int jarg3, int jarg4, int jarg5, int jarg6) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Handle arg2 ;
   Dali::Property::Index arg3 ;
@@ -68045,7 +68423,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetScrollPropertySource(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetScrollIndicator(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetScrollIndicator(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -68077,7 +68455,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetScrollIndicator(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_GetScrollIndicator(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_GetScrollIndicator(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Actor result;
@@ -68105,7 +68483,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_GetScrollIndicator(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetScrollPositionIntervals(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetScrollPositionIntervals(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > *arg2 = 0 ;
   
@@ -68135,7 +68513,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetScrollPositionIntervals(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_GetScrollPositionIntervals(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_GetScrollPositionIntervals(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Vector< float,TypeTraits< float >::IS_TRIVIAL_TYPE==true > result;
@@ -68163,7 +68541,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_GetScrollPositionIntervals(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetScrollDirection(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetScrollDirection(void * jarg1, int jarg2) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Toolkit::ScrollBar::Direction arg2 ;
   
@@ -68189,7 +68567,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetScrollDirection(void * jarg1
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_GetScrollDirection(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_GetScrollDirection(void * jarg1) {
   int jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Toolkit::ScrollBar::Direction result;
@@ -68217,7 +68595,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_GetScrollDirection(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetIndicatorHeightPolicy(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetIndicatorHeightPolicy(void * jarg1, int jarg2) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Toolkit::ScrollBar::IndicatorHeightPolicy arg2 ;
   
@@ -68243,7 +68621,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetIndicatorHeightPolicy(void *
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_GetIndicatorHeightPolicy(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollBar_GetIndicatorHeightPolicy(void * jarg1) {
   int jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Toolkit::ScrollBar::IndicatorHeightPolicy result;
@@ -68271,7 +68649,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollBar_GetIndicatorHeightPolicy(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetIndicatorFixedHeight(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetIndicatorFixedHeight(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   float arg2 ;
   
@@ -68297,7 +68675,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetIndicatorFixedHeight(void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollBar_GetIndicatorFixedHeight(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollBar_GetIndicatorFixedHeight(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   float result;
@@ -68325,7 +68703,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollBar_GetIndicatorFixedHeight(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetIndicatorShowDuration(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetIndicatorShowDuration(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   float arg2 ;
   
@@ -68351,7 +68729,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetIndicatorShowDuration(void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollBar_GetIndicatorShowDuration(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollBar_GetIndicatorShowDuration(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   float result;
@@ -68379,7 +68757,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollBar_GetIndicatorShowDuration(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetIndicatorHideDuration(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_SetIndicatorHideDuration(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   float arg2 ;
   
@@ -68405,7 +68783,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_SetIndicatorHideDuration(void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollBar_GetIndicatorHideDuration(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollBar_GetIndicatorHideDuration(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   float result;
@@ -68433,7 +68811,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollBar_GetIndicatorHideDuration(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_ShowIndicator(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_ShowIndicator(void * jarg1) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollBar *)jarg1; 
@@ -68457,7 +68835,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_ShowIndicator(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_HideIndicator(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollBar_HideIndicator(void * jarg1) {
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollBar *)jarg1; 
@@ -68481,7 +68859,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollBar_HideIndicator(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_PanFinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_PanFinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Toolkit::ScrollBar::PanFinishedSignalType *result = 0 ;
@@ -68509,7 +68887,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_PanFinishedSignal(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_ScrollPositionIntervalReachedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollBar_ScrollPositionIntervalReachedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollBar *arg1 = (Dali::Toolkit::ScrollBar *) 0 ;
   Dali::Toolkit::ScrollBar::ScrollPositionIntervalReachedSignalType *result = 0 ;
@@ -68537,7 +68915,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollBar_ScrollPositionIntervalReached
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -68547,7 +68925,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_OVERSHOOT_EFFECT_COLOR
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_OVERSHOOT_ANIMATION_SPEED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_OVERSHOOT_ANIMATION_SPEED_get() {
   int jresult ;
   int result;
   
@@ -68557,7 +68935,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_OVERSHOOT_ANIMATION_SP
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_OVERSHOOT_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_OVERSHOOT_ENABLED_get() {
   int jresult ;
   int result;
   
@@ -68567,7 +68945,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_OVERSHOOT_ENABLED_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_OVERSHOOT_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_OVERSHOOT_SIZE_get() {
   int jresult ;
   int result;
   
@@ -68577,7 +68955,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_OVERSHOOT_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_TO_ALPHA_FUNCTION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_SCROLL_TO_ALPHA_FUNCTION_get() {
   int jresult ;
   int result;
   
@@ -68587,7 +68965,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_TO_ALPHA_FUNCTI
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_RELATIVE_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_SCROLL_RELATIVE_POSITION_get() {
   int jresult ;
   int result;
   
@@ -68597,7 +68975,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_RELATIVE_POSITI
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MIN_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_SCROLL_POSITION_MIN_get() {
   int jresult ;
   int result;
   
@@ -68607,7 +68985,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MIN_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MIN_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_SCROLL_POSITION_MIN_X_get() {
   int jresult ;
   int result;
   
@@ -68617,7 +68995,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MIN_X_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MIN_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_SCROLL_POSITION_MIN_Y_get() {
   int jresult ;
   int result;
   
@@ -68627,7 +69005,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MIN_Y_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MAX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_SCROLL_POSITION_MAX_get() {
   int jresult ;
   int result;
   
@@ -68637,7 +69015,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MAX_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MAX_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_SCROLL_POSITION_MAX_X_get() {
   int jresult ;
   int result;
   
@@ -68647,7 +69025,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MAX_X_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MAX_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_SCROLL_POSITION_MAX_Y_get() {
   int jresult ;
   int result;
   
@@ -68657,7 +69035,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_SCROLL_POSITION_MAX_Y_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_CAN_SCROLL_VERTICAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_CAN_SCROLL_VERTICAL_get() {
   int jresult ;
   int result;
   
@@ -68667,7 +69045,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_CAN_SCROLL_VERTICAL_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_CAN_SCROLL_HORIZONTAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Scrollable_Property_CAN_SCROLL_HORIZONTAL_get() {
   int jresult ;
   int result;
   
@@ -68677,7 +69055,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Scrollable_Property_CAN_SCROLL_HORIZONTAL_
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Scrollable_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Scrollable_Property() {
   void * jresult ;
   Dali::Toolkit::Scrollable::Property *result = 0 ;
   
@@ -68703,7 +69081,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Scrollable_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Scrollable_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Scrollable_Property(void * jarg1) {
   Dali::Toolkit::Scrollable::Property *arg1 = (Dali::Toolkit::Scrollable::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::Scrollable::Property *)jarg1; 
@@ -68727,7 +69105,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Scrollable_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Scrollable__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Scrollable__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Scrollable *result = 0 ;
   
@@ -68753,7 +69131,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Scrollable__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Scrollable__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Scrollable__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Scrollable *arg1 = 0 ;
   Dali::Toolkit::Scrollable *result = 0 ;
@@ -68785,7 +69163,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Scrollable__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   Dali::Toolkit::Scrollable *arg2 = 0 ;
@@ -68819,7 +69197,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Scrollable(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Scrollable(void * jarg1) {
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   
   arg1 = (Dali::Toolkit::Scrollable *)jarg1; 
@@ -68843,7 +69221,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Scrollable(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -68877,7 +69255,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Scrollable_IsOvershootEnabled(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Scrollable_IsOvershootEnabled(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   bool result;
@@ -68905,7 +69283,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Scrollable_IsOvershootEnabled(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Scrollable_SetOvershootEnabled(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Scrollable_SetOvershootEnabled(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   bool arg2 ;
   
@@ -68931,7 +69309,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Scrollable_SetOvershootEnabled(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Scrollable_SetOvershootEffectColor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Scrollable_SetOvershootEffectColor(void * jarg1, void * jarg2) {
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
   
@@ -68961,7 +69339,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Scrollable_SetOvershootEffectColor(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_GetOvershootEffectColor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_GetOvershootEffectColor(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   Dali::Vector4 result;
@@ -68989,7 +69367,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_GetOvershootEffectColor(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Scrollable_SetOvershootAnimationSpeed(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Scrollable_SetOvershootAnimationSpeed(void * jarg1, float jarg2) {
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   float arg2 ;
   
@@ -69015,7 +69393,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Scrollable_SetOvershootAnimationSpeed(voi
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Scrollable_GetOvershootAnimationSpeed(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Scrollable_GetOvershootAnimationSpeed(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   float result;
@@ -69043,7 +69421,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Scrollable_GetOvershootAnimationSpeed(vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_ScrollStartedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_ScrollStartedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   Dali::Toolkit::Scrollable::ScrollStartedSignalType *result = 0 ;
@@ -69071,7 +69449,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_ScrollStartedSignal(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_ScrollUpdatedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_ScrollUpdatedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   Dali::Toolkit::Scrollable::ScrollUpdatedSignalType *result = 0 ;
@@ -69099,7 +69477,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_ScrollUpdatedSignal(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_ScrollCompletedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Scrollable_ScrollCompletedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Scrollable *arg1 = (Dali::Toolkit::Scrollable *) 0 ;
   Dali::Toolkit::Scrollable::ScrollCompletedSignalType *result = 0 ;
@@ -69127,7 +69505,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Scrollable_ScrollCompletedSignal(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_IsVertical(int jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_IsVertical(int jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ControlOrientation::Type arg1 ;
   bool result;
@@ -69155,7 +69533,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_IsVertical(int jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_IsHorizontal(int jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_IsHorizontal(int jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ControlOrientation::Type arg1 ;
   bool result;
@@ -69183,7 +69561,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_IsHorizontal(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemRange__SWIG_0(unsigned int jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemRange__SWIG_0(unsigned int jarg1, unsigned int jarg2) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -69213,7 +69591,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemRange__SWIG_0(unsigned int jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemRange__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemRange__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemRange *arg1 = 0 ;
   Dali::Toolkit::ItemRange *result = 0 ;
@@ -69245,7 +69623,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemRange__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemRange_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemRange_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::ItemRange *arg1 = (Dali::Toolkit::ItemRange *) 0 ;
   Dali::Toolkit::ItemRange *arg2 = 0 ;
@@ -69279,7 +69657,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemRange_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemRange_Within(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemRange_Within(void * jarg1, unsigned int jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::ItemRange *arg1 = (Dali::Toolkit::ItemRange *) 0 ;
   unsigned int arg2 ;
@@ -69309,7 +69687,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemRange_Within(void * jarg1, un
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemRange_Intersection(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemRange_Intersection(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::ItemRange *arg1 = (Dali::Toolkit::ItemRange *) 0 ;
   Dali::Toolkit::ItemRange *arg2 = 0 ;
@@ -69343,7 +69721,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemRange_Intersection(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemRange_begin_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemRange_begin_set(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ItemRange *arg1 = (Dali::Toolkit::ItemRange *) 0 ;
   unsigned int arg2 ;
   
@@ -69353,7 +69731,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemRange_begin_set(void * jarg1, unsigne
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemRange_begin_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemRange_begin_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ItemRange *arg1 = (Dali::Toolkit::ItemRange *) 0 ;
   unsigned int result;
@@ -69365,7 +69743,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemRange_begin_get(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemRange_end_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemRange_end_set(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ItemRange *arg1 = (Dali::Toolkit::ItemRange *) 0 ;
   unsigned int arg2 ;
   
@@ -69375,7 +69753,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemRange_end_set(void * jarg1, unsigned
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemRange_end_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemRange_end_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ItemRange *arg1 = (Dali::Toolkit::ItemRange *) 0 ;
   unsigned int result;
@@ -69387,7 +69765,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemRange_end_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemRange(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemRange(void * jarg1) {
   Dali::Toolkit::ItemRange *arg1 = (Dali::Toolkit::ItemRange *) 0 ;
   
   arg1 = (Dali::Toolkit::ItemRange *)jarg1; 
@@ -69411,7 +69789,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemRange(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemLayout(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemLayout(void * jarg1) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   
   arg1 = (Dali::Toolkit::ItemLayout *)jarg1; 
@@ -69435,7 +69813,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemLayout(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_SetOrientation(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemLayout_SetOrientation(void * jarg1, int jarg2) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Toolkit::ControlOrientation::Type arg2 ;
   
@@ -69461,7 +69839,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_SetOrientation(void * jarg1, i
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemLayout_GetOrientation(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemLayout_GetOrientation(void * jarg1) {
   int jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Toolkit::ControlOrientation::Type result;
@@ -69489,7 +69867,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemLayout_GetOrientation(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_SetLayoutProperties(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemLayout_SetLayoutProperties(void * jarg1, void * jarg2) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
   
@@ -69519,7 +69897,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_SetLayoutProperties(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemLayout_GetLayoutProperties(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemLayout_GetLayoutProperties(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Property::Map result;
@@ -69547,59 +69925,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemLayout_GetLayoutProperties(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemLayout_HasLayoutChanged(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
-  bool result;
-  
-  arg1 = (Dali::Toolkit::ItemLayout *)jarg1; 
-  {
-    try {
-      result = (bool)(arg1)->HasLayoutChanged();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_ResetLayoutChangedFlag(void * jarg1) {
-  Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
-  
-  arg1 = (Dali::Toolkit::ItemLayout *)jarg1; 
-  {
-    try {
-      (arg1)->ResetLayoutChangedFlag();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemSize(void * jarg1, unsigned int jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemLayout_GetItemSize(void * jarg1, unsigned int jarg2, void * jarg3, void * jarg4) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   unsigned int arg2 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -69637,7 +69963,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemSize(void * jarg1, unsi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_SetItemSize(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemLayout_SetItemSize(void * jarg1, void * jarg2) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -69667,7 +69993,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_SetItemSize(void * jarg1, void
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetMinimumLayoutPosition(void * jarg1, unsigned int jarg2, void * jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemLayout_GetMinimumLayoutPosition(void * jarg1, unsigned int jarg2, void * jarg3) {
   float jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   unsigned int arg2 ;
@@ -69705,7 +70031,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetMinimumLayoutPosition(void
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetClosestAnchorPosition(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemLayout_GetClosestAnchorPosition(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   float arg2 ;
@@ -69735,7 +70061,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetClosestAnchorPosition(void
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemScrollToPosition(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemLayout_GetItemScrollToPosition(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   unsigned int arg2 ;
@@ -69765,7 +70091,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemScrollToPosition(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemsWithinArea(void * jarg1, float jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemLayout_GetItemsWithinArea(void * jarg1, float jarg2, void * jarg3) {
   void * jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   float arg2 ;
@@ -69803,7 +70129,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemsWithinArea(void * ja
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetClosestOnScreenLayoutPosition(void * jarg1, int jarg2, float jarg3, void * jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemLayout_GetClosestOnScreenLayoutPosition(void * jarg1, int jarg2, float jarg3, void * jarg4) {
   float jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   int arg2 ;
@@ -69841,7 +70167,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetClosestOnScreenLayoutPosit
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemLayout_GetReserveItemCount(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemLayout_GetReserveItemCount(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Vector3 arg2 ;
@@ -69877,7 +70203,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemLayout_GetReserveItemCount(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_GetDefaultItemSize(void * jarg1, unsigned int jarg2, void * jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemLayout_GetDefaultItemSize(void * jarg1, unsigned int jarg2, void * jarg3, void * jarg4) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   unsigned int arg2 ;
   Dali::Vector3 *arg3 = 0 ;
@@ -69915,7 +70241,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_GetDefaultItemSize(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemLayout_GetScrollDirection(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemLayout_GetScrollDirection(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Degree result;
@@ -69943,7 +70269,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemLayout_GetScrollDirection(void * ja
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetScrollSpeedFactor(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemLayout_GetScrollSpeedFactor(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   float result;
@@ -69971,7 +70297,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetScrollSpeedFactor(void * j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetMaximumSwipeSpeed(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemLayout_GetMaximumSwipeSpeed(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   float result;
@@ -69999,7 +70325,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetMaximumSwipeSpeed(void * j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemFlickAnimationDuration(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemLayout_GetItemFlickAnimationDuration(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   float result;
@@ -70027,7 +70353,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemFlickAnimationDuration
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemLayout_GetNextFocusItemID(void * jarg1, int jarg2, int jarg3, int jarg4, unsigned int jarg5) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemLayout_GetNextFocusItemID(void * jarg1, int jarg2, int jarg3, int jarg4, unsigned int jarg5) {
   int jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   int arg2 ;
@@ -70063,7 +70389,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemLayout_GetNextFocusItemID(void * jarg1
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetFlickSpeedFactor(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemLayout_GetFlickSpeedFactor(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   float result;
@@ -70091,7 +70417,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemLayout_GetFlickSpeedFactor(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_ApplyConstraints(void * jarg1, void * jarg2, int jarg3, void * jarg4, void * jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemLayout_ApplyConstraints(void * jarg1, void * jarg2, int jarg3, void * jarg4, void * jarg5) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Actor *arg2 = 0 ;
   int arg3 ;
@@ -70135,7 +70461,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_ApplyConstraints(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemPosition(void * jarg1, int jarg2, float jarg3, void * jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemLayout_GetItemPosition(void * jarg1, int jarg2, float jarg3, void * jarg4) {
   void * jresult ;
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   int arg2 ;
@@ -70173,7 +70499,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemPosition(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NewItemLayout(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_NewItemLayout(int jarg1) {
   void * jresult ;
   Dali::Toolkit::DefaultItemLayout::Type arg1 ;
   SwigValueWrapper< Dali::IntrusivePtr< Dali::Toolkit::ItemLayout > > result;
@@ -70201,7 +70527,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_NewItemLayout(int jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemFactory(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemFactory(void * jarg1) {
   Dali::Toolkit::ItemFactory *arg1 = (Dali::Toolkit::ItemFactory *) 0 ;
   
   arg1 = (Dali::Toolkit::ItemFactory *)jarg1; 
@@ -70225,7 +70551,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemFactory(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemFactory_GetNumberOfItems(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemFactory_GetNumberOfItems(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ItemFactory *arg1 = (Dali::Toolkit::ItemFactory *) 0 ;
   unsigned int result;
@@ -70253,7 +70579,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemFactory_GetNumberOfItems(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemFactory_NewItem(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemFactory_NewItem(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Toolkit::ItemFactory *arg1 = (Dali::Toolkit::ItemFactory *) 0 ;
   unsigned int arg2 ;
@@ -70283,7 +70609,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemFactory_NewItem(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemFactory_ItemReleased(void * jarg1, unsigned int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemFactory_ItemReleased(void * jarg1, unsigned int jarg2, void * jarg3) {
   Dali::Toolkit::ItemFactory *arg1 = (Dali::Toolkit::ItemFactory *) 0 ;
   unsigned int arg2 ;
   Dali::Actor arg3 ;
@@ -70317,7 +70643,76 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemFactory_ItemReleased(void * jarg1, un
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_MINIMUM_SWIPE_SPEED_get() {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemFactory_ItemReleasedSwigExplicitItemFactory(void * jarg1, unsigned int jarg2, void * jarg3) {
+  Dali::Toolkit::ItemFactory *arg1 = (Dali::Toolkit::ItemFactory *) 0 ;
+  unsigned int arg2 ;
+  Dali::Actor arg3 ;
+  Dali::Actor *argp3 ;
+  
+  arg1 = (Dali::Toolkit::ItemFactory *)jarg1; 
+  arg2 = (unsigned int)jarg2; 
+  argp3 = (Dali::Actor *)jarg3; 
+  if (!argp3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
+    return ;
+  }
+  arg3 = *argp3; 
+  {
+    try {
+      (arg1)->Dali::Toolkit::ItemFactory::ItemReleased(arg2,arg3);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
+      };
+    }
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemFactory() {
+  void * jresult ;
+  Dali::Toolkit::ItemFactory *result = 0 ;
+  
+  {
+    try {
+      result = (Dali::Toolkit::ItemFactory *)new SwigDirector_ItemFactory();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemFactory_director_connect(void *objarg, SwigDirector_ItemFactory::SWIG_Callback0_t callback0, SwigDirector_ItemFactory::SWIG_Callback1_t callback1, SwigDirector_ItemFactory::SWIG_Callback2_t callback2) {
+  Dali::Toolkit::ItemFactory *obj = (Dali::Toolkit::ItemFactory *)objarg;
+  SwigDirector_ItemFactory *director = dynamic_cast<SwigDirector_ItemFactory *>(obj);
+  if (director) {
+    director->swig_connect_director(callback0, callback1, callback2);
+  }
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_MINIMUM_SWIPE_SPEED_get() {
   int jresult ;
   int result;
   
@@ -70327,7 +70722,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_MINIMUM_SWIPE_SPEED_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_MINIMUM_SWIPE_DISTANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_MINIMUM_SWIPE_DISTANCE_get() {
   int jresult ;
   int result;
   
@@ -70337,7 +70732,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_MINIMUM_SWIPE_DISTANCE_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_WHEEL_SCROLL_DISTANCE_STEP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_WHEEL_SCROLL_DISTANCE_STEP_get() {
   int jresult ;
   int result;
   
@@ -70347,7 +70742,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_WHEEL_SCROLL_DISTANCE_ST
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_SNAP_TO_ITEM_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_SNAP_TO_ITEM_ENABLED_get() {
   int jresult ;
   int result;
   
@@ -70357,7 +70752,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_SNAP_TO_ITEM_ENABLED_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_REFRESH_INTERVAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_REFRESH_INTERVAL_get() {
   int jresult ;
   int result;
   
@@ -70367,7 +70762,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_REFRESH_INTERVAL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_LAYOUT_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_LAYOUT_POSITION_get() {
   int jresult ;
   int result;
   
@@ -70377,7 +70772,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_LAYOUT_POSITION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_SCROLL_SPEED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_SCROLL_SPEED_get() {
   int jresult ;
   int result;
   
@@ -70387,7 +70782,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_SCROLL_SPEED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_OVERSHOOT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_OVERSHOOT_get() {
   int jresult ;
   int result;
   
@@ -70397,7 +70792,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_OVERSHOOT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_SCROLL_DIRECTION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_SCROLL_DIRECTION_get() {
   int jresult ;
   int result;
   
@@ -70407,7 +70802,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_SCROLL_DIRECTION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_LAYOUT_ORIENTATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_LAYOUT_ORIENTATION_get() {
   int jresult ;
   int result;
   
@@ -70417,7 +70812,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_LAYOUT_ORIENTATION_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_SCROLL_CONTENT_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemView_Property_SCROLL_CONTENT_SIZE_get() {
   int jresult ;
   int result;
   
@@ -70427,7 +70822,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemView_Property_SCROLL_CONTENT_SIZE_get(
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemView_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemView_Property() {
   void * jresult ;
   Dali::Toolkit::ItemView::Property *result = 0 ;
   
@@ -70453,7 +70848,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemView_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemView_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemView_Property(void * jarg1) {
   Dali::Toolkit::ItemView::Property *arg1 = (Dali::Toolkit::ItemView::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::ItemView::Property *)jarg1; 
@@ -70477,7 +70872,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemView_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::ItemView *result = 0 ;
   
@@ -70503,7 +70898,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemView__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemView *arg1 = 0 ;
   Dali::Toolkit::ItemView *result = 0 ;
@@ -70535,7 +70930,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemView__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemView *arg2 = 0 ;
@@ -70569,7 +70964,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_Assign(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemView(void * jarg1) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   
   arg1 = (Dali::Toolkit::ItemView *)jarg1; 
@@ -70593,7 +70988,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_New(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_New(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemFactory *arg1 = 0 ;
   Dali::Toolkit::ItemView result;
@@ -70625,7 +71020,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_New(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -70659,7 +71054,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemView_GetLayoutCount(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemView_GetLayoutCount(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   unsigned int result;
@@ -70687,7 +71082,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemView_GetLayoutCount(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_AddLayout(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_AddLayout(void * jarg1, void * jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemLayout *arg2 = 0 ;
   
@@ -70717,7 +71112,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_AddLayout(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_RemoveLayout(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_RemoveLayout(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   unsigned int arg2 ;
   
@@ -70743,7 +71138,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_RemoveLayout(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetLayout(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_GetLayout(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   unsigned int arg2 ;
@@ -70773,7 +71168,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetLayout(void * jarg1, unsign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetActiveLayout(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_GetActiveLayout(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   SwigValueWrapper< Dali::IntrusivePtr< Dali::Toolkit::ItemLayout > > result;
@@ -70801,7 +71196,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetActiveLayout(void * jarg1)
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetCurrentLayoutPosition(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetCurrentLayoutPosition(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemId arg2 ;
@@ -70831,7 +71226,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetCurrentLayoutPosition(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_ActivateLayout(void * jarg1, unsigned int jarg2, void * jarg3, float jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_ActivateLayout(void * jarg1, unsigned int jarg2, void * jarg3, float jarg4) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   unsigned int arg2 ;
   Dali::Vector3 arg3 ;
@@ -70867,7 +71262,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_ActivateLayout(void * jarg1, uns
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_DeactivateCurrentLayout(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_DeactivateCurrentLayout(void * jarg1) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   
   arg1 = (Dali::Toolkit::ItemView *)jarg1; 
@@ -70891,7 +71286,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_DeactivateCurrentLayout(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetMinimumSwipeSpeed(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetMinimumSwipeSpeed(void * jarg1, float jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float arg2 ;
   
@@ -70917,7 +71312,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetMinimumSwipeSpeed(void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetMinimumSwipeSpeed(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetMinimumSwipeSpeed(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float result;
@@ -70945,7 +71340,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetMinimumSwipeSpeed(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetMinimumSwipeDistance(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetMinimumSwipeDistance(void * jarg1, float jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float arg2 ;
   
@@ -70971,7 +71366,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetMinimumSwipeDistance(void * j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetMinimumSwipeDistance(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetMinimumSwipeDistance(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float result;
@@ -70999,7 +71394,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetMinimumSwipeDistance(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetWheelScrollDistanceStep(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetWheelScrollDistanceStep(void * jarg1, float jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float arg2 ;
   
@@ -71025,7 +71420,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetWheelScrollDistanceStep(void
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetWheelScrollDistanceStep(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetWheelScrollDistanceStep(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float result;
@@ -71053,7 +71448,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetWheelScrollDistanceStep(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetAnchoring(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetAnchoring(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   bool arg2 ;
   
@@ -71079,7 +71474,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetAnchoring(void * jarg1, unsig
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemView_GetAnchoring(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemView_GetAnchoring(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   bool result;
@@ -71107,7 +71502,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemView_GetAnchoring(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetAnchoringDuration(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetAnchoringDuration(void * jarg1, float jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float arg2 ;
   
@@ -71133,7 +71528,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetAnchoringDuration(void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetAnchoringDuration(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetAnchoringDuration(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float result;
@@ -71161,7 +71556,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetAnchoringDuration(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_ScrollToItem(void * jarg1, unsigned int jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_ScrollToItem(void * jarg1, unsigned int jarg2, float jarg3) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemId arg2 ;
   float arg3 ;
@@ -71189,7 +71584,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_ScrollToItem(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetRefreshInterval(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetRefreshInterval(void * jarg1, float jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float arg2 ;
   
@@ -71215,7 +71610,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetRefreshInterval(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetRefreshInterval(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ItemView_GetRefreshInterval(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   float result;
@@ -71243,7 +71638,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ItemView_GetRefreshInterval(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_Refresh(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_Refresh(void * jarg1) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   
   arg1 = (Dali::Toolkit::ItemView *)jarg1; 
@@ -71267,7 +71662,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_Refresh(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetItem(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_GetItem(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemId arg2 ;
@@ -71297,7 +71692,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetItem(void * jarg1, unsigned
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemView_GetItemId(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemView_GetItemId(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Actor arg2 ;
@@ -71333,7 +71728,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemView_GetItemId(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_InsertItem(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_InsertItem(void * jarg1, void * jarg2, float jarg3) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::Item arg2 ;
   float arg3 ;
@@ -71367,7 +71762,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_InsertItem(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_InsertItems(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_InsertItems(void * jarg1, void * jarg2, float jarg3) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemContainer *arg2 = 0 ;
   float arg3 ;
@@ -71399,7 +71794,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_InsertItems(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_RemoveItem(void * jarg1, unsigned int jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_RemoveItem(void * jarg1, unsigned int jarg2, float jarg3) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemId arg2 ;
   float arg3 ;
@@ -71427,7 +71822,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_RemoveItem(void * jarg1, unsigne
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_RemoveItems(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_RemoveItems(void * jarg1, void * jarg2, float jarg3) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemIdContainer *arg2 = 0 ;
   float arg3 ;
@@ -71459,7 +71854,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_RemoveItems(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_ReplaceItem(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_ReplaceItem(void * jarg1, void * jarg2, float jarg3) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::Item arg2 ;
   float arg3 ;
@@ -71493,7 +71888,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_ReplaceItem(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_ReplaceItems(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_ReplaceItems(void * jarg1, void * jarg2, float jarg3) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemContainer *arg2 = 0 ;
   float arg3 ;
@@ -71525,7 +71920,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_ReplaceItems(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetItemsParentOrigin(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetItemsParentOrigin(void * jarg1, void * jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -71555,7 +71950,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetItemsParentOrigin(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetItemsParentOrigin(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_GetItemsParentOrigin(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Vector3 result;
@@ -71583,7 +71978,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetItemsParentOrigin(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetItemsAnchorPoint(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_SetItemsAnchorPoint(void * jarg1, void * jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Vector3 *arg2 = 0 ;
   
@@ -71613,7 +72008,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_SetItemsAnchorPoint(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetItemsAnchorPoint(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_GetItemsAnchorPoint(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Vector3 result;
@@ -71641,7 +72036,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_GetItemsAnchorPoint(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_GetItemsRange(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemView_GetItemsRange(void * jarg1, void * jarg2) {
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemRange *arg2 = 0 ;
   
@@ -71671,7 +72066,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemView_GetItemsRange(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_LayoutActivatedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemView_LayoutActivatedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ItemView *arg1 = (Dali::Toolkit::ItemView *) 0 ;
   Dali::Toolkit::ItemView::LayoutActivatedSignalType *result = 0 ;
@@ -71699,7 +72094,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemView_LayoutActivatedSignal(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_MoveActorConstraint(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MoveActorConstraint(void * jarg1, void * jarg2) {
   Dali::Vector3 *arg1 = 0 ;
   PropertyInputContainer *arg2 = 0 ;
   
@@ -71733,7 +72128,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_MoveActorConstraint(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WrapActorConstraint(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WrapActorConstraint(void * jarg1, void * jarg2) {
   Dali::Vector3 *arg1 = 0 ;
   PropertyInputContainer *arg2 = 0 ;
   
@@ -71767,7 +72162,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_WrapActorConstraint(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollViewEffect() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollViewEffect() {
   void * jresult ;
   Dali::Toolkit::ScrollViewEffect *result = 0 ;
   
@@ -71793,7 +72188,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollViewEffect() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollViewEffect(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollViewEffect(void * jarg1) {
   Dali::Toolkit::ScrollViewEffect *arg1 = (Dali::Toolkit::ScrollViewEffect *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollViewEffect *)jarg1; 
@@ -71817,7 +72212,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollViewEffect(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollViewPagePathEffect_New(void * jarg1, void * jarg2, int jarg3, void * jarg4, unsigned int jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollViewPagePathEffect_New(void * jarg1, void * jarg2, int jarg3, void * jarg4, unsigned int jarg5) {
   void * jresult ;
   Dali::Path arg1 ;
   Dali::Vector3 *arg2 = 0 ;
@@ -71867,7 +72262,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollViewPagePathEffect_New(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollViewPagePathEffect() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollViewPagePathEffect() {
   void * jresult ;
   Dali::Toolkit::ScrollViewPagePathEffect *result = 0 ;
   
@@ -71893,7 +72288,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollViewPagePathEffect() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollViewPagePathEffect_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollViewPagePathEffect_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -71927,7 +72322,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollViewPagePathEffect_DownCast(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollViewPagePathEffect_ApplyToPage(void * jarg1, void * jarg2, unsigned int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollViewPagePathEffect_ApplyToPage(void * jarg1, void * jarg2, unsigned int jarg3) {
   Dali::Toolkit::ScrollViewPagePathEffect *arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *) 0 ;
   Dali::Actor arg2 ;
   unsigned int arg3 ;
@@ -71961,7 +72356,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollViewPagePathEffect_ApplyToPage(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollViewPagePathEffect(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollViewPagePathEffect(void * jarg1) {
   Dali::Toolkit::ScrollViewPagePathEffect *arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollViewPagePathEffect *)jarg1; 
@@ -71985,7 +72380,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollViewPagePathEffect(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ClampState2D_x_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ClampState2D_x_set(void * jarg1, int jarg2) {
   Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
   Dali::Toolkit::ClampState arg2 ;
   
@@ -71995,7 +72390,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ClampState2D_x_set(void * jarg1, int jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ClampState2D_x_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ClampState2D_x_get(void * jarg1) {
   int jresult ;
   Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
   Dali::Toolkit::ClampState result;
@@ -72007,7 +72402,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ClampState2D_x_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ClampState2D_y_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ClampState2D_y_set(void * jarg1, int jarg2) {
   Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
   Dali::Toolkit::ClampState arg2 ;
   
@@ -72017,7 +72412,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ClampState2D_y_set(void * jarg1, int jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ClampState2D_y_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ClampState2D_y_get(void * jarg1) {
   int jresult ;
   Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
   Dali::Toolkit::ClampState result;
@@ -72029,7 +72424,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ClampState2D_y_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ClampState2D() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ClampState2D() {
   void * jresult ;
   Dali::Toolkit::ClampState2D *result = 0 ;
   
@@ -72055,7 +72450,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ClampState2D() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ClampState2D(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ClampState2D(void * jarg1) {
   Dali::Toolkit::ClampState2D *arg1 = (Dali::Toolkit::ClampState2D *) 0 ;
   
   arg1 = (Dali::Toolkit::ClampState2D *)jarg1; 
@@ -72079,7 +72474,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ClampState2D(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerDomain__SWIG_0(float jarg1, float jarg2, unsigned int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RulerDomain__SWIG_0(float jarg1, float jarg2, unsigned int jarg3) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -72111,7 +72506,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerDomain__SWIG_0(float jarg1, fl
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerDomain__SWIG_1(float jarg1, float jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RulerDomain__SWIG_1(float jarg1, float jarg2) {
   void * jresult ;
   float arg1 ;
   float arg2 ;
@@ -72141,7 +72536,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerDomain__SWIG_1(float jarg1, fl
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerDomain_min_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerDomain_min_set(void * jarg1, float jarg2) {
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float arg2 ;
   
@@ -72151,7 +72546,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerDomain_min_set(void * jarg1, float j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_min_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerDomain_min_get(void * jarg1) {
   float jresult ;
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float result;
@@ -72163,7 +72558,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_min_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerDomain_max_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerDomain_max_set(void * jarg1, float jarg2) {
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float arg2 ;
   
@@ -72173,7 +72568,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerDomain_max_set(void * jarg1, float j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_max_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerDomain_max_get(void * jarg1) {
   float jresult ;
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float result;
@@ -72185,7 +72580,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_max_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerDomain_enabled_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerDomain_enabled_set(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   bool arg2 ;
   
@@ -72195,7 +72590,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerDomain_enabled_set(void * jarg1, uns
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RulerDomain_enabled_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RulerDomain_enabled_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   bool result;
@@ -72207,7 +72602,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RulerDomain_enabled_get(void * ja
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_Clamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerDomain_Clamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4) {
   float jresult ;
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float arg2 ;
@@ -72241,7 +72636,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_Clamp__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_Clamp__SWIG_1(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerDomain_Clamp__SWIG_1(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float arg2 ;
@@ -72273,7 +72668,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_Clamp__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_Clamp__SWIG_2(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerDomain_Clamp__SWIG_2(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float arg2 ;
@@ -72303,7 +72698,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_Clamp__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3, float jarg4, void * jarg5) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerDomain_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3, float jarg4, void * jarg5) {
   float jresult ;
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float arg2 ;
@@ -72343,7 +72738,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_Clamp__SWIG_3(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_GetSize(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerDomain_GetSize(void * jarg1) {
   float jresult ;
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   float result;
@@ -72371,7 +72766,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerDomain_GetSize(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RulerDomain(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RulerDomain(void * jarg1) {
   Dali::Toolkit::RulerDomain *arg1 = (Dali::Toolkit::RulerDomain *) 0 ;
   
   arg1 = (Dali::Toolkit::RulerDomain *)jarg1; 
@@ -72395,7 +72790,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RulerDomain(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Snap__SWIG_0(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_Snap__SWIG_0(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72427,7 +72822,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Snap__SWIG_0(void * jarg1, float j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Snap__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_Snap__SWIG_1(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72457,7 +72852,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Snap__SWIG_1(void * jarg1, float j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_GetPositionFromPage(void * jarg1, unsigned int jarg2, unsigned int * jarg3, unsigned int jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_GetPositionFromPage(void * jarg1, unsigned int jarg2, unsigned int * jarg3, unsigned int jarg4) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   unsigned int arg2 ;
@@ -72491,7 +72886,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_GetPositionFromPage(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Ruler_GetPageFromPosition(void * jarg1, float jarg2, unsigned int jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Ruler_GetPageFromPosition(void * jarg1, float jarg2, unsigned int jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72523,7 +72918,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Ruler_GetPageFromPosition(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Ruler_GetTotalPages(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Ruler_GetTotalPages(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   unsigned int result;
@@ -72551,7 +72946,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Ruler_GetTotalPages(void * jarg1)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Ruler_GetType(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Ruler_GetType(void * jarg1) {
   int jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   Dali::Toolkit::Ruler::RulerType result;
@@ -72579,7 +72974,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Ruler_GetType(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Ruler_IsEnabled(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Ruler_IsEnabled(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   bool result;
@@ -72607,7 +73002,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Ruler_IsEnabled(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Ruler_Enable(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Ruler_Enable(void * jarg1) {
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   
   arg1 = (Dali::Toolkit::Ruler *)jarg1; 
@@ -72631,7 +73026,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Ruler_Enable(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Ruler_Disable(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Ruler_Disable(void * jarg1) {
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   
   arg1 = (Dali::Toolkit::Ruler *)jarg1; 
@@ -72655,7 +73050,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Ruler_Disable(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Ruler_SetDomain(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Ruler_SetDomain(void * jarg1, void * jarg2) {
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   SwigValueWrapper< Dali::Toolkit::RulerDomain > arg2 ;
   Dali::Toolkit::RulerDomain *argp2 ;
@@ -72687,7 +73082,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Ruler_SetDomain(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Ruler_GetDomain(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Ruler_GetDomain(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   Dali::Toolkit::RulerDomain *result = 0 ;
@@ -72715,7 +73110,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Ruler_GetDomain(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Ruler_DisableDomain(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Ruler_DisableDomain(void * jarg1) {
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   
   arg1 = (Dali::Toolkit::Ruler *)jarg1; 
@@ -72739,7 +73134,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Ruler_DisableDomain(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Clamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_Clamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72773,7 +73168,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Clamp__SWIG_0(void * jarg1, float
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Clamp__SWIG_1(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_Clamp__SWIG_1(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72805,7 +73200,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Clamp__SWIG_1(void * jarg1, float
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Clamp__SWIG_2(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_Clamp__SWIG_2(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72835,7 +73230,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Clamp__SWIG_2(void * jarg1, float
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3, float jarg4, void * jarg5) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3, float jarg4, void * jarg5) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72875,7 +73270,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_Clamp__SWIG_3(void * jarg1, float
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_SnapAndClamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72911,7 +73306,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_SnapAndClamp__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72945,7 +73340,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_2(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_SnapAndClamp__SWIG_2(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -72977,7 +73372,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_3(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_SnapAndClamp__SWIG_3(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -73007,7 +73402,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_3(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_4(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5, void * jarg6) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_Ruler_SnapAndClamp__SWIG_4(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5, void * jarg6) {
   float jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   float arg2 ;
@@ -73049,7 +73444,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_Ruler_SnapAndClamp__SWIG_4(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_DefaultRuler() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_DefaultRuler() {
   void * jresult ;
   Dali::Toolkit::DefaultRuler *result = 0 ;
   
@@ -73075,7 +73470,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_DefaultRuler() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_DefaultRuler_Snap(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_DefaultRuler_Snap(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::Toolkit::DefaultRuler *arg1 = (Dali::Toolkit::DefaultRuler *) 0 ;
   float arg2 ;
@@ -73107,7 +73502,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_DefaultRuler_Snap(void * jarg1, float ja
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_DefaultRuler_GetPositionFromPage(void * jarg1, unsigned int jarg2, unsigned int * jarg3, unsigned int jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_DefaultRuler_GetPositionFromPage(void * jarg1, unsigned int jarg2, unsigned int * jarg3, unsigned int jarg4) {
   float jresult ;
   Dali::Toolkit::DefaultRuler *arg1 = (Dali::Toolkit::DefaultRuler *) 0 ;
   unsigned int arg2 ;
@@ -73141,7 +73536,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_DefaultRuler_GetPositionFromPage(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_DefaultRuler_GetPageFromPosition(void * jarg1, float jarg2, unsigned int jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_DefaultRuler_GetPageFromPosition(void * jarg1, float jarg2, unsigned int jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::DefaultRuler *arg1 = (Dali::Toolkit::DefaultRuler *) 0 ;
   float arg2 ;
@@ -73173,7 +73568,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_DefaultRuler_GetPageFromPosition(
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_DefaultRuler_GetTotalPages(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_DefaultRuler_GetTotalPages(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::DefaultRuler *arg1 = (Dali::Toolkit::DefaultRuler *) 0 ;
   unsigned int result;
@@ -73201,7 +73596,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_DefaultRuler_GetTotalPages(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_DefaultRuler(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_DefaultRuler(void * jarg1) {
   Dali::Toolkit::DefaultRuler *arg1 = (Dali::Toolkit::DefaultRuler *) 0 ;
   
   arg1 = (Dali::Toolkit::DefaultRuler *)jarg1; 
@@ -73225,7 +73620,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_DefaultRuler(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FixedRuler__SWIG_0(float jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FixedRuler__SWIG_0(float jarg1) {
   void * jresult ;
   float arg1 ;
   Dali::Toolkit::FixedRuler *result = 0 ;
@@ -73253,7 +73648,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FixedRuler__SWIG_0(float jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FixedRuler__SWIG_1() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FixedRuler__SWIG_1() {
   void * jresult ;
   Dali::Toolkit::FixedRuler *result = 0 ;
   
@@ -73279,7 +73674,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FixedRuler__SWIG_1() {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_FixedRuler_Snap(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_FixedRuler_Snap(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::Toolkit::FixedRuler *arg1 = (Dali::Toolkit::FixedRuler *) 0 ;
   float arg2 ;
@@ -73311,7 +73706,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_FixedRuler_Snap(void * jarg1, float jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_FixedRuler_GetPositionFromPage(void * jarg1, unsigned int jarg2, unsigned int * jarg3, unsigned int jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_FixedRuler_GetPositionFromPage(void * jarg1, unsigned int jarg2, unsigned int * jarg3, unsigned int jarg4) {
   float jresult ;
   Dali::Toolkit::FixedRuler *arg1 = (Dali::Toolkit::FixedRuler *) 0 ;
   unsigned int arg2 ;
@@ -73345,7 +73740,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_FixedRuler_GetPositionFromPage(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FixedRuler_GetPageFromPosition(void * jarg1, float jarg2, unsigned int jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_FixedRuler_GetPageFromPosition(void * jarg1, float jarg2, unsigned int jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::FixedRuler *arg1 = (Dali::Toolkit::FixedRuler *) 0 ;
   float arg2 ;
@@ -73377,7 +73772,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FixedRuler_GetPageFromPosition(vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FixedRuler_GetTotalPages(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_FixedRuler_GetTotalPages(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::FixedRuler *arg1 = (Dali::Toolkit::FixedRuler *) 0 ;
   unsigned int result;
@@ -73405,7 +73800,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FixedRuler_GetTotalPages(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FixedRuler(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FixedRuler(void * jarg1) {
   Dali::Toolkit::FixedRuler *arg1 = (Dali::Toolkit::FixedRuler *) 0 ;
   
   arg1 = (Dali::Toolkit::FixedRuler *)jarg1; 
@@ -73429,7 +73824,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FixedRuler(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_scale_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_scale_set(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
   Dali::Toolkit::ClampState2D *arg2 = (Dali::Toolkit::ClampState2D *) 0 ;
   
@@ -73439,7 +73834,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_scale_set(void * ja
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_scale_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_scale_get(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
   Dali::Toolkit::ClampState2D *result = 0 ;
@@ -73451,7 +73846,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_scale_get(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_position_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_position_set(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
   Dali::Toolkit::ClampState2D *arg2 = (Dali::Toolkit::ClampState2D *) 0 ;
   
@@ -73461,7 +73856,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_position_set(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_position_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_position_get(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
   Dali::Toolkit::ClampState2D *result = 0 ;
@@ -73473,7 +73868,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_position_get(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_rotation_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_rotation_set(void * jarg1, int jarg2) {
   Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
   Dali::Toolkit::ClampState arg2 ;
   
@@ -73483,7 +73878,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_rotation_set(void *
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_rotation_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_ClampEvent_rotation_get(void * jarg1) {
   int jresult ;
   Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
   Dali::Toolkit::ClampState result;
@@ -73495,7 +73890,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_ClampEvent_rotation_get(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView_ClampEvent() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView_ClampEvent() {
   void * jresult ;
   Dali::Toolkit::ScrollView::ClampEvent *result = 0 ;
   
@@ -73521,7 +73916,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView_ClampEvent() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollView_ClampEvent(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollView_ClampEvent(void * jarg1) {
   Dali::Toolkit::ScrollView::ClampEvent *arg1 = (Dali::Toolkit::ScrollView::ClampEvent *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollView::ClampEvent *)jarg1; 
@@ -73545,7 +73940,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollView_ClampEvent(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_type_set(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SnapEvent_type_set(void * jarg1, int jarg2) {
   Dali::Toolkit::ScrollView::SnapEvent *arg1 = (Dali::Toolkit::ScrollView::SnapEvent *) 0 ;
   Dali::Toolkit::SnapType arg2 ;
   
@@ -73555,7 +73950,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_type_set(void * jarg
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_type_get(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_SnapEvent_type_get(void * jarg1) {
   int jresult ;
   Dali::Toolkit::ScrollView::SnapEvent *arg1 = (Dali::Toolkit::ScrollView::SnapEvent *) 0 ;
   Dali::Toolkit::SnapType result;
@@ -73567,7 +73962,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_type_get(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_position_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SnapEvent_position_set(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView::SnapEvent *arg1 = (Dali::Toolkit::ScrollView::SnapEvent *) 0 ;
   Dali::Vector2 *arg2 = (Dali::Vector2 *) 0 ;
   
@@ -73577,7 +73972,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_position_set(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_position_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_SnapEvent_position_get(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView::SnapEvent *arg1 = (Dali::Toolkit::ScrollView::SnapEvent *) 0 ;
   Dali::Vector2 *result = 0 ;
@@ -73589,7 +73984,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_position_get(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_duration_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SnapEvent_duration_set(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView::SnapEvent *arg1 = (Dali::Toolkit::ScrollView::SnapEvent *) 0 ;
   float arg2 ;
   
@@ -73599,7 +73994,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_duration_set(void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_duration_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollView_SnapEvent_duration_get(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollView::SnapEvent *arg1 = (Dali::Toolkit::ScrollView::SnapEvent *) 0 ;
   float result;
@@ -73611,7 +74006,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_SnapEvent_duration_get(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView_SnapEvent() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView_SnapEvent() {
   void * jresult ;
   Dali::Toolkit::ScrollView::SnapEvent *result = 0 ;
   
@@ -73637,7 +74032,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView_SnapEvent() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollView_SnapEvent(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollView_SnapEvent(void * jarg1) {
   Dali::Toolkit::ScrollView::SnapEvent *arg1 = (Dali::Toolkit::ScrollView::SnapEvent *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollView::SnapEvent *)jarg1; 
@@ -73661,7 +74056,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollView_SnapEvent(void * jarg1)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_WRAP_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_WRAP_ENABLED_get() {
   int jresult ;
   int result;
   
@@ -73671,7 +74066,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_WRAP_ENABLED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_PANNING_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_PANNING_ENABLED_get() {
   int jresult ;
   int result;
   
@@ -73681,7 +74076,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_PANNING_ENABLED_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_AXIS_AUTO_LOCK_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_AXIS_AUTO_LOCK_ENABLED_get() {
   int jresult ;
   int result;
   
@@ -73691,7 +74086,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_AXIS_AUTO_LOCK_ENABLED
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_WHEEL_SCROLL_DISTANCE_STEP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_WHEEL_SCROLL_DISTANCE_STEP_get() {
   int jresult ;
   int result;
   
@@ -73701,7 +74096,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_WHEEL_SCROLL_DISTANCE_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_POSITION_get() {
   int jresult ;
   int result;
   
@@ -73711,7 +74106,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_POSITION_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_PRE_POSITION_get() {
   int jresult ;
   int result;
   
@@ -73721,7 +74116,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_PRE_POSITION_X_get() {
   int jresult ;
   int result;
   
@@ -73731,7 +74126,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_X_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_PRE_POSITION_Y_get() {
   int jresult ;
   int result;
   
@@ -73741,7 +74136,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_Y_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_MAX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_PRE_POSITION_MAX_get() {
   int jresult ;
   int result;
   
@@ -73751,7 +74146,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_MA
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_MAX_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_PRE_POSITION_MAX_X_get() {
   int jresult ;
   int result;
   
@@ -73761,7 +74156,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_MA
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_MAX_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_PRE_POSITION_MAX_Y_get() {
   int jresult ;
   int result;
   
@@ -73771,7 +74166,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_PRE_POSITION_MA
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_OVERSHOOT_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_OVERSHOOT_X_get() {
   int jresult ;
   int result;
   
@@ -73781,7 +74176,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_OVERSHOOT_X_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_OVERSHOOT_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_OVERSHOOT_Y_get() {
   int jresult ;
   int result;
   
@@ -73791,7 +74186,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_OVERSHOOT_Y_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_FINAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_FINAL_get() {
   int jresult ;
   int result;
   
@@ -73801,7 +74196,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_FINAL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_FINAL_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_FINAL_X_get() {
   int jresult ;
   int result;
   
@@ -73811,7 +74206,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_FINAL_X_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_FINAL_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_FINAL_Y_get() {
   int jresult ;
   int result;
   
@@ -73821,7 +74216,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_FINAL_Y_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_WRAP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_WRAP_get() {
   int jresult ;
   int result;
   
@@ -73831,7 +74226,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_WRAP_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_PANNING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_PANNING_get() {
   int jresult ;
   int result;
   
@@ -73841,7 +74236,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_PANNING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLLING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLLING_get() {
   int jresult ;
   int result;
   
@@ -73851,7 +74246,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLLING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_DOMAIN_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_DOMAIN_SIZE_get() {
   int jresult ;
   int result;
   
@@ -73861,7 +74256,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_DOMAIN_SIZE_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_DOMAIN_SIZE_X_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_DOMAIN_SIZE_X_get() {
   int jresult ;
   int result;
   
@@ -73871,7 +74266,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_DOMAIN_SIZE_X_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_DOMAIN_SIZE_Y_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_DOMAIN_SIZE_Y_get() {
   int jresult ;
   int result;
   
@@ -73881,7 +74276,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_DOMAIN_SIZE_Y_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_DOMAIN_OFFSET_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_DOMAIN_OFFSET_get() {
   int jresult ;
   int result;
   
@@ -73891,7 +74286,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_DOMAIN_OFFSET_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_POSITION_DELTA_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_SCROLL_POSITION_DELTA_get() {
   int jresult ;
   int result;
   
@@ -73901,7 +74296,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_SCROLL_POSITION_DELTA_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_START_PAGE_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_Property_START_PAGE_POSITION_get() {
   int jresult ;
   int result;
   
@@ -73911,7 +74306,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_Property_START_PAGE_POSITION_ge
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView_Property() {
   void * jresult ;
   Dali::Toolkit::ScrollView::Property *result = 0 ;
   
@@ -73937,7 +74332,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollView_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollView_Property(void * jarg1) {
   Dali::Toolkit::ScrollView::Property *arg1 = (Dali::Toolkit::ScrollView::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollView::Property *)jarg1; 
@@ -73961,7 +74356,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollView_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::ScrollView *result = 0 ;
   
@@ -73987,7 +74382,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = 0 ;
   Dali::Toolkit::ScrollView *result = 0 ;
@@ -74019,7 +74414,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollView__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Toolkit::ScrollView *arg2 = 0 ;
@@ -74053,7 +74448,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollView(void * jarg1) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollView *)jarg1; 
@@ -74077,7 +74472,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_New() {
   void * jresult ;
   Dali::Toolkit::ScrollView result;
   
@@ -74103,7 +74498,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -74137,7 +74532,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollSnapAlphaFunction(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_GetScrollSnapAlphaFunction(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::AlphaFunction result;
@@ -74165,7 +74560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollSnapAlphaFunction(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollSnapAlphaFunction(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollSnapAlphaFunction(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::AlphaFunction arg2 ;
   Dali::AlphaFunction *argp2 ;
@@ -74197,7 +74592,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollSnapAlphaFunction(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollFlickAlphaFunction(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_GetScrollFlickAlphaFunction(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::AlphaFunction result;
@@ -74225,7 +74620,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollFlickAlphaFunction(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollFlickAlphaFunction(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollFlickAlphaFunction(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::AlphaFunction arg2 ;
   Dali::AlphaFunction *argp2 ;
@@ -74257,7 +74652,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollFlickAlphaFunction(vo
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollSnapDuration(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollView_GetScrollSnapDuration(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float result;
@@ -74285,7 +74680,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollSnapDuration(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollSnapDuration(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollSnapDuration(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   
@@ -74311,7 +74706,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollSnapDuration(void * j
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollFlickDuration(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollView_GetScrollFlickDuration(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float result;
@@ -74339,7 +74734,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollFlickDuration(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollFlickDuration(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollFlickDuration(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   
@@ -74365,7 +74760,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollFlickDuration(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetRulerX(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetRulerX(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Toolkit::RulerPtr arg2 ;
   Dali::Toolkit::RulerPtr *argp2 ;
@@ -74397,7 +74792,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetRulerX(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetRulerY(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetRulerY(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Toolkit::RulerPtr arg2 ;
   Dali::Toolkit::RulerPtr *argp2 ;
@@ -74429,7 +74824,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetRulerY(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollSensitive(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollSensitive(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   bool arg2 ;
   
@@ -74455,7 +74850,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollSensitive(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetMaxOvershoot(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetMaxOvershoot(void * jarg1, float jarg2, float jarg3) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   float arg3 ;
@@ -74483,7 +74878,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetMaxOvershoot(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetSnapOvershootAlphaFunction(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetSnapOvershootAlphaFunction(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::AlphaFunction arg2 ;
   Dali::AlphaFunction *argp2 ;
@@ -74515,7 +74910,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetSnapOvershootAlphaFunction(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetSnapOvershootDuration(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetSnapOvershootDuration(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   
@@ -74541,7 +74936,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetSnapOvershootDuration(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetActorAutoSnap(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetActorAutoSnap(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   bool arg2 ;
   
@@ -74567,7 +74962,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetActorAutoSnap(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetWrapMode(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetWrapMode(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   bool arg2 ;
   
@@ -74593,7 +74988,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetWrapMode(void * jarg1, unsi
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollUpdateDistance(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ScrollView_GetScrollUpdateDistance(void * jarg1) {
   int jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   int result;
@@ -74621,7 +75016,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ScrollView_GetScrollUpdateDistance(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollUpdateDistance(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollUpdateDistance(void * jarg1, int jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   int arg2 ;
   
@@ -74647,7 +75042,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollUpdateDistance(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollView_GetAxisAutoLock(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ScrollView_GetAxisAutoLock(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   bool result;
@@ -74675,7 +75070,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollView_GetAxisAutoLock(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetAxisAutoLock(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetAxisAutoLock(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   bool arg2 ;
   
@@ -74701,7 +75096,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetAxisAutoLock(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetAxisAutoLockGradient(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollView_GetAxisAutoLockGradient(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float result;
@@ -74729,7 +75124,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetAxisAutoLockGradient(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetAxisAutoLockGradient(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetAxisAutoLockGradient(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   
@@ -74755,7 +75150,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetAxisAutoLockGradient(void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetFrictionCoefficient(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollView_GetFrictionCoefficient(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float result;
@@ -74783,7 +75178,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetFrictionCoefficient(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetFrictionCoefficient(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetFrictionCoefficient(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   
@@ -74809,7 +75204,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetFrictionCoefficient(void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetFlickSpeedCoefficient(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollView_GetFlickSpeedCoefficient(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float result;
@@ -74837,7 +75232,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetFlickSpeedCoefficient(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetFlickSpeedCoefficient(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetFlickSpeedCoefficient(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   
@@ -74863,7 +75258,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetFlickSpeedCoefficient(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetMinimumDistanceForFlick(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_GetMinimumDistanceForFlick(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 result;
@@ -74891,7 +75286,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetMinimumDistanceForFlick(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetMinimumDistanceForFlick(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetMinimumDistanceForFlick(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   
@@ -74921,7 +75316,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetMinimumDistanceForFlick(voi
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetMinimumSpeedForFlick(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollView_GetMinimumSpeedForFlick(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float result;
@@ -74949,7 +75344,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetMinimumSpeedForFlick(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetMinimumSpeedForFlick(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetMinimumSpeedForFlick(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   
@@ -74975,7 +75370,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetMinimumSpeedForFlick(void *
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetMaxFlickSpeed(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_ScrollView_GetMaxFlickSpeed(void * jarg1) {
   float jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float result;
@@ -75003,7 +75398,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_ScrollView_GetMaxFlickSpeed(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetMaxFlickSpeed(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetMaxFlickSpeed(void * jarg1, float jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   float arg2 ;
   
@@ -75029,7 +75424,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetMaxFlickSpeed(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetWheelScrollDistanceStep(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_GetWheelScrollDistanceStep(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 result;
@@ -75057,7 +75452,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetWheelScrollDistanceStep(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetWheelScrollDistanceStep(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetWheelScrollDistanceStep(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 arg2 ;
   Dali::Vector2 *argp2 ;
@@ -75089,7 +75484,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetWheelScrollDistanceStep(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetCurrentScrollPosition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_GetCurrentScrollPosition(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 result;
@@ -75117,7 +75512,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_GetCurrentScrollPosition(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollView_GetCurrentPage(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ScrollView_GetCurrentPage(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   unsigned int result;
@@ -75145,7 +75540,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollView_GetCurrentPage(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_0(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   
@@ -75175,7 +75570,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_1(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_1(void * jarg1, void * jarg2, float jarg3) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   float arg3 ;
@@ -75207,7 +75602,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_2(void * jarg1, void * jarg2, float jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_2(void * jarg1, void * jarg2, float jarg3, void * jarg4) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   float arg3 ;
@@ -75247,7 +75642,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_2(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_3(void * jarg1, void * jarg2, float jarg3, int jarg4, int jarg5) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_3(void * jarg1, void * jarg2, float jarg3, int jarg4, int jarg5) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   float arg3 ;
@@ -75283,7 +75678,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_3(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_4(void * jarg1, void * jarg2, float jarg3, void * jarg4, int jarg5, int jarg6) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_4(void * jarg1, void * jarg2, float jarg3, void * jarg4, int jarg5, int jarg6) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   float arg3 ;
@@ -75327,7 +75722,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_4(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_5(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_5(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   unsigned int arg2 ;
   
@@ -75353,7 +75748,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_5(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_6(void * jarg1, unsigned int jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_6(void * jarg1, unsigned int jarg2, float jarg3) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   unsigned int arg2 ;
   float arg3 ;
@@ -75381,7 +75776,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_6(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_7(void * jarg1, unsigned int jarg2, float jarg3, int jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_7(void * jarg1, unsigned int jarg2, float jarg3, int jarg4) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   unsigned int arg2 ;
   float arg3 ;
@@ -75411,7 +75806,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_7(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_8(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_8(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -75441,7 +75836,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_8(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_9(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ScrollTo__SWIG_9(void * jarg1, void * jarg2, float jarg3) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Actor *arg2 = 0 ;
   float arg3 ;
@@ -75473,7 +75868,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ScrollTo__SWIG_9(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollView_ScrollToSnapPoint(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ScrollView_ScrollToSnapPoint(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   bool result;
@@ -75501,7 +75896,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollView_ScrollToSnapPoint(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ApplyConstraintToChildren(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ApplyConstraintToChildren(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Constraint arg2 ;
   Dali::Constraint *argp2 ;
@@ -75533,7 +75928,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ApplyConstraintToChildren(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_RemoveConstraintsFromChildren(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_RemoveConstraintsFromChildren(void * jarg1) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollView *)jarg1; 
@@ -75557,7 +75952,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_RemoveConstraintsFromChildren(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ApplyEffect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_ApplyEffect(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Toolkit::ScrollViewEffect arg2 ;
   Dali::Toolkit::ScrollViewEffect *argp2 ;
@@ -75589,7 +75984,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_ApplyEffect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_RemoveEffect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_RemoveEffect(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Toolkit::ScrollViewEffect arg2 ;
   Dali::Toolkit::ScrollViewEffect *argp2 ;
@@ -75621,7 +76016,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_RemoveEffect(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_RemoveAllEffects(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_RemoveAllEffects(void * jarg1) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   
   arg1 = (Dali::Toolkit::ScrollView *)jarg1; 
@@ -75645,7 +76040,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_RemoveAllEffects(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_BindActor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_BindActor(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -75677,7 +76072,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_BindActor(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_UnbindActor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_UnbindActor(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -75709,7 +76104,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_UnbindActor(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollingDirection__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollingDirection__SWIG_0(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian arg3 ;
@@ -75749,7 +76144,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollingDirection__SWIG_0(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollingDirection__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_SetScrollingDirection__SWIG_1(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian *argp2 ;
@@ -75781,7 +76176,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_SetScrollingDirection__SWIG_1(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_RemoveScrollingDirection(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollView_RemoveScrollingDirection(void * jarg1, void * jarg2) {
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Radian arg2 ;
   Dali::Radian *argp2 ;
@@ -75813,7 +76208,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollView_RemoveScrollingDirection(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_SnapStartedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ScrollView_SnapStartedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ScrollView *arg1 = (Dali::Toolkit::ScrollView *) 0 ;
   Dali::Toolkit::ScrollView::SnapStartedSignalType *result = 0 ;
@@ -75841,7 +76236,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ScrollView_SnapStartedSignal(void * jar
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_ROWS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_Property_ROWS_get() {
   int jresult ;
   int result;
   
@@ -75851,7 +76246,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_ROWS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_COLUMNS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_Property_COLUMNS_get() {
   int jresult ;
   int result;
   
@@ -75861,7 +76256,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_COLUMNS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_CELL_PADDING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_Property_CELL_PADDING_get() {
   int jresult ;
   int result;
   
@@ -75871,7 +76266,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_CELL_PADDING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_LAYOUT_ROWS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_Property_LAYOUT_ROWS_get() {
   int jresult ;
   int result;
   
@@ -75881,7 +76276,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_LAYOUT_ROWS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_LAYOUT_COLUMNS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_Property_LAYOUT_COLUMNS_get() {
   int jresult ;
   int result;
   
@@ -75891,7 +76286,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_Property_LAYOUT_COLUMNS_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_Property() {
   void * jresult ;
   Dali::Toolkit::TableView::Property *result = 0 ;
   
@@ -75917,7 +76312,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TableView_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TableView_Property(void * jarg1) {
   Dali::Toolkit::TableView::Property *arg1 = (Dali::Toolkit::TableView::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::TableView::Property *)jarg1; 
@@ -75941,7 +76336,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TableView_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_CELL_INDEX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_ChildProperty_CELL_INDEX_get() {
   int jresult ;
   int result;
   
@@ -75951,7 +76346,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_CELL_INDEX_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_ROW_SPAN_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_ChildProperty_ROW_SPAN_get() {
   int jresult ;
   int result;
   
@@ -75961,7 +76356,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_ROW_SPAN_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_COLUMN_SPAN_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_ChildProperty_COLUMN_SPAN_get() {
   int jresult ;
   int result;
   
@@ -75971,7 +76366,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_COLUMN_SPAN_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_CELL_HORIZONTAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_ChildProperty_CELL_HORIZONTAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -75981,7 +76376,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_CELL_HORIZONTAL_AL
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_CELL_VERTICAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TableView_ChildProperty_CELL_VERTICAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -75991,7 +76386,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TableView_ChildProperty_CELL_VERTICAL_ALIG
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_ChildProperty() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_ChildProperty() {
   void * jresult ;
   Dali::Toolkit::TableView::ChildProperty *result = 0 ;
   
@@ -76017,7 +76412,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_ChildProperty() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TableView_ChildProperty(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TableView_ChildProperty(void * jarg1) {
   Dali::Toolkit::TableView::ChildProperty *arg1 = (Dali::Toolkit::TableView::ChildProperty *) 0 ;
   
   arg1 = (Dali::Toolkit::TableView::ChildProperty *)jarg1; 
@@ -76041,7 +76436,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TableView_ChildProperty(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_0(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_CellPosition__SWIG_0(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3, unsigned int jarg4) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -76075,7 +76470,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_0(unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_1(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_CellPosition__SWIG_1(unsigned int jarg1, unsigned int jarg2, unsigned int jarg3) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -76107,7 +76502,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_1(unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_2(unsigned int jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_CellPosition__SWIG_2(unsigned int jarg1, unsigned int jarg2) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -76137,7 +76532,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_2(unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_3(unsigned int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_CellPosition__SWIG_3(unsigned int jarg1) {
   void * jresult ;
   unsigned int arg1 ;
   Dali::Toolkit::TableView::CellPosition *result = 0 ;
@@ -76165,7 +76560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_3(unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_4() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView_CellPosition__SWIG_4() {
   void * jresult ;
   Dali::Toolkit::TableView::CellPosition *result = 0 ;
   
@@ -76191,7 +76586,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView_CellPosition__SWIG_4() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_CellPosition_rowIndex_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_CellPosition_rowIndex_set(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   unsigned int arg2 ;
   
@@ -76201,7 +76596,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_CellPosition_rowIndex_set(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_CellPosition_rowIndex_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_CellPosition_rowIndex_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   unsigned int result;
@@ -76213,7 +76608,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_CellPosition_rowIndex_g
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_CellPosition_columnIndex_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_CellPosition_columnIndex_set(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   unsigned int arg2 ;
   
@@ -76223,7 +76618,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_CellPosition_columnIndex_set(vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_CellPosition_columnIndex_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_CellPosition_columnIndex_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   unsigned int result;
@@ -76235,7 +76630,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_CellPosition_columnInde
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_CellPosition_rowSpan_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_CellPosition_rowSpan_set(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   unsigned int arg2 ;
   
@@ -76245,7 +76640,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_CellPosition_rowSpan_set(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_CellPosition_rowSpan_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_CellPosition_rowSpan_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   unsigned int result;
@@ -76257,7 +76652,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_CellPosition_rowSpan_ge
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_CellPosition_columnSpan_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_CellPosition_columnSpan_set(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   unsigned int arg2 ;
   
@@ -76267,7 +76662,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_CellPosition_columnSpan_set(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_CellPosition_columnSpan_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_CellPosition_columnSpan_get(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   unsigned int result;
@@ -76279,7 +76674,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_CellPosition_columnSpan
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TableView_CellPosition(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TableView_CellPosition(void * jarg1) {
   Dali::Toolkit::TableView::CellPosition *arg1 = (Dali::Toolkit::TableView::CellPosition *) 0 ;
   
   arg1 = (Dali::Toolkit::TableView::CellPosition *)jarg1; 
@@ -76303,7 +76698,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TableView_CellPosition(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::TableView *result = 0 ;
   
@@ -76329,7 +76724,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TableView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TableView *arg1 = 0 ;
   Dali::Toolkit::TableView *result = 0 ;
@@ -76361,7 +76756,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TableView__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Toolkit::TableView *arg2 = 0 ;
@@ -76395,7 +76790,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TableView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TableView(void * jarg1) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   
   arg1 = (Dali::Toolkit::TableView *)jarg1; 
@@ -76419,7 +76814,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TableView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_New(unsigned int jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_New(unsigned int jarg1, unsigned int jarg2) {
   void * jresult ;
   unsigned int arg1 ;
   unsigned int arg2 ;
@@ -76449,7 +76844,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_New(unsigned int jarg1, unsig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -76483,7 +76878,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_AddChild(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_AddChild(void * jarg1, void * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Actor arg2 ;
@@ -76527,7 +76922,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_AddChild(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_GetChildAt(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_GetChildAt(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Toolkit::TableView::CellPosition arg2 ;
@@ -76563,7 +76958,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_GetChildAt(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_RemoveChildAt(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_RemoveChildAt(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Toolkit::TableView::CellPosition arg2 ;
@@ -76599,7 +76994,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_RemoveChildAt(void * jarg1, v
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_FindChildPosition(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_FindChildPosition(void * jarg1, void * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Actor arg2 ;
@@ -76641,7 +77036,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_FindChildPosition(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_InsertRow(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_InsertRow(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   
@@ -76667,7 +77062,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_InsertRow(void * jarg1, unsigne
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_DeleteRow__SWIG_0(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_DeleteRow__SWIG_0(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   
@@ -76693,7 +77088,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_DeleteRow__SWIG_0(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_DeleteRow__SWIG_1(void * jarg1, unsigned int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_DeleteRow__SWIG_1(void * jarg1, unsigned int jarg2, void * jarg3) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   std::vector< Dali::Actor > *arg3 = 0 ;
@@ -76725,7 +77120,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_DeleteRow__SWIG_1(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_InsertColumn(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_InsertColumn(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   
@@ -76751,7 +77146,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_InsertColumn(void * jarg1, unsi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_DeleteColumn__SWIG_0(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_DeleteColumn__SWIG_0(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   
@@ -76777,7 +77172,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_DeleteColumn__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_DeleteColumn__SWIG_1(void * jarg1, unsigned int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_DeleteColumn__SWIG_1(void * jarg1, unsigned int jarg2, void * jarg3) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   std::vector< Dali::Actor > *arg3 = 0 ;
@@ -76809,7 +77204,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_DeleteColumn__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_Resize__SWIG_0(void * jarg1, unsigned int jarg2, unsigned int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_Resize__SWIG_0(void * jarg1, unsigned int jarg2, unsigned int jarg3) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   unsigned int arg3 ;
@@ -76837,7 +77232,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_Resize__SWIG_0(void * jarg1, un
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_Resize__SWIG_1(void * jarg1, unsigned int jarg2, unsigned int jarg3, void * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_Resize__SWIG_1(void * jarg1, unsigned int jarg2, unsigned int jarg3, void * jarg4) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   unsigned int arg3 ;
@@ -76871,7 +77266,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_Resize__SWIG_1(void * jarg1, un
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetCellPadding(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetCellPadding(void * jarg1, void * jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Size arg2 ;
   Dali::Size *argp2 ;
@@ -76903,7 +77298,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetCellPadding(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_GetCellPadding(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TableView_GetCellPadding(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Size result;
@@ -76931,7 +77326,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TableView_GetCellPadding(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetFitHeight(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetFitHeight(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   
@@ -76957,7 +77352,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetFitHeight(void * jarg1, unsi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_IsFitHeight(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_IsFitHeight(void * jarg1, unsigned int jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
@@ -76987,7 +77382,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_IsFitHeight(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetFitWidth(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetFitWidth(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   
@@ -77013,7 +77408,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetFitWidth(void * jarg1, unsig
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_IsFitWidth(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_IsFitWidth(void * jarg1, unsigned int jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
@@ -77043,7 +77438,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_IsFitWidth(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetFixedHeight(void * jarg1, unsigned int jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetFixedHeight(void * jarg1, unsigned int jarg2, float jarg3) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   float arg3 ;
@@ -77071,7 +77466,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetFixedHeight(void * jarg1, un
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TableView_GetFixedHeight(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TableView_GetFixedHeight(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
@@ -77101,7 +77496,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TableView_GetFixedHeight(void * jarg1, u
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetRelativeHeight(void * jarg1, unsigned int jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetRelativeHeight(void * jarg1, unsigned int jarg2, float jarg3) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   float arg3 ;
@@ -77129,7 +77524,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetRelativeHeight(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TableView_GetRelativeHeight(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TableView_GetRelativeHeight(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
@@ -77159,7 +77554,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TableView_GetRelativeHeight(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetFixedWidth(void * jarg1, unsigned int jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetFixedWidth(void * jarg1, unsigned int jarg2, float jarg3) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   float arg3 ;
@@ -77187,7 +77582,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetFixedWidth(void * jarg1, uns
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TableView_GetFixedWidth(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TableView_GetFixedWidth(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
@@ -77217,7 +77612,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TableView_GetFixedWidth(void * jarg1, un
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetRelativeWidth(void * jarg1, unsigned int jarg2, float jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetRelativeWidth(void * jarg1, unsigned int jarg2, float jarg3) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
   float arg3 ;
@@ -77245,7 +77640,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetRelativeWidth(void * jarg1,
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TableView_GetRelativeWidth(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_TableView_GetRelativeWidth(void * jarg1, unsigned int jarg2) {
   float jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int arg2 ;
@@ -77275,7 +77670,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_TableView_GetRelativeWidth(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_GetRows(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_GetRows(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int result;
@@ -77303,7 +77698,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_GetRows(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_GetColumns(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TableView_GetColumns(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   unsigned int result;
@@ -77331,7 +77726,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TableView_GetColumns(void * jarg1
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetCellAlignment(void * jarg1, void * jarg2, int jarg3, int jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TableView_SetCellAlignment(void * jarg1, void * jarg2, int jarg3, int jarg4) {
   Dali::Toolkit::TableView *arg1 = (Dali::Toolkit::TableView *) 0 ;
   Dali::Toolkit::TableView::CellPosition arg2 ;
   Dali::HorizontalAlignment::Type arg3 ;
@@ -77367,7 +77762,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TableView_SetCellAlignment(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_DEFAULT_RENDERING_BACKEND_get() {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_DEFAULT_RENDERING_BACKEND_get() {
   unsigned int jresult ;
   unsigned int result;
   
@@ -77377,7 +77772,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_DEFAULT_RENDERING_BACKEND_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_RENDERING_BACKEND_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_RENDERING_BACKEND_get() {
   int jresult ;
   int result;
   
@@ -77387,7 +77782,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_RENDERING_BACKEND_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_TEXT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_TEXT_get() {
   int jresult ;
   int result;
   
@@ -77397,7 +77792,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_TEXT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_TEXT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_TEXT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -77407,7 +77802,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_TEXT_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_FONT_FAMILY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_FONT_FAMILY_get() {
   int jresult ;
   int result;
   
@@ -77417,7 +77812,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_FONT_FAMILY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_FONT_STYLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_FONT_STYLE_get() {
   int jresult ;
   int result;
   
@@ -77427,7 +77822,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_FONT_STYLE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_POINT_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_POINT_SIZE_get() {
   int jresult ;
   int result;
   
@@ -77437,7 +77832,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_POINT_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_HORIZONTAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_HORIZONTAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -77447,7 +77842,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_HORIZONTAL_ALIGNMENT_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SCROLL_THRESHOLD_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SCROLL_THRESHOLD_get() {
   int jresult ;
   int result;
   
@@ -77457,7 +77852,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SCROLL_THRESHOLD_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SCROLL_SPEED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SCROLL_SPEED_get() {
   int jresult ;
   int result;
   
@@ -77467,7 +77862,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SCROLL_SPEED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_PRIMARY_CURSOR_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_PRIMARY_CURSOR_COLOR_get() {
   int jresult ;
   int result;
   
@@ -77477,7 +77872,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_PRIMARY_CURSOR_COLOR_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SECONDARY_CURSOR_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SECONDARY_CURSOR_COLOR_get() {
   int jresult ;
   int result;
   
@@ -77487,7 +77882,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SECONDARY_CURSOR_COLOR
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_ENABLE_CURSOR_BLINK_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_ENABLE_CURSOR_BLINK_get() {
   int jresult ;
   int result;
   
@@ -77497,7 +77892,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_ENABLE_CURSOR_BLINK_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_CURSOR_BLINK_INTERVAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_CURSOR_BLINK_INTERVAL_get() {
   int jresult ;
   int result;
   
@@ -77507,7 +77902,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_CURSOR_BLINK_INTERVAL_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_CURSOR_BLINK_DURATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_CURSOR_BLINK_DURATION_get() {
   int jresult ;
   int result;
   
@@ -77517,7 +77912,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_CURSOR_BLINK_DURATION_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_CURSOR_WIDTH_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_CURSOR_WIDTH_get() {
   int jresult ;
   int result;
   
@@ -77527,7 +77922,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_CURSOR_WIDTH_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_GRAB_HANDLE_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_GRAB_HANDLE_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -77537,7 +77932,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_GRAB_HANDLE_IMAGE_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_GRAB_HANDLE_PRESSED_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_GRAB_HANDLE_PRESSED_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -77547,7 +77942,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_GRAB_HANDLE_PRESSED_IM
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_IMAGE_LEFT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SELECTION_HANDLE_IMAGE_LEFT_get() {
   int jresult ;
   int result;
   
@@ -77557,7 +77952,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_IMAGE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_IMAGE_RIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SELECTION_HANDLE_IMAGE_RIGHT_get() {
   int jresult ;
   int result;
   
@@ -77567,7 +77962,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_IMAGE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_PRESSED_IMAGE_LEFT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SELECTION_HANDLE_PRESSED_IMAGE_LEFT_get() {
   int jresult ;
   int result;
   
@@ -77577,7 +77972,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_PRESS
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT_get() {
   int jresult ;
   int result;
   
@@ -77587,7 +77982,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_PRESS
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_MARKER_IMAGE_LEFT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SELECTION_HANDLE_MARKER_IMAGE_LEFT_get() {
   int jresult ;
   int result;
   
@@ -77597,7 +77992,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_MARKE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_MARKER_IMAGE_RIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SELECTION_HANDLE_MARKER_IMAGE_RIGHT_get() {
   int jresult ;
   int result;
   
@@ -77607,7 +78002,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HANDLE_MARKE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HIGHLIGHT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SELECTION_HIGHLIGHT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -77617,7 +78012,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SELECTION_HIGHLIGHT_CO
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_DECORATION_BOUNDING_BOX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_DECORATION_BOUNDING_BOX_get() {
   int jresult ;
   int result;
   
@@ -77627,7 +78022,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_DECORATION_BOUNDING_BO
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_ENABLE_MARKUP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_ENABLE_MARKUP_get() {
   int jresult ;
   int result;
   
@@ -77637,7 +78032,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_ENABLE_MARKUP_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -77647,7 +78042,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_FONT_FAMILY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_FONT_FAMILY_get() {
   int jresult ;
   int result;
   
@@ -77657,7 +78052,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_FONT_FAMILY_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_FONT_STYLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_FONT_STYLE_get() {
   int jresult ;
   int result;
   
@@ -77667,7 +78062,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_FONT_STYLE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_POINT_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_POINT_SIZE_get() {
   int jresult ;
   int result;
   
@@ -77677,7 +78072,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_POINT_SIZE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_LINE_SPACING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_LINE_SPACING_get() {
   int jresult ;
   int result;
   
@@ -77687,7 +78082,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_LINE_SPACING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_LINE_SPACING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_LINE_SPACING_get() {
   int jresult ;
   int result;
   
@@ -77697,7 +78092,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_LINE_SPACING_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_UNDERLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_UNDERLINE_get() {
   int jresult ;
   int result;
   
@@ -77707,7 +78102,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_UNDERLINE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_UNDERLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_UNDERLINE_get() {
   int jresult ;
   int result;
   
@@ -77717,7 +78112,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_UNDERLINE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SHADOW_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_SHADOW_get() {
   int jresult ;
   int result;
   
@@ -77727,7 +78122,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_SHADOW_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_SHADOW_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_SHADOW_get() {
   int jresult ;
   int result;
   
@@ -77737,7 +78132,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_SHADOW_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_EMBOSS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_EMBOSS_get() {
   int jresult ;
   int result;
   
@@ -77747,7 +78142,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_EMBOSS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_EMBOSS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_EMBOSS_get() {
   int jresult ;
   int result;
   
@@ -77757,7 +78152,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_EMBOSS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_OUTLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_OUTLINE_get() {
   int jresult ;
   int result;
   
@@ -77767,7 +78162,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_OUTLINE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_OUTLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_INPUT_OUTLINE_get() {
   int jresult ;
   int result;
   
@@ -77777,7 +78172,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextEditor_Property_INPUT_OUTLINE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditor_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditor_Property() {
   void * jresult ;
   Dali::Toolkit::TextEditor::Property *result = 0 ;
   
@@ -77803,7 +78198,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditor_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextEditor_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextEditor_Property(void * jarg1) {
   Dali::Toolkit::TextEditor::Property *arg1 = (Dali::Toolkit::TextEditor::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::TextEditor::Property *)jarg1; 
@@ -77827,7 +78222,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextEditor_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditor_InputStyle() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditor_InputStyle() {
   void * jresult ;
   Dali::Toolkit::TextEditor::InputStyle *result = 0 ;
   
@@ -77853,7 +78248,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditor_InputStyle() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextEditor_InputStyle(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextEditor_InputStyle(void * jarg1) {
   Dali::Toolkit::TextEditor::InputStyle *arg1 = (Dali::Toolkit::TextEditor::InputStyle *) 0 ;
   
   arg1 = (Dali::Toolkit::TextEditor::InputStyle *)jarg1; 
@@ -77877,7 +78272,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextEditor_InputStyle(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_New() {
   void * jresult ;
   Dali::Toolkit::TextEditor result;
   
@@ -77903,7 +78298,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditor__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditor__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::TextEditor *result = 0 ;
   
@@ -77929,7 +78324,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditor__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditor__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditor__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TextEditor *arg1 = 0 ;
   Dali::Toolkit::TextEditor *result = 0 ;
@@ -77961,7 +78356,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditor__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::TextEditor *arg1 = (Dali::Toolkit::TextEditor *) 0 ;
   Dali::Toolkit::TextEditor *arg2 = 0 ;
@@ -77995,7 +78390,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextEditor(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextEditor(void * jarg1) {
   Dali::Toolkit::TextEditor *arg1 = (Dali::Toolkit::TextEditor *) 0 ;
   
   arg1 = (Dali::Toolkit::TextEditor *)jarg1; 
@@ -78019,7 +78414,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextEditor(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -78053,7 +78448,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_TextChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_TextChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TextEditor *arg1 = (Dali::Toolkit::TextEditor *) 0 ;
   Dali::Toolkit::TextEditor::TextChangedSignalType *result = 0 ;
@@ -78081,7 +78476,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_TextChangedSignal(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_InputStyleChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextEditor_InputStyleChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TextEditor *arg1 = (Dali::Toolkit::TextEditor *) 0 ;
   Dali::Toolkit::TextEditor::InputStyleChangedSignalType *result = 0 ;
@@ -78109,7 +78504,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextEditor_InputStyleChangedSignal(void
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_RENDERING_BACKEND_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_RENDERING_BACKEND_get() {
   int jresult ;
   int result;
   
@@ -78119,7 +78514,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_RENDERING_BACKEND_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_TEXT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_TEXT_get() {
   int jresult ;
   int result;
   
@@ -78129,7 +78524,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_TEXT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_PLACEHOLDER_TEXT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_PLACEHOLDER_TEXT_get() {
   int jresult ;
   int result;
   
@@ -78139,7 +78534,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_PLACEHOLDER_TEXT_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_PLACEHOLDER_TEXT_FOCUSED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_PLACEHOLDER_TEXT_FOCUSED_get() {
   int jresult ;
   int result;
   
@@ -78149,7 +78544,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_PLACEHOLDER_TEXT_FOCUSE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_FONT_FAMILY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_FONT_FAMILY_get() {
   int jresult ;
   int result;
   
@@ -78159,7 +78554,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_FONT_FAMILY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_FONT_STYLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_FONT_STYLE_get() {
   int jresult ;
   int result;
   
@@ -78169,7 +78564,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_FONT_STYLE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_POINT_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_POINT_SIZE_get() {
   int jresult ;
   int result;
   
@@ -78179,7 +78574,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_POINT_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_MAX_LENGTH_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_MAX_LENGTH_get() {
   int jresult ;
   int result;
   
@@ -78189,7 +78584,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_MAX_LENGTH_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_EXCEED_POLICY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_EXCEED_POLICY_get() {
   int jresult ;
   int result;
   
@@ -78199,7 +78594,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_EXCEED_POLICY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_HORIZONTAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_HORIZONTAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -78209,7 +78604,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_HORIZONTAL_ALIGNMENT_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_VERTICAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_VERTICAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -78219,7 +78614,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_VERTICAL_ALIGNMENT_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_TEXT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_TEXT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -78229,7 +78624,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_TEXT_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_PLACEHOLDER_TEXT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_PLACEHOLDER_TEXT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -78239,7 +78634,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_PLACEHOLDER_TEXT_COLOR_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SHADOW_OFFSET_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SHADOW_OFFSET_get() {
   int jresult ;
   int result;
   
@@ -78249,7 +78644,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SHADOW_OFFSET_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SHADOW_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SHADOW_COLOR_get() {
   int jresult ;
   int result;
   
@@ -78259,7 +78654,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SHADOW_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_PRIMARY_CURSOR_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_PRIMARY_CURSOR_COLOR_get() {
   int jresult ;
   int result;
   
@@ -78269,7 +78664,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_PRIMARY_CURSOR_COLOR_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SECONDARY_CURSOR_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SECONDARY_CURSOR_COLOR_get() {
   int jresult ;
   int result;
   
@@ -78279,7 +78674,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SECONDARY_CURSOR_COLOR_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_ENABLE_CURSOR_BLINK_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_ENABLE_CURSOR_BLINK_get() {
   int jresult ;
   int result;
   
@@ -78289,7 +78684,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_ENABLE_CURSOR_BLINK_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_CURSOR_BLINK_INTERVAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_CURSOR_BLINK_INTERVAL_get() {
   int jresult ;
   int result;
   
@@ -78299,7 +78694,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_CURSOR_BLINK_INTERVAL_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_CURSOR_BLINK_DURATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_CURSOR_BLINK_DURATION_get() {
   int jresult ;
   int result;
   
@@ -78309,7 +78704,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_CURSOR_BLINK_DURATION_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_CURSOR_WIDTH_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_CURSOR_WIDTH_get() {
   int jresult ;
   int result;
   
@@ -78319,7 +78714,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_CURSOR_WIDTH_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_GRAB_HANDLE_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_GRAB_HANDLE_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -78329,7 +78724,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_GRAB_HANDLE_IMAGE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_GRAB_HANDLE_PRESSED_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_GRAB_HANDLE_PRESSED_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -78339,7 +78734,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_GRAB_HANDLE_PRESSED_IMA
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SCROLL_THRESHOLD_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SCROLL_THRESHOLD_get() {
   int jresult ;
   int result;
   
@@ -78349,7 +78744,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SCROLL_THRESHOLD_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SCROLL_SPEED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SCROLL_SPEED_get() {
   int jresult ;
   int result;
   
@@ -78359,7 +78754,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SCROLL_SPEED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_IMAGE_LEFT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SELECTION_HANDLE_IMAGE_LEFT_get() {
   int jresult ;
   int result;
   
@@ -78369,7 +78764,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_IMAGE_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_IMAGE_RIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SELECTION_HANDLE_IMAGE_RIGHT_get() {
   int jresult ;
   int result;
   
@@ -78379,7 +78774,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_IMAGE_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_PRESSED_IMAGE_LEFT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SELECTION_HANDLE_PRESSED_IMAGE_LEFT_get() {
   int jresult ;
   int result;
   
@@ -78389,7 +78784,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_PRESSE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT_get() {
   int jresult ;
   int result;
   
@@ -78399,7 +78794,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_PRESSE
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_MARKER_IMAGE_LEFT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SELECTION_HANDLE_MARKER_IMAGE_LEFT_get() {
   int jresult ;
   int result;
   
@@ -78409,7 +78804,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_MARKER
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_MARKER_IMAGE_RIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SELECTION_HANDLE_MARKER_IMAGE_RIGHT_get() {
   int jresult ;
   int result;
   
@@ -78419,7 +78814,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HANDLE_MARKER
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HIGHLIGHT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SELECTION_HIGHLIGHT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -78429,7 +78824,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SELECTION_HIGHLIGHT_COL
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_DECORATION_BOUNDING_BOX_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_DECORATION_BOUNDING_BOX_get() {
   int jresult ;
   int result;
   
@@ -78439,7 +78834,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_DECORATION_BOUNDING_BOX
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_METHOD_SETTINGS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_METHOD_SETTINGS_get() {
   int jresult ;
   int result;
   
@@ -78449,7 +78844,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_METHOD_SETTINGS_g
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -78459,7 +78854,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_ENABLE_MARKUP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_ENABLE_MARKUP_get() {
   int jresult ;
   int result;
   
@@ -78469,7 +78864,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_ENABLE_MARKUP_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_FONT_FAMILY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_FONT_FAMILY_get() {
   int jresult ;
   int result;
   
@@ -78479,7 +78874,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_FONT_FAMILY_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_FONT_STYLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_FONT_STYLE_get() {
   int jresult ;
   int result;
   
@@ -78489,7 +78884,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_FONT_STYLE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_POINT_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_POINT_SIZE_get() {
   int jresult ;
   int result;
   
@@ -78499,7 +78894,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_POINT_SIZE_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_UNDERLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_UNDERLINE_get() {
   int jresult ;
   int result;
   
@@ -78509,7 +78904,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_UNDERLINE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_UNDERLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_UNDERLINE_get() {
   int jresult ;
   int result;
   
@@ -78519,7 +78914,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_UNDERLINE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SHADOW_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_SHADOW_get() {
   int jresult ;
   int result;
   
@@ -78529,7 +78924,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_SHADOW_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_SHADOW_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_SHADOW_get() {
   int jresult ;
   int result;
   
@@ -78539,7 +78934,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_SHADOW_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_EMBOSS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_EMBOSS_get() {
   int jresult ;
   int result;
   
@@ -78549,7 +78944,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_EMBOSS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_EMBOSS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_EMBOSS_get() {
   int jresult ;
   int result;
   
@@ -78559,7 +78954,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_EMBOSS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_OUTLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_OUTLINE_get() {
   int jresult ;
   int result;
   
@@ -78569,7 +78964,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_OUTLINE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_OUTLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_INPUT_OUTLINE_get() {
   int jresult ;
   int result;
   
@@ -78579,7 +78974,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextField_Property_INPUT_OUTLINE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextField_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextField_Property() {
   void * jresult ;
   Dali::Toolkit::TextField::Property *result = 0 ;
   
@@ -78605,7 +79000,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextField_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextField_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextField_Property(void * jarg1) {
   Dali::Toolkit::TextField::Property *arg1 = (Dali::Toolkit::TextField::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::TextField::Property *)jarg1; 
@@ -78629,7 +79024,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextField_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextField_InputStyle() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextField_InputStyle() {
   void * jresult ;
   Dali::Toolkit::TextField::InputStyle *result = 0 ;
   
@@ -78655,7 +79050,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextField_InputStyle() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextField_InputStyle(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextField_InputStyle(void * jarg1) {
   Dali::Toolkit::TextField::InputStyle *arg1 = (Dali::Toolkit::TextField::InputStyle *) 0 ;
   
   arg1 = (Dali::Toolkit::TextField::InputStyle *)jarg1; 
@@ -78679,7 +79074,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextField_InputStyle(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_New() {
   void * jresult ;
   Dali::Toolkit::TextField result;
   
@@ -78705,7 +79100,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextField__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextField__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::TextField *result = 0 ;
   
@@ -78731,7 +79126,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextField__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextField__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextField__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TextField *arg1 = 0 ;
   Dali::Toolkit::TextField *result = 0 ;
@@ -78763,7 +79158,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextField__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::TextField *arg1 = (Dali::Toolkit::TextField *) 0 ;
   Dali::Toolkit::TextField *arg2 = 0 ;
@@ -78797,7 +79192,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextField(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextField(void * jarg1) {
   Dali::Toolkit::TextField *arg1 = (Dali::Toolkit::TextField *) 0 ;
   
   arg1 = (Dali::Toolkit::TextField *)jarg1; 
@@ -78821,7 +79216,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextField(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -78855,7 +79250,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_TextChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_TextChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TextField *arg1 = (Dali::Toolkit::TextField *) 0 ;
   Dali::Toolkit::TextField::TextChangedSignalType *result = 0 ;
@@ -78883,7 +79278,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_TextChangedSignal(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_MaxLengthReachedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_MaxLengthReachedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TextField *arg1 = (Dali::Toolkit::TextField *) 0 ;
   Dali::Toolkit::TextField::MaxLengthReachedSignalType *result = 0 ;
@@ -78911,7 +79306,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_MaxLengthReachedSignal(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_InputStyleChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextField_InputStyleChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TextField *arg1 = (Dali::Toolkit::TextField *) 0 ;
   Dali::Toolkit::TextField::InputStyleChangedSignalType *result = 0 ;
@@ -78939,7 +79334,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextField_InputStyleChangedSignal(void
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_RENDERING_BACKEND_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_RENDERING_BACKEND_get() {
   int jresult ;
   int result;
   
@@ -78949,7 +79344,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_RENDERING_BACKEND_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_TEXT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_TEXT_get() {
   int jresult ;
   int result;
   
@@ -78959,7 +79354,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_TEXT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_FONT_FAMILY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_FONT_FAMILY_get() {
   int jresult ;
   int result;
   
@@ -78969,7 +79364,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_FONT_FAMILY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_FONT_STYLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_FONT_STYLE_get() {
   int jresult ;
   int result;
   
@@ -78979,7 +79374,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_FONT_STYLE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_POINT_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_POINT_SIZE_get() {
   int jresult ;
   int result;
   
@@ -78989,7 +79384,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_POINT_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_MULTI_LINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_MULTI_LINE_get() {
   int jresult ;
   int result;
   
@@ -78999,7 +79394,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_MULTI_LINE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_HORIZONTAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_HORIZONTAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -79009,7 +79404,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_HORIZONTAL_ALIGNMENT_ge
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_VERTICAL_ALIGNMENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_VERTICAL_ALIGNMENT_get() {
   int jresult ;
   int result;
   
@@ -79019,7 +79414,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_VERTICAL_ALIGNMENT_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_TEXT_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_TEXT_COLOR_get() {
   int jresult ;
   int result;
   
@@ -79029,7 +79424,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_TEXT_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_SHADOW_OFFSET_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_SHADOW_OFFSET_get() {
   int jresult ;
   int result;
   
@@ -79039,7 +79434,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_SHADOW_OFFSET_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_SHADOW_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_SHADOW_COLOR_get() {
   int jresult ;
   int result;
   
@@ -79049,7 +79444,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_SHADOW_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_UNDERLINE_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_UNDERLINE_ENABLED_get() {
   int jresult ;
   int result;
   
@@ -79059,7 +79454,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_UNDERLINE_ENABLED_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_UNDERLINE_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_UNDERLINE_COLOR_get() {
   int jresult ;
   int result;
   
@@ -79069,7 +79464,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_UNDERLINE_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_UNDERLINE_HEIGHT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_UNDERLINE_HEIGHT_get() {
   int jresult ;
   int result;
   
@@ -79079,7 +79474,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_UNDERLINE_HEIGHT_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_ENABLE_MARKUP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_ENABLE_MARKUP_get() {
   int jresult ;
   int result;
   
@@ -79089,7 +79484,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_ENABLE_MARKUP_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_ENABLE_AUTO_SCROLL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_ENABLE_AUTO_SCROLL_get() {
   int jresult ;
   int result;
   
@@ -79099,7 +79494,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_ENABLE_AUTO_SCROLL_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_AUTO_SCROLL_SPEED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_AUTO_SCROLL_SPEED_get() {
   int jresult ;
   int result;
   
@@ -79109,7 +79504,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_AUTO_SCROLL_SPEED_get()
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_AUTO_SCROLL_LOOP_COUNT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_AUTO_SCROLL_LOOP_COUNT_get() {
   int jresult ;
   int result;
   
@@ -79119,7 +79514,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_AUTO_SCROLL_LOOP_COUNT_
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_AUTO_SCROLL_GAP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_AUTO_SCROLL_GAP_get() {
   int jresult ;
   int result;
   
@@ -79129,7 +79524,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_AUTO_SCROLL_GAP_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_LINE_SPACING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_LINE_SPACING_get() {
   int jresult ;
   int result;
   
@@ -79139,7 +79534,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_LINE_SPACING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_UNDERLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_UNDERLINE_get() {
   int jresult ;
   int result;
   
@@ -79149,7 +79544,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_UNDERLINE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_SHADOW_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_SHADOW_get() {
   int jresult ;
   int result;
   
@@ -79159,7 +79554,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_SHADOW_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_EMBOSS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_EMBOSS_get() {
   int jresult ;
   int result;
   
@@ -79169,7 +79564,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_EMBOSS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_OUTLINE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_OUTLINE_get() {
   int jresult ;
   int result;
   
@@ -79179,7 +79574,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TextLabel_Property_OUTLINE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextLabel_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextLabel_Property() {
   void * jresult ;
   Dali::Toolkit::TextLabel::Property *result = 0 ;
   
@@ -79205,7 +79600,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextLabel_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextLabel_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextLabel_Property(void * jarg1) {
   Dali::Toolkit::TextLabel::Property *arg1 = (Dali::Toolkit::TextLabel::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::TextLabel::Property *)jarg1; 
@@ -79229,7 +79624,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextLabel_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextLabel_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::TextLabel result;
   
@@ -79255,7 +79650,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextLabel_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextLabel_New__SWIG_1(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_New__SWIG_1(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::Toolkit::TextLabel result;
@@ -79291,7 +79686,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextLabel_New__SWIG_1(char * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextLabel__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextLabel__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::TextLabel *result = 0 ;
   
@@ -79317,7 +79712,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextLabel__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextLabel__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextLabel__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::TextLabel *arg1 = 0 ;
   Dali::Toolkit::TextLabel *result = 0 ;
@@ -79349,7 +79744,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextLabel__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextLabel_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::TextLabel *arg1 = (Dali::Toolkit::TextLabel *) 0 ;
   Dali::Toolkit::TextLabel *arg2 = 0 ;
@@ -79383,7 +79778,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextLabel_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextLabel(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextLabel(void * jarg1) {
   Dali::Toolkit::TextLabel *arg1 = (Dali::Toolkit::TextLabel *) 0 ;
   
   arg1 = (Dali::Toolkit::TextLabel *)jarg1; 
@@ -79407,7 +79802,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextLabel(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextLabel_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -79441,7 +79836,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_TextLabel_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AccessibilityManager() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AccessibilityManager() {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *result = 0 ;
   
@@ -79467,7 +79862,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AccessibilityManager() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AccessibilityManager(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AccessibilityManager(void * jarg1) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   
   arg1 = (Dali::Toolkit::AccessibilityManager *)jarg1; 
@@ -79491,7 +79886,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AccessibilityManager(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_Get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_Get() {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager result;
   
@@ -79517,7 +79912,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_Get() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetAccessibilityAttribute(void * jarg1, void * jarg2, int jarg3, char * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityManager_SetAccessibilityAttribute(void * jarg1, void * jarg2, int jarg3, char * jarg4) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityAttribute arg3 ;
@@ -79561,7 +79956,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetAccessibilityAttr
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetAccessibilityAttribute(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetAccessibilityAttribute(void * jarg1, void * jarg2, int jarg3) {
   char * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
@@ -79599,7 +79994,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetAccessibilityAt
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetFocusOrder(void * jarg1, void * jarg2, unsigned int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityManager_SetFocusOrder(void * jarg1, void * jarg2, unsigned int jarg3) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
   unsigned int arg3 ;
@@ -79633,7 +80028,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetFocusOrder(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetFocusOrder(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetFocusOrder(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
@@ -79669,7 +80064,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetFocusOrde
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GenerateNewFocusOrder(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_GenerateNewFocusOrder(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   unsigned int result;
@@ -79697,7 +80092,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GenerateNewF
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetActorByFocusOrder(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetActorByFocusOrder(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   unsigned int arg2 ;
@@ -79727,7 +80122,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetActorByFocusOrd
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetCurrentFocusActor(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_SetCurrentFocusActor(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
@@ -79763,7 +80158,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetCurrentFo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetCurrentFocusActor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetCurrentFocusActor(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor result;
@@ -79791,7 +80186,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetCurrentFocusAct
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetCurrentFocusGroup(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetCurrentFocusGroup(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor result;
@@ -79819,7 +80214,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetCurrentFocusGro
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetCurrentFocusOrder(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetCurrentFocusOrder(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   unsigned int result;
@@ -79847,7 +80242,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetCurrentFo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_MoveFocusForward(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_MoveFocusForward(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   bool result;
@@ -79875,7 +80270,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_MoveFocusFor
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_MoveFocusBackward(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_MoveFocusBackward(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   bool result;
@@ -79903,7 +80298,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_MoveFocusBac
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_ClearFocus(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityManager_ClearFocus(void * jarg1) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   
   arg1 = (Dali::Toolkit::AccessibilityManager *)jarg1; 
@@ -79927,7 +80322,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_ClearFocus(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_Reset(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityManager_Reset(void * jarg1) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   
   arg1 = (Dali::Toolkit::AccessibilityManager *)jarg1; 
@@ -79951,7 +80346,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_Reset(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetFocusGroup(void * jarg1, void * jarg2, unsigned int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityManager_SetFocusGroup(void * jarg1, void * jarg2, unsigned int jarg3) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
   bool arg3 ;
@@ -79985,7 +80380,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetFocusGroup(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_IsFocusGroup(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_IsFocusGroup(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
@@ -80021,7 +80416,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_IsFocusGroup
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetGroupMode(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityManager_SetGroupMode(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   bool arg2 ;
   
@@ -80047,7 +80442,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetGroupMode(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetGroupMode(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetGroupMode(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   bool result;
@@ -80075,7 +80470,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetGroupMode
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetWrapMode(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityManager_SetWrapMode(void * jarg1, unsigned int jarg2) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   bool arg2 ;
   
@@ -80101,7 +80496,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetWrapMode(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetWrapMode(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetWrapMode(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   bool result;
@@ -80129,7 +80524,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetWrapMode(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetFocusIndicatorActor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityManager_SetFocusIndicatorActor(void * jarg1, void * jarg2) {
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -80161,7 +80556,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityManager_SetFocusIndicatorAct
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetFocusIndicatorActor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetFocusIndicatorActor(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor result;
@@ -80189,7 +80584,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetFocusIndicatorA
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetFocusGroup(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetFocusGroup(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Actor arg2 ;
@@ -80225,7 +80620,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetFocusGroup(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetReadPosition(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_GetReadPosition(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Vector2 result;
@@ -80253,7 +80648,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_GetReadPosition(vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_FocusChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_FocusChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::FocusChangedSignalType *result = 0 ;
@@ -80281,7 +80676,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_FocusChangedSignal
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_FocusOvershotSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_FocusOvershotSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::FocusOvershotSignalType *result = 0 ;
@@ -80309,7 +80704,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_FocusOvershotSigna
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_FocusedActorActivatedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_FocusedActorActivatedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::FocusedActorActivatedSignalType *result = 0 ;
@@ -80337,7 +80732,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_FocusedActorActiva
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_StatusChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_StatusChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80365,7 +80760,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_StatusChangedSigna
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionNextSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionNextSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80393,7 +80788,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionNextSignal(v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPreviousSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionPreviousSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80421,7 +80816,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPreviousSign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionActivateSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionActivateSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80449,7 +80844,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionActivateSign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionReadSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80477,7 +80872,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadSignal(v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionOverSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionOverSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80505,7 +80900,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionOverSignal(v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadNextSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionReadNextSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80533,7 +80928,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadNextSign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadPreviousSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionReadPreviousSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80561,7 +80956,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadPrevious
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionUpSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionUpSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80589,7 +80984,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionUpSignal(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionDownSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionDownSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80617,7 +81012,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionDownSignal(v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionClearFocusSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionClearFocusSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80645,7 +81040,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionClearFocusSi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionBackSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionBackSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80673,7 +81068,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionBackSignal(v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionScrollUpSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionScrollUpSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80701,7 +81096,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionScrollUpSign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionScrollDownSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionScrollDownSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80729,7 +81124,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionScrollDownSi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPageLeftSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionPageLeftSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80757,7 +81152,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPageLeftSign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPageRightSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionPageRightSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80785,7 +81180,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPageRightSig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPageUpSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionPageUpSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80813,7 +81208,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPageUpSignal
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPageDownSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionPageDownSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80841,7 +81236,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionPageDownSign
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionMoveToFirstSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionMoveToFirstSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80869,7 +81264,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionMoveToFirstS
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionMoveToLastSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionMoveToLastSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80897,7 +81292,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionMoveToLastSi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadFromTopSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionReadFromTopSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80925,7 +81320,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadFromTopS
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadFromNextSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionReadFromNextSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80953,7 +81348,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadFromNext
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionZoomSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionZoomSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -80981,7 +81376,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionZoomSignal(v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadIndicatorInformationSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionReadIndicatorInformationSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -81009,7 +81404,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadIndicato
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadPauseResumeSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionReadPauseResumeSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -81037,7 +81432,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionReadPauseRes
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionStartStopSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionStartStopSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionSignalType *result = 0 ;
@@ -81065,7 +81460,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionStartStopSig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionScrollSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_ActionScrollSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
   Dali::Toolkit::AccessibilityManager::AccessibilityActionScrollSignalType *result = 0 ;
@@ -81093,7 +81488,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AccessibilityManager_ActionScrollSignal
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StyleManager() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StyleManager() {
   void * jresult ;
   Dali::Toolkit::StyleManager *result = 0 ;
   
@@ -81119,7 +81514,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StyleManager() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_StyleManager(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_StyleManager(void * jarg1) {
   Dali::Toolkit::StyleManager *arg1 = (Dali::Toolkit::StyleManager *) 0 ;
   
   arg1 = (Dali::Toolkit::StyleManager *)jarg1; 
@@ -81143,7 +81538,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_StyleManager(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StyleManager_Get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StyleManager_Get() {
   void * jresult ;
   Dali::Toolkit::StyleManager result;
   
@@ -81169,7 +81564,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StyleManager_Get() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleManager_ApplyTheme(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StyleManager_ApplyTheme(void * jarg1, char * jarg2) {
   Dali::Toolkit::StyleManager *arg1 = (Dali::Toolkit::StyleManager *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -81203,7 +81598,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleManager_ApplyTheme(void * jarg1, cha
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleManager_ApplyDefaultTheme(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StyleManager_ApplyDefaultTheme(void * jarg1) {
   Dali::Toolkit::StyleManager *arg1 = (Dali::Toolkit::StyleManager *) 0 ;
   
   arg1 = (Dali::Toolkit::StyleManager *)jarg1; 
@@ -81227,7 +81622,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleManager_ApplyDefaultTheme(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleManager_SetStyleConstant(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StyleManager_SetStyleConstant(void * jarg1, char * jarg2, void * jarg3) {
   Dali::Toolkit::StyleManager *arg1 = (Dali::Toolkit::StyleManager *) 0 ;
   std::string *arg2 = 0 ;
   Dali::Property::Value *arg3 = 0 ;
@@ -81267,7 +81662,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleManager_SetStyleConstant(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_StyleManager_GetStyleConstant(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_StyleManager_GetStyleConstant(void * jarg1, char * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::StyleManager *arg1 = (Dali::Toolkit::StyleManager *) 0 ;
   std::string *arg2 = 0 ;
@@ -81311,7 +81706,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_StyleManager_GetStyleConstant(voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleManager_ApplyStyle(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StyleManager_ApplyStyle(void * jarg1, void * jarg2, char * jarg3, char * jarg4) {
   Dali::Toolkit::StyleManager *arg1 = (Dali::Toolkit::StyleManager *) 0 ;
   Dali::Toolkit::Control arg2 ;
   std::string *arg3 = 0 ;
@@ -81363,7 +81758,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleManager_ApplyStyle(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StyleManager_StyleChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_StyleManager_StyleChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::StyleManager *arg1 = (Dali::Toolkit::StyleManager *) 0 ;
   Dali::Toolkit::StyleManager::StyleChangedSignalType *result = 0 ;
@@ -81391,7 +81786,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_StyleManager_StyleChangedSignal(void *
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_LOWER_BOUND_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_LOWER_BOUND_get() {
   int jresult ;
   int result;
   
@@ -81401,7 +81796,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_LOWER_BOUND_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_UPPER_BOUND_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_UPPER_BOUND_get() {
   int jresult ;
   int result;
   
@@ -81411,7 +81806,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_UPPER_BOUND_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_VALUE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_VALUE_get() {
   int jresult ;
   int result;
   
@@ -81421,7 +81816,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_VALUE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_TRACK_VISUAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_TRACK_VISUAL_get() {
   int jresult ;
   int result;
   
@@ -81431,7 +81826,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_TRACK_VISUAL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_HANDLE_VISUAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_HANDLE_VISUAL_get() {
   int jresult ;
   int result;
   
@@ -81441,7 +81836,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_HANDLE_VISUAL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_PROGRESS_VISUAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_PROGRESS_VISUAL_get() {
   int jresult ;
   int result;
   
@@ -81451,7 +81846,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_PROGRESS_VISUAL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_POPUP_VISUAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_POPUP_VISUAL_get() {
   int jresult ;
   int result;
   
@@ -81461,7 +81856,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_POPUP_VISUAL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_POPUP_ARROW_VISUAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_POPUP_ARROW_VISUAL_get() {
   int jresult ;
   int result;
   
@@ -81471,7 +81866,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_POPUP_ARROW_VISUAL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_DISABLED_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_DISABLED_COLOR_get() {
   int jresult ;
   int result;
   
@@ -81481,7 +81876,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_DISABLED_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_VALUE_PRECISION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_VALUE_PRECISION_get() {
   int jresult ;
   int result;
   
@@ -81491,7 +81886,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_VALUE_PRECISION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_SHOW_POPUP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_SHOW_POPUP_get() {
   int jresult ;
   int result;
   
@@ -81501,7 +81896,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_SHOW_POPUP_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_SHOW_VALUE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_SHOW_VALUE_get() {
   int jresult ;
   int result;
   
@@ -81511,7 +81906,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_SHOW_VALUE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_MARKS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_MARKS_get() {
   int jresult ;
   int result;
   
@@ -81521,7 +81916,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_MARKS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_SNAP_TO_MARKS_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_SNAP_TO_MARKS_get() {
   int jresult ;
   int result;
   
@@ -81531,7 +81926,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_SNAP_TO_MARKS_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_MARK_TOLERANCE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Slider_Property_MARK_TOLERANCE_get() {
   int jresult ;
   int result;
   
@@ -81541,7 +81936,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Slider_Property_MARK_TOLERANCE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Slider_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Slider_Property() {
   void * jresult ;
   Dali::Toolkit::Slider::Property *result = 0 ;
   
@@ -81567,7 +81962,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Slider_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Slider_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Slider_Property(void * jarg1) {
   Dali::Toolkit::Slider::Property *arg1 = (Dali::Toolkit::Slider::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::Slider::Property *)jarg1; 
@@ -81591,7 +81986,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Slider_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Slider_New() {
   void * jresult ;
   Dali::Toolkit::Slider result;
   
@@ -81617,7 +82012,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Slider__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Slider__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Slider *result = 0 ;
   
@@ -81643,7 +82038,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Slider__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Slider__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Slider__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Slider *arg1 = 0 ;
   Dali::Toolkit::Slider *result = 0 ;
@@ -81675,7 +82070,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Slider__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Slider_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::Slider *arg1 = (Dali::Toolkit::Slider *) 0 ;
   Dali::Toolkit::Slider *arg2 = 0 ;
@@ -81709,7 +82104,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_Assign(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Slider(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Slider(void * jarg1) {
   Dali::Toolkit::Slider *arg1 = (Dali::Toolkit::Slider *) 0 ;
   
   arg1 = (Dali::Toolkit::Slider *)jarg1; 
@@ -81733,7 +82128,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Slider(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Slider_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -81767,7 +82162,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_ValueChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Slider_ValueChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Slider *arg1 = (Dali::Toolkit::Slider *) 0 ;
   Dali::Toolkit::Slider::ValueChangedSignalType *result = 0 ;
@@ -81795,7 +82190,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_ValueChangedSignal(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_SlidingFinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Slider_SlidingFinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Slider *arg1 = (Dali::Toolkit::Slider *) 0 ;
   Dali::Toolkit::Slider::ValueChangedSignalType *result = 0 ;
@@ -81823,7 +82218,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_SlidingFinishedSignal(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_MarkReachedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Slider_MarkReachedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Slider *arg1 = (Dali::Toolkit::Slider *) 0 ;
   Dali::Toolkit::Slider::MarkReachedSignalType *result = 0 ;
@@ -81851,7 +82246,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Slider_MarkReachedSignal(void * jarg1)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VideoView_Property_VIDEO_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VideoView_Property_VIDEO_get() {
   int jresult ;
   int result;
   
@@ -81861,7 +82256,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VideoView_Property_VIDEO_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VideoView_Property_LOOPING_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VideoView_Property_LOOPING_get() {
   int jresult ;
   int result;
   
@@ -81871,7 +82266,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VideoView_Property_LOOPING_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VideoView_Property_MUTED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VideoView_Property_MUTED_get() {
   int jresult ;
   int result;
   
@@ -81881,7 +82276,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VideoView_Property_MUTED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VideoView_Property_VOLUME_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VideoView_Property_VOLUME_get() {
   int jresult ;
   int result;
   
@@ -81891,7 +82286,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_VideoView_Property_VOLUME_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VideoView_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VideoView_Property() {
   void * jresult ;
   Dali::Toolkit::VideoView::Property *result = 0 ;
   
@@ -81917,7 +82312,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VideoView_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VideoView_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VideoView_Property(void * jarg1) {
   Dali::Toolkit::VideoView::Property *arg1 = (Dali::Toolkit::VideoView::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::VideoView::Property *)jarg1; 
@@ -81941,7 +82336,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VideoView_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_New__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::VideoView result;
   
@@ -81967,7 +82362,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_New__SWIG_1(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_New__SWIG_1(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::Toolkit::VideoView result;
@@ -82003,7 +82398,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_New__SWIG_1(char * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VideoView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VideoView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::VideoView *result = 0 ;
   
@@ -82029,7 +82424,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VideoView__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VideoView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VideoView(void * jarg1) {
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
   
   arg1 = (Dali::Toolkit::VideoView *)jarg1; 
@@ -82053,7 +82448,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VideoView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VideoView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VideoView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::VideoView *arg1 = 0 ;
   Dali::Toolkit::VideoView *result = 0 ;
@@ -82085,7 +82480,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VideoView__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
   Dali::Toolkit::VideoView *arg2 = 0 ;
@@ -82119,7 +82514,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_Assign(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -82153,7 +82548,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Play(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoView_Play(void * jarg1) {
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
   
   arg1 = (Dali::Toolkit::VideoView *)jarg1; 
@@ -82177,7 +82572,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Play(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Pause(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoView_Pause(void * jarg1) {
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
   
   arg1 = (Dali::Toolkit::VideoView *)jarg1; 
@@ -82201,7 +82596,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Pause(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Stop(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoView_Stop(void * jarg1) {
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
   
   arg1 = (Dali::Toolkit::VideoView *)jarg1; 
@@ -82225,7 +82620,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Stop(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Forward(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoView_Forward(void * jarg1, int jarg2) {
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
   int arg2 ;
   
@@ -82251,7 +82646,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Forward(void * jarg1, int jarg2
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Backward(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoView_Backward(void * jarg1, int jarg2) {
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
   int arg2 ;
   
@@ -82277,7 +82672,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoView_Backward(void * jarg1, int jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_FinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_FinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *) 0 ;
   Dali::Toolkit::VideoView::VideoViewSignalType *result = 0 ;
@@ -82305,7 +82700,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VideoView_FinishedSignal(void * jarg1)
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TITLE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TITLE_get() {
   int jresult ;
   int result;
   
@@ -82315,7 +82710,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TITLE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_CONTENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_CONTENT_get() {
   int jresult ;
   int result;
   
@@ -82325,7 +82720,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_CONTENT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_FOOTER_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_FOOTER_get() {
   int jresult ;
   int result;
   
@@ -82335,7 +82730,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_FOOTER_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_DISPLAY_STATE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_DISPLAY_STATE_get() {
   int jresult ;
   int result;
   
@@ -82345,7 +82740,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_DISPLAY_STATE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TOUCH_TRANSPARENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TOUCH_TRANSPARENT_get() {
   int jresult ;
   int result;
   
@@ -82355,7 +82750,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TOUCH_TRANSPARENT_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_VISIBILITY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TAIL_VISIBILITY_get() {
   int jresult ;
   int result;
   
@@ -82365,7 +82760,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_VISIBILITY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_POSITION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TAIL_POSITION_get() {
   int jresult ;
   int result;
   
@@ -82375,7 +82770,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_POSITION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_CONTEXTUAL_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_CONTEXTUAL_MODE_get() {
   int jresult ;
   int result;
   
@@ -82385,7 +82780,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_CONTEXTUAL_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_ANIMATION_DURATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_ANIMATION_DURATION_get() {
   int jresult ;
   int result;
   
@@ -82395,7 +82790,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_ANIMATION_DURATION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_ANIMATION_MODE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_ANIMATION_MODE_get() {
   int jresult ;
   int result;
   
@@ -82405,7 +82800,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_ANIMATION_MODE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_ENTRY_ANIMATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_ENTRY_ANIMATION_get() {
   int jresult ;
   int result;
   
@@ -82415,7 +82810,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_ENTRY_ANIMATION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_EXIT_ANIMATION_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_EXIT_ANIMATION_get() {
   int jresult ;
   int result;
   
@@ -82425,7 +82820,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_EXIT_ANIMATION_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_AUTO_HIDE_DELAY_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_AUTO_HIDE_DELAY_get() {
   int jresult ;
   int result;
   
@@ -82435,7 +82830,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_AUTO_HIDE_DELAY_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_BACKING_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_BACKING_ENABLED_get() {
   int jresult ;
   int result;
   
@@ -82445,7 +82840,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_BACKING_ENABLED_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_BACKING_COLOR_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_BACKING_COLOR_get() {
   int jresult ;
   int result;
   
@@ -82455,7 +82850,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_BACKING_COLOR_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_POPUP_BACKGROUND_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_POPUP_BACKGROUND_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -82465,7 +82860,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_POPUP_BACKGROUND_IMAGE_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_POPUP_BACKGROUND_BORDER_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_POPUP_BACKGROUND_BORDER_get() {
   int jresult ;
   int result;
   
@@ -82475,7 +82870,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_POPUP_BACKGROUND_BORDER_get
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_UP_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TAIL_UP_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -82485,7 +82880,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_UP_IMAGE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_DOWN_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TAIL_DOWN_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -82495,7 +82890,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_DOWN_IMAGE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_LEFT_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TAIL_LEFT_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -82505,7 +82900,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_LEFT_IMAGE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_RIGHT_IMAGE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TAIL_RIGHT_IMAGE_get() {
   int jresult ;
   int result;
   
@@ -82515,7 +82910,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_RIGHT_IMAGE_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Popup_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Popup_Property() {
   void * jresult ;
   Dali::Toolkit::Popup::Property *result = 0 ;
   
@@ -82541,7 +82936,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Popup_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Popup_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Popup_Property(void * jarg1) {
   Dali::Toolkit::Popup::Property *arg1 = (Dali::Toolkit::Popup::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::Popup::Property *)jarg1; 
@@ -82565,7 +82960,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Popup_Property(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Popup__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Popup__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Popup *result = 0 ;
   
@@ -82591,7 +82986,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Popup__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_New() {
   void * jresult ;
   Dali::Toolkit::Popup result;
   
@@ -82617,7 +83012,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_New() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Popup(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Popup(void * jarg1) {
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   
   arg1 = (Dali::Toolkit::Popup *)jarg1; 
@@ -82641,7 +83036,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Popup(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Popup__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Popup__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Popup *arg1 = 0 ;
   Dali::Toolkit::Popup *result = 0 ;
@@ -82673,7 +83068,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Popup__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Toolkit::Popup *arg2 = 0 ;
@@ -82707,7 +83102,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_Assign(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -82741,7 +83136,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Popup_SetTitle(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Popup_SetTitle(void * jarg1, void * jarg2) {
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -82773,7 +83168,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Popup_SetTitle(void * jarg1, void * jarg2
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_GetTitle(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_GetTitle(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Actor result;
@@ -82801,7 +83196,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_GetTitle(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Popup_SetContent(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Popup_SetContent(void * jarg1, void * jarg2) {
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -82833,7 +83228,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Popup_SetContent(void * jarg1, void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_GetContent(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_GetContent(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Actor result;
@@ -82861,7 +83256,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_GetContent(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Popup_SetFooter(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Popup_SetFooter(void * jarg1, void * jarg2) {
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -82893,7 +83288,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Popup_SetFooter(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_GetFooter(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_GetFooter(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Actor result;
@@ -82921,7 +83316,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_GetFooter(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Popup_SetDisplayState(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Popup_SetDisplayState(void * jarg1, int jarg2) {
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Toolkit::Popup::DisplayState arg2 ;
   
@@ -82947,7 +83342,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Popup_SetDisplayState(void * jarg1, int j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_GetDisplayState(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_GetDisplayState(void * jarg1) {
   int jresult ;
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Toolkit::Popup::DisplayState result;
@@ -82975,7 +83370,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_GetDisplayState(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_OutsideTouchedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_OutsideTouchedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Toolkit::Popup::TouchedOutsideSignalType *result = 0 ;
@@ -83003,7 +83398,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_OutsideTouchedSignal(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_ShowingSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_ShowingSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Toolkit::Popup::DisplayStateChangeSignalType *result = 0 ;
@@ -83031,7 +83426,63 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_ShowingSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_ShownSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_ShownSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
+  Dali::Toolkit::Popup::DisplayStateChangeSignalType *result = 0 ;
+  
+  arg1 = (Dali::Toolkit::Popup *)jarg1; 
+  {
+    try {
+      result = (Dali::Toolkit::Popup::DisplayStateChangeSignalType *) &(arg1)->ShownSignal();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_HidingSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
+  Dali::Toolkit::Popup::DisplayStateChangeSignalType *result = 0 ;
+  
+  arg1 = (Dali::Toolkit::Popup *)jarg1; 
+  {
+    try {
+      result = (Dali::Toolkit::Popup::DisplayStateChangeSignalType *) &(arg1)->HidingSignal();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Popup_HiddenSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
   Dali::Toolkit::Popup::DisplayStateChangeSignalType *result = 0 ;
@@ -83039,7 +83490,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_ShownSignal(void * jarg1) {
   arg1 = (Dali::Toolkit::Popup *)jarg1; 
   {
     try {
-      result = (Dali::Toolkit::Popup::DisplayStateChangeSignalType *) &(arg1)->ShownSignal();
+      result = (Dali::Toolkit::Popup::DisplayStateChangeSignalType *) &(arg1)->HiddenSignal();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -83059,73 +83510,37 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_ShownSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_HidingSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
-  Dali::Toolkit::Popup::DisplayStateChangeSignalType *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_PROGRESS_VALUE_get() {
+  int jresult ;
+  int result;
   
-  arg1 = (Dali::Toolkit::Popup *)jarg1; 
-  {
-    try {
-      result = (Dali::Toolkit::Popup::DisplayStateChangeSignalType *) &(arg1)->HidingSignal();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
+  result = (int)Dali::Toolkit::ProgressBar::Property::PROGRESS_VALUE;
+  jresult = (int)result; 
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Popup_HiddenSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Popup *arg1 = (Dali::Toolkit::Popup *) 0 ;
-  Dali::Toolkit::Popup::DisplayStateChangeSignalType *result = 0 ;
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_SECONDARY_PROGRESS_VALUE_get() {
+  int jresult ;
+  int result;
   
-  arg1 = (Dali::Toolkit::Popup *)jarg1; 
-  {
-    try {
-      result = (Dali::Toolkit::Popup::DisplayStateChangeSignalType *) &(arg1)->HiddenSignal();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
+  //result = (int)Dali::Toolkit::ProgressBar::Property::SECONDARY_PROGRESS_VALUE;
+  //jresult = (int)result; 
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ProgressBar_Property_PROGRESS_VALUE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_INDETERMINATE_get() {
   int jresult ;
   int result;
   
-  result = (int)Dali::Toolkit::ProgressBar::Property::PROGRESS_VALUE;
-  jresult = (int)result; 
+  //result = (int)Dali::Toolkit::ProgressBar::Property::INDETERMINATE;
+  //jresult = (int)result; 
   return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ProgressBar_Property_TRACK_VISUAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_TRACK_VISUAL_get() {
   int jresult ;
   int result;
   
@@ -83135,7 +83550,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ProgressBar_Property_TRACK_VISUAL_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ProgressBar_Property_PROGRESS_VISUAL_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_PROGRESS_VISUAL_get() {
   int jresult ;
   int result;
   
@@ -83145,7 +83560,47 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ProgressBar_Property_PROGRESS_VISUAL_get()
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ProgressBar_Property() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_SECONDARY_PROGRESS_VISUAL_get() {
+  int jresult ;
+  int result;
+  
+  //result = (int)Dali::Toolkit::ProgressBar::Property::SECONDARY_PROGRESS_VISUAL;
+  //jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_INDETERMINATE_VISUAL_get() {
+  int jresult ;
+  int result;
+  
+  //result = (int)Dali::Toolkit::ProgressBar::Property::INDETERMINATE_VISUAL;
+  //jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_INDETERMINATE_VISUAL_ANIMATION_get() {
+  int jresult ;
+  int result;
+  
+  //result = (int)Dali::Toolkit::ProgressBar::Property::INDETERMINATE_VISUAL_ANIMATION;
+  //jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ProgressBar_Property_LABEL_VISUAL_get() {
+  int jresult ;
+  int result;
+  
+  //result = (int)Dali::Toolkit::ProgressBar::Property::LABEL_VISUAL;
+  //jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ProgressBar_Property() {
   void * jresult ;
   Dali::Toolkit::ProgressBar::Property *result = 0 ;
   
@@ -83171,7 +83626,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ProgressBar_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ProgressBar_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ProgressBar_Property(void * jarg1) {
   Dali::Toolkit::ProgressBar::Property *arg1 = (Dali::Toolkit::ProgressBar::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::ProgressBar::Property *)jarg1; 
@@ -83195,7 +83650,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ProgressBar_Property(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ProgressBar_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ProgressBar_New() {
   void * jresult ;
   Dali::Toolkit::ProgressBar result;
   
@@ -83221,7 +83676,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ProgressBar_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ProgressBar__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ProgressBar__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::ProgressBar *result = 0 ;
   
@@ -83247,7 +83702,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ProgressBar__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ProgressBar__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ProgressBar__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ProgressBar *arg1 = 0 ;
   Dali::Toolkit::ProgressBar *result = 0 ;
@@ -83279,7 +83734,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ProgressBar__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ProgressBar_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ProgressBar_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::ProgressBar *arg1 = (Dali::Toolkit::ProgressBar *) 0 ;
   Dali::Toolkit::ProgressBar *arg2 = 0 ;
@@ -83313,7 +83768,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ProgressBar_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ProgressBar(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ProgressBar(void * jarg1) {
   Dali::Toolkit::ProgressBar *arg1 = (Dali::Toolkit::ProgressBar *) 0 ;
   
   arg1 = (Dali::Toolkit::ProgressBar *)jarg1; 
@@ -83337,7 +83792,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ProgressBar(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ProgressBar_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ProgressBar_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -83371,7 +83826,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ProgressBar_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ProgressBar_ValueChangedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ProgressBar_ValueChangedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::ProgressBar *arg1 = (Dali::Toolkit::ProgressBar *) 0 ;
   Dali::Toolkit::ProgressBar::ValueChangedSignalType *result = 0 ;
@@ -83399,7 +83854,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ProgressBar_ValueChangedSignal(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GaussianBlurView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GaussianBlurView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::GaussianBlurView *result = 0 ;
   
@@ -83425,7 +83880,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GaussianBlurView__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GaussianBlurView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GaussianBlurView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::GaussianBlurView *arg1 = 0 ;
   Dali::Toolkit::GaussianBlurView *result = 0 ;
@@ -83457,7 +83912,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GaussianBlurView__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Toolkit::GaussianBlurView *arg2 = 0 ;
@@ -83491,7 +83946,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_Assign(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_GaussianBlurView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GaussianBlurView(void * jarg1) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   
   arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1; 
@@ -83515,7 +83970,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_GaussianBlurView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -83549,7 +84004,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_DownCast(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_New__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::GaussianBlurView result;
   
@@ -83575,7 +84030,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_New__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_New__SWIG_1(unsigned int jarg1, float jarg2, int jarg3, float jarg4, float jarg5, unsigned int jarg6) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_1(unsigned int jarg1, float jarg2, int jarg3, float jarg4, float jarg5, unsigned int jarg6) {
   void * jresult ;
   unsigned int arg1 ;
   float arg2 ;
@@ -83613,7 +84068,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_New__SWIG_1(unsigned i
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_New__SWIG_2(unsigned int jarg1, float jarg2, int jarg3, float jarg4, float jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_New__SWIG_2(unsigned int jarg1, float jarg2, int jarg3, float jarg4, float jarg5) {
   void * jresult ;
   unsigned int arg1 ;
   float arg2 ;
@@ -83649,7 +84104,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_New__SWIG_2(unsigned i
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_Add(void * jarg1, void * jarg2) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -83681,7 +84136,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_Add(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_Remove(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_Remove(void * jarg1, void * jarg2) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor *argp2 ;
@@ -83713,7 +84168,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_Remove(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_Activate(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_Activate(void * jarg1) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   
   arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1; 
@@ -83737,7 +84192,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_Activate(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_ActivateOnce(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_ActivateOnce(void * jarg1) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   
   arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1; 
@@ -83761,7 +84216,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_ActivateOnce(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_Deactivate(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_Deactivate(void * jarg1) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   
   arg1 = (Dali::Toolkit::GaussianBlurView *)jarg1; 
@@ -83785,7 +84240,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_Deactivate(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_SetUserImageAndOutputRenderTarget(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_SetUserImageAndOutputRenderTarget(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Image arg2 ;
   Dali::FrameBufferImage arg3 ;
@@ -83825,7 +84280,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_SetUserImageAndOutputRen
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_GaussianBlurView_GetBlurStrengthPropertyIndex(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GaussianBlurView_GetBlurStrengthPropertyIndex(void * jarg1) {
   int jresult ;
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Property::Index result;
@@ -83853,7 +84308,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_GaussianBlurView_GetBlurStrengthPropertyIn
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_GetBlurredRenderTarget(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_GetBlurredRenderTarget(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::FrameBufferImage result;
@@ -83881,7 +84336,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_GetBlurredRenderTarget
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_SetBackgroundColor(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurView_SetBackgroundColor(void * jarg1, void * jarg2) {
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Vector4 *arg2 = 0 ;
   
@@ -83911,7 +84366,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurView_SetBackgroundColor(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_GetBackgroundColor(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_GetBackgroundColor(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Vector4 result;
@@ -83939,7 +84394,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_GetBackgroundColor(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_FinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GaussianBlurView_FinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::GaussianBlurView *arg1 = (Dali::Toolkit::GaussianBlurView *) 0 ;
   Dali::Toolkit::GaussianBlurView::GaussianBlurViewSignal *result = 0 ;
@@ -83967,7 +84422,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_GaussianBlurView_FinishedSignal(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageFactory(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PageFactory(void * jarg1) {
   Dali::Toolkit::PageFactory *arg1 = (Dali::Toolkit::PageFactory *) 0 ;
   
   arg1 = (Dali::Toolkit::PageFactory *)jarg1; 
@@ -83991,7 +84446,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageFactory(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PageFactory_GetNumberOfPages(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PageFactory_GetNumberOfPages(void * jarg1) {
   unsigned int jresult ;
   Dali::Toolkit::PageFactory *arg1 = (Dali::Toolkit::PageFactory *) 0 ;
   unsigned int result;
@@ -84019,7 +84474,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PageFactory_GetNumberOfPages(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageFactory_NewPage(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageFactory_NewPage(void * jarg1, unsigned int jarg2) {
   void * jresult ;
   Dali::Toolkit::PageFactory *arg1 = (Dali::Toolkit::PageFactory *) 0 ;
   unsigned int arg2 ;
@@ -84049,7 +84504,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageFactory_NewPage(void * jarg1, unsig
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PageTurnView_Property_PAGE_SIZE_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PageTurnView_Property_PAGE_SIZE_get() {
   int jresult ;
   int result;
   
@@ -84059,7 +84514,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PageTurnView_Property_PAGE_SIZE_get() {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PageTurnView_Property_CURRENT_PAGE_ID_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PageTurnView_Property_CURRENT_PAGE_ID_get() {
   int jresult ;
   int result;
   
@@ -84069,7 +84524,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PageTurnView_Property_CURRENT_PAGE_ID_get(
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PageTurnView_Property_SPINE_SHADOW_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_PageTurnView_Property_SPINE_SHADOW_get() {
   int jresult ;
   int result;
   
@@ -84079,7 +84534,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PageTurnView_Property_SPINE_SHADOW_get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnView_Property() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnView_Property() {
   void * jresult ;
   Dali::Toolkit::PageTurnView::Property *result = 0 ;
   
@@ -84105,7 +84560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnView_Property() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnView_Property(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PageTurnView_Property(void * jarg1) {
   Dali::Toolkit::PageTurnView::Property *arg1 = (Dali::Toolkit::PageTurnView::Property *) 0 ;
   
   arg1 = (Dali::Toolkit::PageTurnView::Property *)jarg1; 
@@ -84129,7 +84584,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnView_Property(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::PageTurnView *result = 0 ;
   
@@ -84155,7 +84610,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnView__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::PageTurnView *arg1 = 0 ;
   Dali::Toolkit::PageTurnView *result = 0 ;
@@ -84187,7 +84642,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnView__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::PageTurnView *arg1 = (Dali::Toolkit::PageTurnView *) 0 ;
   Dali::Toolkit::PageTurnView *arg2 = 0 ;
@@ -84221,7 +84676,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PageTurnView(void * jarg1) {
   Dali::Toolkit::PageTurnView *arg1 = (Dali::Toolkit::PageTurnView *) 0 ;
   
   arg1 = (Dali::Toolkit::PageTurnView *)jarg1; 
@@ -84245,7 +84700,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnView(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -84279,7 +84734,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_DownCast(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_PageTurnStartedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_PageTurnStartedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::PageTurnView *arg1 = (Dali::Toolkit::PageTurnView *) 0 ;
   Dali::Toolkit::PageTurnView::PageTurnSignal *result = 0 ;
@@ -84307,7 +84762,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_PageTurnStartedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_PageTurnFinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_PageTurnFinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::PageTurnView *arg1 = (Dali::Toolkit::PageTurnView *) 0 ;
   Dali::Toolkit::PageTurnView::PageTurnSignal *result = 0 ;
@@ -84335,7 +84790,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_PageTurnFinishedSignal(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_PagePanStartedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_PagePanStartedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::PageTurnView *arg1 = (Dali::Toolkit::PageTurnView *) 0 ;
   Dali::Toolkit::PageTurnView::PagePanSignal *result = 0 ;
@@ -84363,7 +84818,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_PagePanStartedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_PagePanFinishedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnView_PagePanFinishedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::PageTurnView *arg1 = (Dali::Toolkit::PageTurnView *) 0 ;
   Dali::Toolkit::PageTurnView::PagePanSignal *result = 0 ;
@@ -84391,7 +84846,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnView_PagePanFinishedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnLandscapeView__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnLandscapeView__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::PageTurnLandscapeView *result = 0 ;
   
@@ -84417,7 +84872,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnLandscapeView__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnLandscapeView__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnLandscapeView__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::PageTurnLandscapeView *arg1 = 0 ;
   Dali::Toolkit::PageTurnLandscapeView *result = 0 ;
@@ -84449,7 +84904,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnLandscapeView__SWIG_1(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnLandscapeView_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::PageTurnLandscapeView *arg1 = (Dali::Toolkit::PageTurnLandscapeView *) 0 ;
   Dali::Toolkit::PageTurnLandscapeView *arg2 = 0 ;
@@ -84483,7 +84938,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_Assign(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnLandscapeView(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PageTurnLandscapeView(void * jarg1) {
   Dali::Toolkit::PageTurnLandscapeView *arg1 = (Dali::Toolkit::PageTurnLandscapeView *) 0 ;
   
   arg1 = (Dali::Toolkit::PageTurnLandscapeView *)jarg1; 
@@ -84507,11 +84962,199 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnLandscapeView(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_New(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnLandscapeView_New(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Toolkit::PageFactory *arg1 = 0 ;
+  Dali::Vector2 *arg2 = 0 ;
+  Dali::Toolkit::PageTurnLandscapeView result;
+  
+  arg1 = (Dali::Toolkit::PageFactory *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::PageFactory & type is null", 0);
+    return 0;
+  } 
+  arg2 = (Dali::Vector2 *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
+    return 0;
+  } 
+  {
+    try {
+      result = Dali::Toolkit::PageTurnLandscapeView::New(*arg1,(Dali::Vector2 const &)*arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = new Dali::Toolkit::PageTurnLandscapeView((const Dali::Toolkit::PageTurnLandscapeView &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnLandscapeView_DownCast(void * jarg1) {
+  void * jresult ;
+  Dali::BaseHandle arg1 ;
+  Dali::BaseHandle *argp1 ;
+  Dali::Toolkit::PageTurnLandscapeView result;
+  
+  argp1 = (Dali::BaseHandle *)jarg1; 
+  if (!argp1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::BaseHandle", 0);
+    return 0;
+  }
+  arg1 = *argp1; 
+  {
+    try {
+      result = Dali::Toolkit::PageTurnLandscapeView::DownCast(arg1);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = new Dali::Toolkit::PageTurnLandscapeView((const Dali::Toolkit::PageTurnLandscapeView &)result); 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnPortraitView__SWIG_0() {
+  void * jresult ;
+  Dali::Toolkit::PageTurnPortraitView *result = 0 ;
+  
+  {
+    try {
+      result = (Dali::Toolkit::PageTurnPortraitView *)new Dali::Toolkit::PageTurnPortraitView();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnPortraitView__SWIG_1(void * jarg1) {
+  void * jresult ;
+  Dali::Toolkit::PageTurnPortraitView *arg1 = 0 ;
+  Dali::Toolkit::PageTurnPortraitView *result = 0 ;
+  
+  arg1 = (Dali::Toolkit::PageTurnPortraitView *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::PageTurnPortraitView const & type is null", 0);
+    return 0;
+  } 
+  {
+    try {
+      result = (Dali::Toolkit::PageTurnPortraitView *)new Dali::Toolkit::PageTurnPortraitView((Dali::Toolkit::PageTurnPortraitView const &)*arg1);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnPortraitView_Assign(void * jarg1, void * jarg2) {
+  void * jresult ;
+  Dali::Toolkit::PageTurnPortraitView *arg1 = (Dali::Toolkit::PageTurnPortraitView *) 0 ;
+  Dali::Toolkit::PageTurnPortraitView *arg2 = 0 ;
+  Dali::Toolkit::PageTurnPortraitView *result = 0 ;
+  
+  arg1 = (Dali::Toolkit::PageTurnPortraitView *)jarg1; 
+  arg2 = (Dali::Toolkit::PageTurnPortraitView *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::PageTurnPortraitView const & type is null", 0);
+    return 0;
+  } 
+  {
+    try {
+      result = (Dali::Toolkit::PageTurnPortraitView *) &(arg1)->operator =((Dali::Toolkit::PageTurnPortraitView const &)*arg2);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PageTurnPortraitView(void * jarg1) {
+  Dali::Toolkit::PageTurnPortraitView *arg1 = (Dali::Toolkit::PageTurnPortraitView *) 0 ;
+  
+  arg1 = (Dali::Toolkit::PageTurnPortraitView *)jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
+      };
+    }
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnPortraitView_New(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::PageFactory *arg1 = 0 ;
   Dali::Vector2 *arg2 = 0 ;
-  Dali::Toolkit::PageTurnLandscapeView result;
+  Dali::Toolkit::PageTurnPortraitView result;
   
   arg1 = (Dali::Toolkit::PageFactory *)jarg1;
   if (!arg1) {
@@ -84525,7 +85168,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_New(void * jarg1,
   } 
   {
     try {
-      result = Dali::Toolkit::PageTurnLandscapeView::New(*arg1,(Dali::Vector2 const &)*arg2);
+      result = Dali::Toolkit::PageTurnPortraitView::New(*arg1,(Dali::Vector2 const &)*arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -84540,16 +85183,16 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_New(void * jarg1,
       };
     }
   }
-  jresult = new Dali::Toolkit::PageTurnLandscapeView((const Dali::Toolkit::PageTurnLandscapeView &)result); 
+  jresult = new Dali::Toolkit::PageTurnPortraitView((const Dali::Toolkit::PageTurnPortraitView &)result); 
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PageTurnPortraitView_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::PageTurnLandscapeView result;
+  Dali::Toolkit::PageTurnPortraitView result;
   
   argp1 = (Dali::BaseHandle *)jarg1; 
   if (!argp1) {
@@ -84559,7 +85202,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_DownCast(void * j
   arg1 = *argp1; 
   {
     try {
-      result = Dali::Toolkit::PageTurnLandscapeView::DownCast(arg1);
+      result = Dali::Toolkit::PageTurnPortraitView::DownCast(arg1);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -84574,18 +85217,48 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_DownCast(void * j
       };
     }
   }
-  jresult = new Dali::Toolkit::PageTurnLandscapeView((const Dali::Toolkit::PageTurnLandscapeView &)result); 
+  jresult = new Dali::Toolkit::PageTurnPortraitView((const Dali::Toolkit::PageTurnPortraitView &)result); 
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnPortraitView__SWIG_0() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ToggleButton_Property_STATE_VISUALS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)Dali::Toolkit::ToggleButton::Property::STATE_VISUALS;
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ToggleButton_Property_TOOLTIPS_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)Dali::Toolkit::ToggleButton::Property::TOOLTIPS;
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ToggleButton_Property_CURRENT_STATE_INDEX_get() {
+  int jresult ;
+  int result;
+  
+  result = (int)Dali::Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX;
+  jresult = (int)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ToggleButton_Property() {
   void * jresult ;
-  Dali::Toolkit::PageTurnPortraitView *result = 0 ;
+  Dali::Toolkit::ToggleButton::Property *result = 0 ;
   
   {
     try {
-      result = (Dali::Toolkit::PageTurnPortraitView *)new Dali::Toolkit::PageTurnPortraitView();
+      result = (Dali::Toolkit::ToggleButton::Property *)new Dali::Toolkit::ToggleButton::Property();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -84605,19 +85278,69 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnPortraitView__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnPortraitView__SWIG_1(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ToggleButton_Property(void * jarg1) {
+  Dali::Toolkit::ToggleButton::Property *arg1 = (Dali::Toolkit::ToggleButton::Property *) 0 ;
+  
+  arg1 = (Dali::Toolkit::ToggleButton::Property *)jarg1; 
+  {
+    try {
+      delete arg1;
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
+      };
+    }
+  }
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ToggleButton__SWIG_0() {
   void * jresult ;
-  Dali::Toolkit::PageTurnPortraitView *arg1 = 0 ;
-  Dali::Toolkit::PageTurnPortraitView *result = 0 ;
+  Dali::Toolkit::ToggleButton *result = 0 ;
   
-  arg1 = (Dali::Toolkit::PageTurnPortraitView *)jarg1;
+  {
+    try {
+      result = (Dali::Toolkit::ToggleButton *)new Dali::Toolkit::ToggleButton();
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ToggleButton__SWIG_1(void * jarg1) {
+  void * jresult ;
+  Dali::Toolkit::ToggleButton *arg1 = 0 ;
+  Dali::Toolkit::ToggleButton *result = 0 ;
+  
+  arg1 = (Dali::Toolkit::ToggleButton *)jarg1;
   if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::PageTurnPortraitView const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ToggleButton const & type is null", 0);
     return 0;
   } 
   {
     try {
-      result = (Dali::Toolkit::PageTurnPortraitView *)new Dali::Toolkit::PageTurnPortraitView((Dali::Toolkit::PageTurnPortraitView const &)*arg1);
+      result = (Dali::Toolkit::ToggleButton *)new Dali::Toolkit::ToggleButton((Dali::Toolkit::ToggleButton const &)*arg1);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -84637,21 +85360,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnPortraitView__SWIG_1(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnPortraitView_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ToggleButton_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Toolkit::PageTurnPortraitView *arg1 = (Dali::Toolkit::PageTurnPortraitView *) 0 ;
-  Dali::Toolkit::PageTurnPortraitView *arg2 = 0 ;
-  Dali::Toolkit::PageTurnPortraitView *result = 0 ;
+  Dali::Toolkit::ToggleButton *arg1 = (Dali::Toolkit::ToggleButton *) 0 ;
+  Dali::Toolkit::ToggleButton *arg2 = 0 ;
+  Dali::Toolkit::ToggleButton *result = 0 ;
   
-  arg1 = (Dali::Toolkit::PageTurnPortraitView *)jarg1; 
-  arg2 = (Dali::Toolkit::PageTurnPortraitView *)jarg2;
+  arg1 = (Dali::Toolkit::ToggleButton *)jarg1; 
+  arg2 = (Dali::Toolkit::ToggleButton *)jarg2;
   if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::PageTurnPortraitView const & type is null", 0);
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::ToggleButton const & type is null", 0);
     return 0;
   } 
   {
     try {
-      result = (Dali::Toolkit::PageTurnPortraitView *) &(arg1)->operator =((Dali::Toolkit::PageTurnPortraitView const &)*arg2);
+      result = (Dali::Toolkit::ToggleButton *) &(arg1)->operator =((Dali::Toolkit::ToggleButton const &)*arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -84671,10 +85394,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnPortraitView_Assign(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnPortraitView(void * jarg1) {
-  Dali::Toolkit::PageTurnPortraitView *arg1 = (Dali::Toolkit::PageTurnPortraitView *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ToggleButton(void * jarg1) {
+  Dali::Toolkit::ToggleButton *arg1 = (Dali::Toolkit::ToggleButton *) 0 ;
   
-  arg1 = (Dali::Toolkit::PageTurnPortraitView *)jarg1; 
+  arg1 = (Dali::Toolkit::ToggleButton *)jarg1; 
   {
     try {
       delete arg1;
@@ -84695,25 +85418,13 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnPortraitView(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnPortraitView_New(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ToggleButton_New() {
   void * jresult ;
-  Dali::Toolkit::PageFactory *arg1 = 0 ;
-  Dali::Vector2 *arg2 = 0 ;
-  Dali::Toolkit::PageTurnPortraitView result;
+  Dali::Toolkit::ToggleButton result;
   
-  arg1 = (Dali::Toolkit::PageFactory *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::PageFactory & type is null", 0);
-    return 0;
-  } 
-  arg2 = (Dali::Vector2 *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Vector2 const & type is null", 0);
-    return 0;
-  } 
   {
     try {
-      result = Dali::Toolkit::PageTurnPortraitView::New(*arg1,(Dali::Vector2 const &)*arg2);
+      result = Dali::Toolkit::ToggleButton::New();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -84728,16 +85439,16 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnPortraitView_New(void * jarg1,
       };
     }
   }
-  jresult = new Dali::Toolkit::PageTurnPortraitView((const Dali::Toolkit::PageTurnPortraitView &)result); 
+  jresult = new Dali::Toolkit::ToggleButton((const Dali::Toolkit::ToggleButton &)result); 
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnPortraitView_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ToggleButton_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
-  Dali::Toolkit::PageTurnPortraitView result;
+  Dali::Toolkit::ToggleButton result;
   
   argp1 = (Dali::BaseHandle *)jarg1; 
   if (!argp1) {
@@ -84747,7 +85458,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnPortraitView_DownCast(void * ja
   arg1 = *argp1; 
   {
     try {
-      result = Dali::Toolkit::PageTurnPortraitView::DownCast(arg1);
+      result = Dali::Toolkit::ToggleButton::DownCast(arg1);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -84762,12 +85473,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_PageTurnPortraitView_DownCast(void * ja
       };
     }
   }
-  jresult = new Dali::Toolkit::PageTurnPortraitView((const Dali::Toolkit::PageTurnPortraitView &)result); 
+  jresult = new Dali::Toolkit::ToggleButton((const Dali::Toolkit::ToggleButton &)result); 
   return jresult;
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualBase__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualBase__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::Visual::Base *result = 0 ;
   
@@ -84793,7 +85504,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualBase__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VisualBase(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VisualBase(void * jarg1) {
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   
   arg1 = (Dali::Toolkit::Visual::Base *)jarg1; 
@@ -84817,7 +85528,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VisualBase(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualBase__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualBase__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Visual::Base *arg1 = 0 ;
   Dali::Toolkit::Visual::Base *result = 0 ;
@@ -84849,7 +85560,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualBase__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualBase_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualBase_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   Dali::Toolkit::Visual::Base *arg2 = 0 ;
@@ -84883,7 +85594,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualBase_Assign(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_SetName(void * jarg1, char * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VisualBase_SetName(void * jarg1, char * jarg2) {
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   std::string *arg2 = 0 ;
   
@@ -84917,7 +85628,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_SetName(void * jarg1, char * j
 }
 
 
-SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_VisualBase_GetName(void * jarg1) {
+SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_VisualBase_GetName(void * jarg1) {
   char * jresult ;
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   std::string *result = 0 ;
@@ -84944,7 +85655,8 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_VisualBase_GetName(void * jarg1) {
   return jresult;
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_SetTransformAndSize(void * jarg1, void * jarg2, void * jarg3) {
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VisualBase_SetTransformAndSize(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
   Dali::Size arg3 ;
@@ -84982,7 +85694,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_SetTransformAndSize(void * jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetHeightForWidth(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_VisualBase_GetHeightForWidth(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   float arg2 ;
@@ -85012,7 +85724,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetHeightForWidth(void * jarg
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetWidthForHeight(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_VisualBase_GetWidthForHeight(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   float arg2 ;
@@ -85042,7 +85754,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetWidthForHeight(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_GetNaturalSize(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VisualBase_GetNaturalSize(void * jarg1, void * jarg2) {
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   
@@ -85072,7 +85784,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_GetNaturalSize(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_SetDepthIndex(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VisualBase_SetDepthIndex(void * jarg1, float jarg2) {
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   float arg2 ;
   
@@ -85098,7 +85810,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_SetDepthIndex(void * jarg1, fl
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetDepthIndex(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_VisualBase_GetDepthIndex(void * jarg1) {
   float jresult ;
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   float result;
@@ -85126,7 +85838,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetDepthIndex(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_CreatePropertyMap(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VisualBase_CreatePropertyMap(void * jarg1, void * jarg2) {
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
   
@@ -85156,7 +85868,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_CreatePropertyMap(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualBase__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualBase__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::Visual::Base *arg1 = (Dali::Toolkit::Internal::Visual::Base *) 0 ;
   Dali::Toolkit::Visual::Base *result = 0 ;
@@ -85184,7 +85896,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualBase__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_Get() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_Get() {
   void * jresult ;
   Dali::Toolkit::VisualFactory result;
   
@@ -85210,7 +85922,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_Get() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualFactory__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualFactory__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::VisualFactory *result = 0 ;
   
@@ -85236,7 +85948,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualFactory__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VisualFactory(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VisualFactory(void * jarg1) {
   Dali::Toolkit::VisualFactory *arg1 = (Dali::Toolkit::VisualFactory *) 0 ;
   
   arg1 = (Dali::Toolkit::VisualFactory *)jarg1; 
@@ -85260,7 +85972,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VisualFactory(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualFactory__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VisualFactory__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::VisualFactory *arg1 = 0 ;
   Dali::Toolkit::VisualFactory *result = 0 ;
@@ -85292,7 +86004,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VisualFactory__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::VisualFactory *arg1 = (Dali::Toolkit::VisualFactory *) 0 ;
   Dali::Toolkit::VisualFactory *arg2 = 0 ;
@@ -85326,7 +86038,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_Assign(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_CreateVisual__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_CreateVisual__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::VisualFactory *arg1 = (Dali::Toolkit::VisualFactory *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
@@ -85360,7 +86072,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_CreateVisual__SWIG_0(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_CreateVisual__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_CreateVisual__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::VisualFactory *arg1 = (Dali::Toolkit::VisualFactory *) 0 ;
   Dali::Image *arg2 = 0 ;
@@ -85394,7 +86106,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_CreateVisual__SWIG_1(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_CreateVisual__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VisualFactory_CreateVisual__SWIG_2(void * jarg1, char * jarg2, void * jarg3) {
   void * jresult ;
   Dali::Toolkit::VisualFactory *arg1 = (Dali::Toolkit::VisualFactory *) 0 ;
   std::string *arg2 = 0 ;
@@ -85440,7 +86152,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_VisualFactory_CreateVisual__SWIG_2(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AsyncImageLoader__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AsyncImageLoader__SWIG_0() {
   void * jresult ;
   Dali::Toolkit::AsyncImageLoader *result = 0 ;
   
@@ -85466,7 +86178,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AsyncImageLoader__SWIG_0() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AsyncImageLoader(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AsyncImageLoader(void * jarg1) {
   Dali::Toolkit::AsyncImageLoader *arg1 = (Dali::Toolkit::AsyncImageLoader *) 0 ;
   
   arg1 = (Dali::Toolkit::AsyncImageLoader *)jarg1; 
@@ -85490,7 +86202,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AsyncImageLoader(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AsyncImageLoader__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AsyncImageLoader__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AsyncImageLoader *arg1 = 0 ;
   Dali::Toolkit::AsyncImageLoader *result = 0 ;
@@ -85522,7 +86234,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AsyncImageLoader__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Assign(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_Assign(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::Toolkit::AsyncImageLoader *arg1 = (Dali::Toolkit::AsyncImageLoader *) 0 ;
   Dali::Toolkit::AsyncImageLoader *arg2 = 0 ;
@@ -85556,7 +86268,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Assign(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_New() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_New() {
   void * jresult ;
   Dali::Toolkit::AsyncImageLoader result;
   
@@ -85582,7 +86294,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_New() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_DownCast(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_DownCast(void * jarg1) {
   void * jresult ;
   Dali::BaseHandle arg1 ;
   Dali::BaseHandle *argp1 ;
@@ -85616,7 +86328,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_DownCast(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Load__SWIG_0(void * jarg1, char * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AsyncImageLoader_Load__SWIG_0(void * jarg1, char * jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::AsyncImageLoader *arg1 = (Dali::Toolkit::AsyncImageLoader *) 0 ;
   std::string *arg2 = 0 ;
@@ -85654,7 +86366,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Load__SWIG_0(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Load__SWIG_1(void * jarg1, char * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AsyncImageLoader_Load__SWIG_1(void * jarg1, char * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Toolkit::AsyncImageLoader *arg1 = (Dali::Toolkit::AsyncImageLoader *) 0 ;
   std::string *arg2 = 0 ;
@@ -85700,7 +86412,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Load__SWIG_1(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Load__SWIG_2(void * jarg1, char * jarg2, void * jarg3, int jarg4, int jarg5, unsigned int jarg6) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AsyncImageLoader_Load__SWIG_2(void * jarg1, char * jarg2, void * jarg3, int jarg4, int jarg5, unsigned int jarg6) {
   unsigned int jresult ;
   Dali::Toolkit::AsyncImageLoader *arg1 = (Dali::Toolkit::AsyncImageLoader *) 0 ;
   std::string *arg2 = 0 ;
@@ -85752,7 +86464,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Load__SWIG_2(voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Cancel(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AsyncImageLoader_Cancel(void * jarg1, unsigned int jarg2) {
   unsigned int jresult ;
   Dali::Toolkit::AsyncImageLoader *arg1 = (Dali::Toolkit::AsyncImageLoader *) 0 ;
   uint32_t arg2 ;
@@ -85782,7 +86494,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AsyncImageLoader_Cancel(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AsyncImageLoader_CancelAll(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AsyncImageLoader_CancelAll(void * jarg1) {
   Dali::Toolkit::AsyncImageLoader *arg1 = (Dali::Toolkit::AsyncImageLoader *) 0 ;
   
   arg1 = (Dali::Toolkit::AsyncImageLoader *)jarg1; 
@@ -85806,7 +86518,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AsyncImageLoader_CancelAll(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_ImageLoadedSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_ImageLoadedSignal(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::AsyncImageLoader *arg1 = (Dali::Toolkit::AsyncImageLoader *) 0 ;
   Dali::Toolkit::AsyncImageLoader::ImageLoadedSignalType *result = 0 ;
@@ -85834,7 +86546,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_ImageLoadedSignal(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AsyncImageLoader__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AsyncImageLoader__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Internal::AsyncImageLoader *arg1 = (Dali::Toolkit::Internal::AsyncImageLoader *) 0 ;
   Dali::Toolkit::AsyncImageLoader *result = 0 ;
@@ -85862,7 +86574,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AsyncImageLoader__SWIG_2(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LoadImageSynchronously__SWIG_0(char * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LoadImageSynchronously__SWIG_0(char * jarg1) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::PixelData result;
@@ -85898,7 +86610,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LoadImageSynchronously__SWIG_0(char * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LoadImageSynchronously__SWIG_1(char * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LoadImageSynchronously__SWIG_1(char * jarg1, void * jarg2) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ImageDimensions arg2 ;
@@ -85942,7 +86654,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LoadImageSynchronously__SWIG_1(char * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LoadImageSynchronously__SWIG_2(char * jarg1, void * jarg2, int jarg3, int jarg4, unsigned int jarg5) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LoadImageSynchronously__SWIG_2(char * jarg1, void * jarg2, int jarg3, int jarg4, unsigned int jarg5) {
   void * jresult ;
   std::string *arg1 = 0 ;
   Dali::ImageDimensions arg2 ;
@@ -85992,7 +86704,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_LoadImageSynchronously__SWIG_2(char * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Clear(void * jarg1) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   
   arg1 = (std::vector< unsigned int > *)jarg1; 
@@ -86016,7 +86728,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Add(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Add(void * jarg1, unsigned int jarg2) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   unsigned int *arg2 = 0 ;
   unsigned int temp2 ;
@@ -86044,7 +86756,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Add(void * jarg1, unsigne
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ItemIdContainer_size(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemIdContainer_size(void * jarg1) {
   unsigned long jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   std::vector< unsigned int >::size_type result;
@@ -86072,7 +86784,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ItemIdContainer_size(void * jarg
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ItemIdContainer_capacity(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemIdContainer_capacity(void * jarg1) {
   unsigned long jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   std::vector< unsigned int >::size_type result;
@@ -86100,7 +86812,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ItemIdContainer_capacity(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_reserve(void * jarg1, unsigned long jarg2) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   std::vector< unsigned int >::size_type arg2 ;
   
@@ -86126,7 +86838,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_reserve(void * jarg1, uns
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemIdContainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_0() {
   void * jresult ;
   std::vector< unsigned int > *result = 0 ;
   
@@ -86152,7 +86864,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemIdContainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemIdContainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_1(void * jarg1) {
   void * jresult ;
   std::vector< unsigned int > *arg1 = 0 ;
   std::vector< unsigned int > *result = 0 ;
@@ -86184,7 +86896,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemIdContainer__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemIdContainer__SWIG_2(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemIdContainer__SWIG_2(int jarg1) {
   void * jresult ;
   int arg1 ;
   std::vector< unsigned int > *result = 0 ;
@@ -86219,7 +86931,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemIdContainer__SWIG_2(int jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemIdContainer_getitemcopy(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_getitemcopy(void * jarg1, int jarg2) {
   unsigned int jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
@@ -86256,7 +86968,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemIdContainer_getitemcopy(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemIdContainer_getitem(void * jarg1, int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_getitem(void * jarg1, int jarg2) {
   unsigned int jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
@@ -86293,7 +87005,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemIdContainer_getitem(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_setitem(void * jarg1, int jarg2, unsigned int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_setitem(void * jarg1, int jarg2, unsigned int jarg3) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
   unsigned int *arg3 = 0 ;
@@ -86330,7 +87042,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_setitem(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_AddRange(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_AddRange(void * jarg1, void * jarg2) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   std::vector< unsigned int > *arg2 = 0 ;
   
@@ -86360,7 +87072,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_AddRange(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemIdContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemIdContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
@@ -86403,7 +87115,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemIdContainer_GetRange(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Insert(void * jarg1, int jarg2, unsigned int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Insert(void * jarg1, int jarg2, unsigned int jarg3) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
   unsigned int *arg3 = 0 ;
@@ -86440,7 +87152,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Insert(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
   std::vector< unsigned int > *arg3 = 0 ;
@@ -86479,7 +87191,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_InsertRange(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_RemoveAt(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_RemoveAt(void * jarg1, int jarg2) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
   
@@ -86512,7 +87224,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_RemoveAt(void * jarg1, in
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -86551,7 +87263,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_RemoveRange(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemIdContainer_Repeat(unsigned int jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemIdContainer_Repeat(unsigned int jarg1, int jarg2) {
   void * jresult ;
   unsigned int *arg1 = 0 ;
   int arg2 ;
@@ -86590,7 +87302,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemIdContainer_Repeat(unsigned int jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Reverse__SWIG_0(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Reverse__SWIG_0(void * jarg1) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   
   arg1 = (std::vector< unsigned int > *)jarg1; 
@@ -86614,7 +87326,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Reverse__SWIG_0(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -86653,7 +87365,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_Reverse__SWIG_1(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemIdContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   int arg2 ;
   std::vector< unsigned int > *arg3 = 0 ;
@@ -86692,7 +87404,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemIdContainer_SetRange(void * jarg1, in
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemIdContainer_Contains(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_Contains(void * jarg1, unsigned int jarg2) {
   unsigned int jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   unsigned int *arg2 = 0 ;
@@ -86724,7 +87436,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemIdContainer_Contains(void * j
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemIdContainer_IndexOf(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemIdContainer_IndexOf(void * jarg1, unsigned int jarg2) {
   int jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   unsigned int *arg2 = 0 ;
@@ -86756,7 +87468,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemIdContainer_IndexOf(void * jarg1, unsi
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemIdContainer_LastIndexOf(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_ItemIdContainer_LastIndexOf(void * jarg1, unsigned int jarg2) {
   int jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   unsigned int *arg2 = 0 ;
@@ -86788,7 +87500,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemIdContainer_LastIndexOf(void * jarg1,
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemIdContainer_Remove(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ItemIdContainer_Remove(void * jarg1, unsigned int jarg2) {
   unsigned int jresult ;
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   unsigned int *arg2 = 0 ;
@@ -86820,7 +87532,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ItemIdContainer_Remove(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemIdContainer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemIdContainer(void * jarg1) {
   std::vector< unsigned int > *arg1 = (std::vector< unsigned int > *) 0 ;
   
   arg1 = (std::vector< unsigned int > *)jarg1; 
@@ -86844,7 +87556,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemIdContainer(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Item__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_0() {
   void * jresult ;
   std::pair< unsigned int,Dali::Actor > *result = 0 ;
   
@@ -86870,7 +87582,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Item__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Item__SWIG_1(unsigned int jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_1(unsigned int jarg1, void * jarg2) {
   void * jresult ;
   unsigned int arg1 ;
   Dali::Actor arg2 ;
@@ -86906,7 +87618,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Item__SWIG_1(unsigned int jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Item__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Item__SWIG_2(void * jarg1) {
   void * jresult ;
   std::pair< unsigned int,Dali::Actor > *arg1 = 0 ;
   std::pair< unsigned int,Dali::Actor > *result = 0 ;
@@ -86938,7 +87650,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Item__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Item_first_set(void * jarg1, unsigned int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Item_first_set(void * jarg1, unsigned int jarg2) {
   std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
   unsigned int arg2 ;
   
@@ -86948,7 +87660,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Item_first_set(void * jarg1, unsigned int
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Item_first_get(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Item_first_get(void * jarg1) {
   unsigned int jresult ;
   std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
   unsigned int result;
@@ -86960,7 +87672,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_Item_first_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Item_second_set(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Item_second_set(void * jarg1, void * jarg2) {
   std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
   Dali::Actor *arg2 = (Dali::Actor *) 0 ;
   
@@ -86970,7 +87682,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_Item_second_set(void * jarg1, void * jarg
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Item_second_get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Item_second_get(void * jarg1) {
   void * jresult ;
   std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
   Dali::Actor *result = 0 ;
@@ -86982,7 +87694,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_Item_second_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Item(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Item(void * jarg1) {
   std::pair< unsigned int,Dali::Actor > *arg1 = (std::pair< unsigned int,Dali::Actor > *) 0 ;
   
   arg1 = (std::pair< unsigned int,Dali::Actor > *)jarg1; 
@@ -87006,7 +87718,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_Item(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Clear(void * jarg1) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   
   arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1; 
@@ -87030,7 +87742,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Add(void * jarg1, void * jarg2) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   std::pair< unsigned int,Dali::Actor > *arg2 = 0 ;
   
@@ -87060,7 +87772,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Add(void * jarg1, void * ja
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ItemContainer_size(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemContainer_size(void * jarg1) {
   unsigned long jresult ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   std::vector< std::pair< unsigned int,Dali::Actor > >::size_type result;
@@ -87088,7 +87800,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ItemContainer_size(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ItemContainer_capacity(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ItemContainer_capacity(void * jarg1) {
   unsigned long jresult ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   std::vector< std::pair< unsigned int,Dali::Actor > >::size_type result;
@@ -87116,7 +87828,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ItemContainer_capacity(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_reserve(void * jarg1, unsigned long jarg2) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   std::vector< std::pair< unsigned int,Dali::Actor > >::size_type arg2 ;
   
@@ -87142,7 +87854,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_reserve(void * jarg1, unsig
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemContainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_0() {
   void * jresult ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
   
@@ -87168,7 +87880,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemContainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemContainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_1(void * jarg1) {
   void * jresult ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = 0 ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
@@ -87200,7 +87912,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemContainer__SWIG_1(void * jarg1)
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemContainer__SWIG_2(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ItemContainer__SWIG_2(int jarg1) {
   void * jresult ;
   int arg1 ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *result = 0 ;
@@ -87235,7 +87947,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ItemContainer__SWIG_2(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemContainer_getitemcopy(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_getitemcopy(void * jarg1, int jarg2) {
   void * jresult ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
@@ -87272,7 +87984,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemContainer_getitemcopy(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemContainer_getitem(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_getitem(void * jarg1, int jarg2) {
   void * jresult ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
@@ -87309,7 +88021,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemContainer_getitem(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   std::pair< unsigned int,Dali::Actor > *arg3 = 0 ;
@@ -87348,7 +88060,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_setitem(void * jarg1, int j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_AddRange(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_AddRange(void * jarg1, void * jarg2) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg2 = 0 ;
   
@@ -87378,7 +88090,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_AddRange(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
@@ -87421,7 +88133,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemContainer_GetRange(void * jarg1, in
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   std::pair< unsigned int,Dali::Actor > *arg3 = 0 ;
@@ -87460,7 +88172,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Insert(void * jarg1, int ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg3 = 0 ;
@@ -87499,7 +88211,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_InsertRange(void * jarg1, i
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_RemoveAt(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_RemoveAt(void * jarg1, int jarg2) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   
@@ -87532,7 +88244,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_RemoveAt(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -87571,7 +88283,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_RemoveRange(void * jarg1, i
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemContainer_Repeat(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ItemContainer_Repeat(void * jarg1, int jarg2) {
   void * jresult ;
   std::pair< unsigned int,Dali::Actor > *arg1 = 0 ;
   int arg2 ;
@@ -87612,7 +88324,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ItemContainer_Repeat(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Reverse__SWIG_0(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Reverse__SWIG_0(void * jarg1) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   
   arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1; 
@@ -87636,7 +88348,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Reverse__SWIG_0(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -87675,7 +88387,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_Reverse__SWIG_1(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ItemContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   int arg2 ;
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg3 = 0 ;
@@ -87714,7 +88426,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemContainer_SetRange(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemContainer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ItemContainer(void * jarg1) {
   std::vector< std::pair< unsigned int,Dali::Actor > > *arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *) 0 ;
   
   arg1 = (std::vector< std::pair< unsigned int,Dali::Actor > > *)jarg1; 
@@ -87738,7 +88450,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ItemContainer(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_Clear(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Clear(void * jarg1) {
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   
   arg1 = (std::vector< Dali::Actor > *)jarg1; 
@@ -87762,7 +88474,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_Clear(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_Add(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Add(void * jarg1, void * jarg2) {
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   Dali::Actor *arg2 = 0 ;
   
@@ -87792,7 +88504,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_Add(void * jarg1, void * j
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorContainer_size(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorContainer_size(void * jarg1) {
   unsigned long jresult ;
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   std::vector< Dali::Actor >::size_type result;
@@ -87820,7 +88532,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorContainer_size(void * jarg1
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorContainer_capacity(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorContainer_capacity(void * jarg1) {
   unsigned long jresult ;
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   std::vector< Dali::Actor >::size_type result;
@@ -87848,7 +88560,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ActorContainer_capacity(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_reserve(void * jarg1, unsigned long jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_reserve(void * jarg1, unsigned long jarg2) {
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   std::vector< Dali::Actor >::size_type arg2 ;
   
@@ -87874,7 +88586,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_reserve(void * jarg1, unsi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorContainer__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_0() {
   void * jresult ;
   std::vector< Dali::Actor > *result = 0 ;
   
@@ -87900,7 +88612,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorContainer__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorContainer__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_1(void * jarg1) {
   void * jresult ;
   std::vector< Dali::Actor > *arg1 = 0 ;
   std::vector< Dali::Actor > *result = 0 ;
@@ -87932,7 +88644,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorContainer__SWIG_1(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorContainer__SWIG_2(int jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ActorContainer__SWIG_2(int jarg1) {
   void * jresult ;
   int arg1 ;
   std::vector< Dali::Actor > *result = 0 ;
@@ -87967,7 +88679,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ActorContainer__SWIG_2(int jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ActorContainer_getitemcopy(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_getitemcopy(void * jarg1, int jarg2) {
   void * jresult ;
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   int arg2 ;
@@ -88004,7 +88716,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ActorContainer_getitemcopy(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ActorContainer_getitem(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_getitem(void * jarg1, int jarg2) {
   void * jresult ;
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   int arg2 ;
@@ -88041,7 +88753,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ActorContainer_getitem(void * jarg1, in
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_setitem(void * jarg1, int jarg2, void * jarg3) {
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   int arg2 ;
   Dali::Actor *arg3 = 0 ;
@@ -88080,212 +88792,19 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_setitem(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_AddRange(void * jarg1, void * jarg2) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  std::vector< Dali::Actor > *arg2 = 0 ;
-  
-  arg1 = (std::vector< Dali::Actor > *)jarg1; 
-  arg2 = (std::vector< Dali::Actor > *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > const & type is null", 0);
-    return ;
-  } 
-  {
-    try {
-      std_vector_Sl_Dali_Actor_Sg__AddRange(arg1,(std::vector< Dali::Actor > const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ActorContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
-  void * jresult ;
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  std::vector< Dali::Actor > *result = 0 ;
-  
-  arg1 = (std::vector< Dali::Actor > *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
-  {
-    try {
-      try {
-        result = (std::vector< Dali::Actor > *)std_vector_Sl_Dali_Actor_Sg__GetRange(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return 0;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return 0;
-      }
-      
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = (void *)result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  int arg2 ;
-  Dali::Actor *arg3 = 0 ;
-  
-  arg1 = (std::vector< Dali::Actor > *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (Dali::Actor *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
-    return ;
-  } 
-  {
-    try {
-      try {
-        std_vector_Sl_Dali_Actor_Sg__Insert(arg1,arg2,(Dali::Actor const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  int arg2 ;
-  std::vector< Dali::Actor > *arg3 = 0 ;
-  
-  arg1 = (std::vector< Dali::Actor > *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (std::vector< Dali::Actor > *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > const & type is null", 0);
-    return ;
-  } 
-  {
-    try {
-      try {
-        std_vector_Sl_Dali_Actor_Sg__InsertRange(arg1,arg2,(std::vector< Dali::Actor > const &)*arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_RemoveAt(void * jarg1, int jarg2) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  int arg2 ;
-  
-  arg1 = (std::vector< Dali::Actor > *)jarg1; 
-  arg2 = (int)jarg2; 
-  {
-    try {
-      try {
-        std_vector_Sl_Dali_Actor_Sg__RemoveAt(arg1,arg2);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_AddRange(void * jarg1, void * jarg2) {
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  int arg2 ;
-  int arg3 ;
+  std::vector< Dali::Actor > *arg2 = 0 ;
   
   arg1 = (std::vector< Dali::Actor > *)jarg1; 
-  arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
+  arg2 = (std::vector< Dali::Actor > *)jarg2;
+  if (!arg2) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > const & type is null", 0);
+    return ;
+  } 
   {
     try {
-      try {
-        std_vector_Sl_Dali_Actor_Sg__RemoveRange(arg1,arg2,arg3);
-      }
-      catch(std::out_of_range &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
-        return ;
-      }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return ;
-      }
-      
+      std_vector_Sl_Dali_Actor_Sg__AddRange(arg1,(std::vector< Dali::Actor > const &)*arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
@@ -88303,27 +88822,29 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_RemoveRange(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ActorContainer_Repeat(void * jarg1, int jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_GetRange(void * jarg1, int jarg2, int jarg3) {
   void * jresult ;
-  Dali::Actor *arg1 = 0 ;
+  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   int arg2 ;
+  int arg3 ;
   std::vector< Dali::Actor > *result = 0 ;
   
-  arg1 = (Dali::Actor *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
-    return 0;
-  } 
+  arg1 = (std::vector< Dali::Actor > *)jarg1; 
   arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
   {
     try {
       try {
-        result = (std::vector< Dali::Actor > *)std_vector_Sl_Dali_Actor_Sg__Repeat((Dali::Actor const &)*arg1,arg2);
+        result = (std::vector< Dali::Actor > *)std_vector_Sl_Dali_Actor_Sg__GetRange(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
         return 0;
       }
+      catch(std::invalid_argument &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
+        return 0;
+      }
       
     } catch (std::out_of_range& e) {
       {
@@ -88344,51 +88865,27 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_ActorContainer_Repeat(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_Reverse__SWIG_0(void * jarg1) {
-  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
-  
-  arg1 = (std::vector< Dali::Actor > *)jarg1; 
-  {
-    try {
-      std_vector_Sl_Dali_Actor_Sg__Reverse__SWIG_0(arg1);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
-      };
-    }
-  }
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Insert(void * jarg1, int jarg2, void * jarg3) {
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   int arg2 ;
-  int arg3 ;
+  Dali::Actor *arg3 = 0 ;
   
   arg1 = (std::vector< Dali::Actor > *)jarg1; 
   arg2 = (int)jarg2; 
-  arg3 = (int)jarg3; 
+  arg3 = (Dali::Actor *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
+    return ;
+  } 
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__Reverse__SWIG_1(arg1,arg2,arg3);
+        std_vector_Sl_Dali_Actor_Sg__Insert(arg1,arg2,(Dali::Actor const &)*arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
         return ;
       }
-      catch(std::invalid_argument &_e) {
-        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
-        return ;
-      }
       
     } catch (std::out_of_range& e) {
       {
@@ -88407,7 +88904,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_Reverse__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_InsertRange(void * jarg1, int jarg2, void * jarg3) {
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   int arg2 ;
   std::vector< Dali::Actor > *arg3 = 0 ;
@@ -88422,7 +88919,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_SetRange(void * jarg1, int
   {
     try {
       try {
-        std_vector_Sl_Dali_Actor_Sg__SetRange(arg1,arg2,(std::vector< Dali::Actor > const &)*arg3);
+        std_vector_Sl_Dali_Actor_Sg__InsertRange(arg1,arg2,(std::vector< Dali::Actor > const &)*arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
@@ -88446,13 +88943,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ActorContainer_SetRange(void * jarg1, int
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorContainer(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_RemoveAt(void * jarg1, int jarg2) {
   std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+  int arg2 ;
   
   arg1 = (std::vector< Dali::Actor > *)jarg1; 
+  arg2 = (int)jarg2; 
   {
     try {
-      delete arg1;
+      try {
+        std_vector_Sl_Dali_Actor_Sg__RemoveAt(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+      
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
@@ -88470,43 +88976,67 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ActorContainer(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityActionSignal_Empty(void * jarg1) {
-  unsigned int jresult ;
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_RemoveRange(void * jarg1, int jarg2, int jarg3) {
+  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+  int arg2 ;
+  int arg3 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
+  arg1 = (std::vector< Dali::Actor > *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
   {
     try {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Empty((Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > const *)arg1);
+      try {
+        std_vector_Sl_Dali_Actor_Sg__RemoveRange(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
+        return ;
+      }
+      
     } catch (std::out_of_range& e) {
       {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
       };
     } catch (std::exception& e) {
       {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
       };
     } catch (...) {
       {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
       };
     }
   }
-  jresult = result; 
-  return jresult;
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_AccessibilityActionSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
-  std::size_t result;
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ActorContainer_Repeat(void * jarg1, int jarg2) {
+  void * jresult ;
+  Dali::Actor *arg1 = 0 ;
+  int arg2 ;
+  std::vector< Dali::Actor > *result = 0 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
+  arg1 = (Dali::Actor *)jarg1;
+  if (!arg1) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Actor const & type is null", 0);
+    return 0;
+  } 
+  arg2 = (int)jarg2; 
   {
     try {
-      result = Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__GetConnectionCount((Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > const *)arg1);
+      try {
+        result = (std::vector< Dali::Actor > *)std_vector_Sl_Dali_Actor_Sg__Repeat((Dali::Actor const &)*arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return 0;
+      }
+      
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -88521,20 +89051,18 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_AccessibilityActionSignal_GetCon
       };
     }
   }
-  jresult = (unsigned long)result; 
+  jresult = (void *)result; 
   return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityActionSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
-  bool (*arg2)(Dali::Toolkit::AccessibilityManager &) = (bool (*)(Dali::Toolkit::AccessibilityManager &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Reverse__SWIG_0(void * jarg1) {
+  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
-  arg2 = (bool (*)(Dali::Toolkit::AccessibilityManager &))jarg2; 
+  arg1 = (std::vector< Dali::Actor > *)jarg1; 
   {
     try {
-      Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Connect(arg1,arg2);
+      std_vector_Sl_Dali_Actor_Sg__Reverse__SWIG_0(arg1);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
@@ -88552,15 +89080,28 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityActionSignal_Connect(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityActionSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
-  bool (*arg2)(Dali::Toolkit::AccessibilityManager &) = (bool (*)(Dali::Toolkit::AccessibilityManager &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_Reverse__SWIG_1(void * jarg1, int jarg2, int jarg3) {
+  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+  int arg2 ;
+  int arg3 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
-  arg2 = (bool (*)(Dali::Toolkit::AccessibilityManager &))jarg2; 
+  arg1 = (std::vector< Dali::Actor > *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (int)jarg3; 
   {
     try {
-      Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Disconnect(arg1,arg2);
+      try {
+        std_vector_Sl_Dali_Actor_Sg__Reverse__SWIG_1(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentException, (&_e)->what(), "");
+        return ;
+      }
+      
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
@@ -88578,70 +89119,49 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityActionSignal_Disconnect(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityActionSignal_Emit(void * jarg1, void * jarg2) {
-  unsigned int jresult ;
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
-  Dali::Toolkit::AccessibilityManager *arg2 = 0 ;
-  bool result;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorContainer_SetRange(void * jarg1, int jarg2, void * jarg3) {
+  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
+  int arg2 ;
+  std::vector< Dali::Actor > *arg3 = 0 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
-  arg2 = (Dali::Toolkit::AccessibilityManager *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::AccessibilityManager & type is null", 0);
-    return 0;
+  arg1 = (std::vector< Dali::Actor > *)jarg1; 
+  arg2 = (int)jarg2; 
+  arg3 = (std::vector< Dali::Actor > *)jarg3;
+  if (!arg3) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::vector< Dali::Actor > const & type is null", 0);
+    return ;
   } 
   {
     try {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Emit(arg1,*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
-      };
-    }
-  }
-  jresult = result; 
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AccessibilityActionSignal() {
-  void * jresult ;
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *result = 0 ;
-  
-  {
-    try {
-      result = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)new Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) >();
+      try {
+        std_vector_Sl_Dali_Actor_Sg__SetRange(arg1,arg2,(std::vector< Dali::Actor > const &)*arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, 0, (&_e)->what());
+        return ;
+      }
+      
     } catch (std::out_of_range& e) {
       {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
       };
     } catch (std::exception& e) {
       {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ; 
       };
     } catch (...) {
       {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; 
       };
     }
   }
-  jresult = (void *)result; 
-  return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AccessibilityActionSignal(void * jarg1) {
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorContainer(void * jarg1) {
+  std::vector< Dali::Actor > *arg1 = (std::vector< Dali::Actor > *) 0 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
+  arg1 = (std::vector< Dali::Actor > *)jarg1; 
   {
     try {
       delete arg1;
@@ -88662,15 +89182,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AccessibilityActionSignal(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityActionSignal_Empty(void * jarg1) {
   unsigned int jresult ;
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *) 0 ;
+  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
   bool result;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *)jarg1; 
+  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
   {
     try {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > const *)arg1);
+      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Empty((Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > const *)arg1);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -88690,15 +89210,15 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_E
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_AccessibilityActionSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *) 0 ;
+  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
   std::size_t result;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *)jarg1; 
+  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
   {
     try {
-      result = Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > const *)arg1);
+      result = Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__GetConnectionCount((Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > const *)arg1);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -88718,15 +89238,15 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *) 0 ;
-  bool (*arg2)(Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) = (bool (*)(Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityActionSignal_Connect(void * jarg1, void * jarg2) {
+  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
+  bool (*arg2)(Dali::Toolkit::AccessibilityManager &) = (bool (*)(Dali::Toolkit::AccessibilityManager &)) 0 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *)jarg1; 
-  arg2 = (bool (*)(Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &))jarg2; 
+  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
+  arg2 = (bool (*)(Dali::Toolkit::AccessibilityManager &))jarg2; 
   {
     try {
-      Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Connect(arg1,arg2);
+      Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Connect(arg1,arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
@@ -88744,15 +89264,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_Connect(v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *) 0 ;
-  bool (*arg2)(Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) = (bool (*)(Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &)) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityActionSignal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
+  bool (*arg2)(Dali::Toolkit::AccessibilityManager &) = (bool (*)(Dali::Toolkit::AccessibilityManager &)) 0 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *)jarg1; 
-  arg2 = (bool (*)(Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &))jarg2; 
+  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
+  arg2 = (bool (*)(Dali::Toolkit::AccessibilityManager &))jarg2; 
   {
     try {
-      Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
+      Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Disconnect(arg1,arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ; 
@@ -88770,27 +89290,21 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_Disconnec
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityActionSignal_Emit(void * jarg1, void * jarg2) {
   unsigned int jresult ;
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *) 0 ;
+  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
   Dali::Toolkit::AccessibilityManager *arg2 = 0 ;
-  Dali::TouchEvent *arg3 = 0 ;
   bool result;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *)jarg1; 
+  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
   arg2 = (Dali::Toolkit::AccessibilityManager *)jarg2;
   if (!arg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::AccessibilityManager & type is null", 0);
     return 0;
   } 
-  arg3 = (Dali::TouchEvent *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchEvent const & type is null", 0);
-    return 0;
-  } 
   {
     try {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Emit(arg1,*arg2,(Dali::TouchEvent const &)*arg3);
+      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Toolkit_AccessibilityManager_SA__SP__Sg__Emit(arg1,*arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -88810,13 +89324,13 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityActionScrollSignal_E
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AccessibilityActionScrollSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AccessibilityActionSignal() {
   void * jresult ;
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *result = 0 ;
+  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *result = 0 ;
   
   {
     try {
-      result = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *)new Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) >();
+      result = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)new Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) >();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
@@ -88836,10 +89350,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AccessibilityActionScrollSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AccessibilityActionScrollSignal(void * jarg1) {
-  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *) 0 ;
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AccessibilityActionSignal(void * jarg1) {
+  Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *) 0 ;
   
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &,Dali::TouchEvent const &) > *)jarg1; 
+  arg1 = (Dali::Signal< bool (Dali::Toolkit::AccessibilityManager &) > *)jarg1; 
   {
     try {
       delete arg1;
@@ -88860,7 +89374,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AccessibilityActionScrollSignal(vo
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AccessibilityFocusOvershotSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *) 0 ;
   bool result;
@@ -88888,7 +89402,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_AccessibilityFocusOvershotSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *) 0 ;
   std::size_t result;
@@ -88916,7 +89430,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityFocusOvershotSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) = (void (*)(Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection)) 0 ;
   
@@ -88942,7 +89456,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_Connect(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityFocusOvershotSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) = (void (*)(Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection)) 0 ;
   
@@ -88968,7 +89482,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_Disconne
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_Emit(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AccessibilityFocusOvershotSignal_Emit(void * jarg1, void * jarg2, int jarg3) {
   Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *) 0 ;
   Dali::Actor arg2 ;
   Dali::Toolkit::AccessibilityManager::FocusOvershotDirection arg3 ;
@@ -89002,7 +89516,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_AccessibilityFocusOvershotSignal_Emit(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AccessibilityFocusOvershotSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AccessibilityFocusOvershotSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *result = 0 ;
   
@@ -89028,7 +89542,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_AccessibilityFocusOvershotSignal()
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AccessibilityFocusOvershotSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AccessibilityFocusOvershotSignal(void * jarg1) {
   Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Actor,Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) > *)jarg1; 
@@ -89052,7 +89566,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_AccessibilityFocusOvershotSignal(v
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FocusChangedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_FocusChangedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Actor,Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Actor) > *) 0 ;
   bool result;
@@ -89080,7 +89594,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FocusChangedSignal_Empty(void * j
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_FocusChangedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_FocusChangedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Actor,Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Actor) > *) 0 ;
   std::size_t result;
@@ -89108,7 +89622,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_FocusChangedSignal_GetConnection
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusChangedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FocusChangedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Actor) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::Actor) = (void (*)(Dali::Actor,Dali::Actor)) 0 ;
   
@@ -89134,7 +89648,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusChangedSignal_Connect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusChangedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FocusChangedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Actor) > *) 0 ;
   void (*arg2)(Dali::Actor,Dali::Actor) = (void (*)(Dali::Actor,Dali::Actor)) 0 ;
   
@@ -89160,7 +89674,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusChangedSignal_Disconnect(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusChangedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FocusChangedSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Signal< void (Dali::Actor,Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Actor) > *) 0 ;
   Dali::Actor arg2 ;
   Dali::Actor arg3 ;
@@ -89200,7 +89714,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusChangedSignal_Emit(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FocusChangedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FocusChangedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Actor,Dali::Actor) > *result = 0 ;
   
@@ -89226,7 +89740,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FocusChangedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FocusChangedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FocusChangedSignal(void * jarg1) {
   Dali::Signal< void (Dali::Actor,Dali::Actor) > *arg1 = (Dali::Signal< void (Dali::Actor,Dali::Actor) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Actor,Dali::Actor) > *)jarg1; 
@@ -89250,7 +89764,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FocusChangedSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_FocusGroupChangedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Actor,bool) > *arg1 = (Dali::Signal< void (Dali::Actor,bool) > *) 0 ;
   bool result;
@@ -89278,7 +89792,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_Empty(voi
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_FocusGroupChangedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Actor,bool) > *arg1 = (Dali::Signal< void (Dali::Actor,bool) > *) 0 ;
   std::size_t result;
@@ -89306,7 +89820,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_GetConne
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FocusGroupChangedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,bool) > *arg1 = (Dali::Signal< void (Dali::Actor,bool) > *) 0 ;
   void (*arg2)(Dali::Actor,bool) = (void (*)(Dali::Actor,bool)) 0 ;
   
@@ -89332,7 +89846,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_Connect(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FocusGroupChangedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Actor,bool) > *arg1 = (Dali::Signal< void (Dali::Actor,bool) > *) 0 ;
   void (*arg2)(Dali::Actor,bool) = (void (*)(Dali::Actor,bool)) 0 ;
   
@@ -89358,7 +89872,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_Disconnect(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_Emit(void * jarg1, void * jarg2, unsigned int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_FocusGroupChangedSignal_Emit(void * jarg1, void * jarg2, unsigned int jarg3) {
   Dali::Signal< void (Dali::Actor,bool) > *arg1 = (Dali::Signal< void (Dali::Actor,bool) > *) 0 ;
   Dali::Actor arg2 ;
   bool arg3 ;
@@ -89392,7 +89906,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_FocusGroupChangedSignal_Emit(void * jarg1
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FocusGroupChangedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_FocusGroupChangedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Actor,bool) > *result = 0 ;
   
@@ -89418,7 +89932,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_FocusGroupChangedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FocusGroupChangedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_FocusGroupChangedSignal(void * jarg1) {
   Dali::Signal< void (Dali::Actor,bool) > *arg1 = (Dali::Signal< void (Dali::Actor,bool) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Actor,bool) > *)jarg1; 
@@ -89442,7 +89956,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_FocusGroupChangedSignal(void * jar
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_StyleChangedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_StyleChangedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *arg1 = (Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *) 0 ;
   bool result;
@@ -89470,7 +89984,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_StyleChangedSignal_Empty(void * j
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_StyleChangedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_StyleChangedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *arg1 = (Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *) 0 ;
   std::size_t result;
@@ -89498,7 +90012,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_StyleChangedSignal_GetConnection
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleChangedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StyleChangedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *arg1 = (Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *) 0 ;
   void (*arg2)(Dali::Toolkit::StyleManager,Dali::StyleChange::Type) = (void (*)(Dali::Toolkit::StyleManager,Dali::StyleChange::Type)) 0 ;
   
@@ -89524,7 +90038,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleChangedSignal_Connect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleChangedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StyleChangedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *arg1 = (Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *) 0 ;
   void (*arg2)(Dali::Toolkit::StyleManager,Dali::StyleChange::Type) = (void (*)(Dali::Toolkit::StyleManager,Dali::StyleChange::Type)) 0 ;
   
@@ -89550,7 +90064,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleChangedSignal_Disconnect(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleChangedSignal_Emit(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_StyleChangedSignal_Emit(void * jarg1, void * jarg2, int jarg3) {
   Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *arg1 = (Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *) 0 ;
   Dali::Toolkit::StyleManager arg2 ;
   Dali::StyleChange::Type arg3 ;
@@ -89584,7 +90098,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_StyleChangedSignal_Emit(void * jarg1, voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StyleChangedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_StyleChangedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *result = 0 ;
   
@@ -89610,7 +90124,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_StyleChangedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_StyleChangedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_StyleChangedSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *arg1 = (Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::StyleManager,Dali::StyleChange::Type) > *)jarg1; 
@@ -89634,7 +90148,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_StyleChangedSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ButtonSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ButtonSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Toolkit::Button) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Button) > *) 0 ;
   bool result;
@@ -89662,7 +90176,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ButtonSignal_Empty(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ButtonSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ButtonSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool (Dali::Toolkit::Button) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Button) > *) 0 ;
   std::size_t result;
@@ -89690,7 +90204,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ButtonSignal_GetConnectionCount(
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ButtonSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ButtonSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Toolkit::Button) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Button) > *) 0 ;
   bool (*arg2)(Dali::Toolkit::Button) = (bool (*)(Dali::Toolkit::Button)) 0 ;
   
@@ -89716,7 +90230,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ButtonSignal_Connect(void * jarg1, void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ButtonSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ButtonSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Toolkit::Button) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Button) > *) 0 ;
   bool (*arg2)(Dali::Toolkit::Button) = (bool (*)(Dali::Toolkit::Button)) 0 ;
   
@@ -89742,7 +90256,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ButtonSignal_Disconnect(void * jarg1, voi
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ButtonSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ButtonSignal_Emit(void * jarg1, void * jarg2) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Toolkit::Button) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Button) > *) 0 ;
   Dali::Toolkit::Button arg2 ;
@@ -89778,7 +90292,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ButtonSignal_Emit(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ButtonSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ButtonSignal() {
   void * jresult ;
   Dali::Signal< bool (Dali::Toolkit::Button) > *result = 0 ;
   
@@ -89804,7 +90318,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ButtonSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ButtonSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ButtonSignal(void * jarg1) {
   Dali::Signal< bool (Dali::Toolkit::Button) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Button) > *) 0 ;
   
   arg1 = (Dali::Signal< bool (Dali::Toolkit::Button) > *)jarg1; 
@@ -89828,7 +90342,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ButtonSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GaussianBlurViewSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *) 0 ;
   bool result;
@@ -89856,7 +90370,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_Empty(void
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_GaussianBlurViewSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *) 0 ;
   std::size_t result;
@@ -89884,7 +90398,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_GetConnec
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurViewSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *) 0 ;
   void (*arg2)(Dali::Toolkit::GaussianBlurView) = (void (*)(Dali::Toolkit::GaussianBlurView)) 0 ;
   
@@ -89910,7 +90424,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_Connect(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurViewSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *) 0 ;
   void (*arg2)(Dali::Toolkit::GaussianBlurView) = (void (*)(Dali::Toolkit::GaussianBlurView)) 0 ;
   
@@ -89936,7 +90450,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_Disconnect(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_GaussianBlurViewSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *) 0 ;
   Dali::Toolkit::GaussianBlurView arg2 ;
   Dali::Toolkit::GaussianBlurView *argp2 ;
@@ -89968,7 +90482,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_GaussianBlurViewSignal_Emit(void * jarg1,
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GaussianBlurViewSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_GaussianBlurViewSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *result = 0 ;
   
@@ -89994,7 +90508,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_GaussianBlurViewSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_GaussianBlurViewSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_GaussianBlurViewSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::GaussianBlurView) > *)jarg1; 
@@ -90018,7 +90532,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_GaussianBlurViewSignal(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PageTurnSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PageTurnSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *) 0 ;
   bool result;
@@ -90046,7 +90560,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PageTurnSignal_Empty(void * jarg1
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PageTurnSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PageTurnSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *) 0 ;
   std::size_t result;
@@ -90074,7 +90588,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PageTurnSignal_GetConnectionCoun
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PageTurnSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PageTurnSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *) 0 ;
   void (*arg2)(Dali::Toolkit::PageTurnView,unsigned int,bool) = (void (*)(Dali::Toolkit::PageTurnView,unsigned int,bool)) 0 ;
   
@@ -90100,7 +90614,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PageTurnSignal_Connect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PageTurnSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PageTurnSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *) 0 ;
   void (*arg2)(Dali::Toolkit::PageTurnView,unsigned int,bool) = (void (*)(Dali::Toolkit::PageTurnView,unsigned int,bool)) 0 ;
   
@@ -90126,7 +90640,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PageTurnSignal_Disconnect(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PageTurnSignal_Emit(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PageTurnSignal_Emit(void * jarg1, void * jarg2, unsigned int jarg3, unsigned int jarg4) {
   Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *) 0 ;
   Dali::Toolkit::PageTurnView arg2 ;
   unsigned int arg3 ;
@@ -90162,7 +90676,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PageTurnSignal_Emit(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PageTurnSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *result = 0 ;
   
@@ -90188,7 +90702,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PageTurnSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PageTurnSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView,unsigned int,bool) > *)jarg1; 
@@ -90212,7 +90726,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PageTurnSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PagePanSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_PagePanSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::PageTurnView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView) > *) 0 ;
   bool result;
@@ -90240,7 +90754,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_PagePanSignal_Empty(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PagePanSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_PagePanSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::PageTurnView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView) > *) 0 ;
   std::size_t result;
@@ -90268,7 +90782,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_PagePanSignal_GetConnectionCount
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PagePanSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PagePanSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::PageTurnView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView) > *) 0 ;
   void (*arg2)(Dali::Toolkit::PageTurnView) = (void (*)(Dali::Toolkit::PageTurnView)) 0 ;
   
@@ -90294,7 +90808,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PagePanSignal_Connect(void * jarg1, void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PagePanSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PagePanSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::PageTurnView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView) > *) 0 ;
   void (*arg2)(Dali::Toolkit::PageTurnView) = (void (*)(Dali::Toolkit::PageTurnView)) 0 ;
   
@@ -90320,7 +90834,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PagePanSignal_Disconnect(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PagePanSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PagePanSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::PageTurnView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView) > *) 0 ;
   Dali::Toolkit::PageTurnView arg2 ;
   Dali::Toolkit::PageTurnView *argp2 ;
@@ -90352,7 +90866,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_PagePanSignal_Emit(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PagePanSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PagePanSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::PageTurnView) > *result = 0 ;
   
@@ -90378,7 +90892,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_PagePanSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PagePanSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PagePanSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::PageTurnView) > *arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::PageTurnView) > *)jarg1; 
@@ -90402,7 +90916,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_PagePanSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ScrollViewSnapStartedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *) 0 ;
   bool result;
@@ -90430,7 +90944,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_Empty
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ScrollViewSnapStartedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *) 0 ;
   std::size_t result;
@@ -90458,7 +90972,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_GetC
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollViewSnapStartedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *) 0 ;
   void (*arg2)(Dali::Toolkit::ScrollView::SnapEvent const &) = (void (*)(Dali::Toolkit::ScrollView::SnapEvent const &)) 0 ;
   
@@ -90484,7 +90998,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_Connect(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollViewSnapStartedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *) 0 ;
   void (*arg2)(Dali::Toolkit::ScrollView::SnapEvent const &) = (void (*)(Dali::Toolkit::ScrollView::SnapEvent const &)) 0 ;
   
@@ -90510,7 +91024,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_Disconnect(vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollViewSnapStartedSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *) 0 ;
   Dali::Toolkit::ScrollView::SnapEvent *arg2 = 0 ;
   
@@ -90540,7 +91054,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollViewSnapStartedSignal_Emit(void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollViewSnapStartedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollViewSnapStartedSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *result = 0 ;
   
@@ -90566,7 +91080,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollViewSnapStartedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollViewSnapStartedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollViewSnapStartedSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *)jarg1; 
@@ -90590,7 +91104,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollViewSnapStartedSignal(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollableSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ScrollableSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Vector2 const &) > *arg1 = (Dali::Signal< void (Dali::Vector2 const &) > *) 0 ;
   bool result;
@@ -90618,7 +91132,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ScrollableSignal_Empty(void * jar
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ScrollableSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ScrollableSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Vector2 const &) > *arg1 = (Dali::Signal< void (Dali::Vector2 const &) > *) 0 ;
   std::size_t result;
@@ -90646,7 +91160,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ScrollableSignal_GetConnectionCo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollableSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollableSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Vector2 const &) > *arg1 = (Dali::Signal< void (Dali::Vector2 const &) > *) 0 ;
   void (*arg2)(Dali::Vector2 const &) = (void (*)(Dali::Vector2 const &)) 0 ;
   
@@ -90672,7 +91186,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollableSignal_Connect(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollableSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollableSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Vector2 const &) > *arg1 = (Dali::Signal< void (Dali::Vector2 const &) > *) 0 ;
   void (*arg2)(Dali::Vector2 const &) = (void (*)(Dali::Vector2 const &)) 0 ;
   
@@ -90698,7 +91212,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollableSignal_Disconnect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollableSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ScrollableSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Vector2 const &) > *arg1 = (Dali::Signal< void (Dali::Vector2 const &) > *) 0 ;
   Dali::Vector2 *arg2 = 0 ;
   
@@ -90728,7 +91242,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ScrollableSignal_Emit(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollableSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ScrollableSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Vector2 const &) > *result = 0 ;
   
@@ -90754,7 +91268,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ScrollableSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollableSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollableSignal(void * jarg1) {
   Dali::Signal< void (Dali::Vector2 const &) > *arg1 = (Dali::Signal< void (Dali::Vector2 const &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Vector2 const &) > *)jarg1; 
@@ -90778,7 +91292,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ScrollableSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TextEditorSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TextEditorSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::TextEditor) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextEditor) > *) 0 ;
   bool result;
@@ -90806,7 +91320,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TextEditorSignal_Empty(void * jar
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TextEditorSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TextEditorSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::TextEditor) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextEditor) > *) 0 ;
   std::size_t result;
@@ -90834,7 +91348,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TextEditorSignal_GetConnectionCo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextEditorSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextEditorSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::TextEditor) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextEditor) > *) 0 ;
   void (*arg2)(Dali::Toolkit::TextEditor) = (void (*)(Dali::Toolkit::TextEditor)) 0 ;
   
@@ -90860,7 +91374,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextEditorSignal_Connect(void * jarg1, vo
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextEditorSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextEditorSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::TextEditor) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextEditor) > *) 0 ;
   void (*arg2)(Dali::Toolkit::TextEditor) = (void (*)(Dali::Toolkit::TextEditor)) 0 ;
   
@@ -90886,7 +91400,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextEditorSignal_Disconnect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextEditorSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextEditorSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::TextEditor) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextEditor) > *) 0 ;
   Dali::Toolkit::TextEditor arg2 ;
   Dali::Toolkit::TextEditor *argp2 ;
@@ -90918,7 +91432,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextEditorSignal_Emit(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditorSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextEditorSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::TextEditor) > *result = 0 ;
   
@@ -90944,7 +91458,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextEditorSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextEditorSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextEditorSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::TextEditor) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextEditor) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::TextEditor) > *)jarg1; 
@@ -90968,7 +91482,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextEditorSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TextFieldSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TextFieldSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::TextField) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextField) > *) 0 ;
   bool result;
@@ -90996,7 +91510,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_TextFieldSignal_Empty(void * jarg
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TextFieldSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TextFieldSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::TextField) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextField) > *) 0 ;
   std::size_t result;
@@ -91024,7 +91538,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_TextFieldSignal_GetConnectionCou
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextFieldSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextFieldSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::TextField) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextField) > *) 0 ;
   void (*arg2)(Dali::Toolkit::TextField) = (void (*)(Dali::Toolkit::TextField)) 0 ;
   
@@ -91050,7 +91564,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextFieldSignal_Connect(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextFieldSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextFieldSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::TextField) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextField) > *) 0 ;
   void (*arg2)(Dali::Toolkit::TextField) = (void (*)(Dali::Toolkit::TextField)) 0 ;
   
@@ -91076,7 +91590,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextFieldSignal_Disconnect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextFieldSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextFieldSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::TextField) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextField) > *) 0 ;
   Dali::Toolkit::TextField arg2 ;
   Dali::Toolkit::TextField *argp2 ;
@@ -91108,7 +91622,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_TextFieldSignal_Emit(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextFieldSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TextFieldSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::TextField) > *result = 0 ;
   
@@ -91134,7 +91648,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_TextFieldSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextFieldSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TextFieldSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::TextField) > *arg1 = (Dali::Signal< void (Dali::Toolkit::TextField) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::TextField) > *)jarg1; 
@@ -91158,7 +91672,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_TextFieldSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ControlKeySignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
   bool result;
@@ -91186,7 +91700,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_Empty(void
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ControlKeySignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
   std::size_t result;
@@ -91214,7 +91728,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_GetConnect
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ControlKeySignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
   bool (*arg2)(Dali::Toolkit::Control,Dali::KeyEvent const &) = (bool (*)(Dali::Toolkit::Control,Dali::KeyEvent const &)) 0 ;
   
@@ -91240,7 +91754,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_Connect(void * jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ControlKeySignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
   bool (*arg2)(Dali::Toolkit::Control,Dali::KeyEvent const &) = (bool (*)(Dali::Toolkit::Control,Dali::KeyEvent const &)) 0 ;
   
@@ -91266,7 +91780,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_Disconnect(void * j
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ControlKeySignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
   Dali::Toolkit::Control arg2 ;
@@ -91308,7 +91822,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_ControlKeyEventSignal_Emit(void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ControlKeyEventSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ControlKeySignal() {
   void * jresult ;
   Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *result = 0 ;
   
@@ -91334,7 +91848,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_ControlKeyEventSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ControlKeyEventSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ControlKeySignal(void * jarg1) {
   Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
   
   arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *)jarg1; 
@@ -91358,7 +91872,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_ControlKeyEventSignal(void * jarg1
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
   bool result;
@@ -91386,7 +91900,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_Empty(void *
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
   std::size_t result;
@@ -91414,7 +91928,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_GetConnectio
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
   void (*arg2)(Dali::Toolkit::Control) = (void (*)(Dali::Toolkit::Control)) 0 ;
   
@@ -91440,7 +91954,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_Connect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
   void (*arg2)(Dali::Toolkit::Control) = (void (*)(Dali::Toolkit::Control)) 0 ;
   
@@ -91466,7 +91980,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_Disconnect(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
   Dali::Toolkit::Control arg2 ;
   Dali::Toolkit::Control *argp2 ;
@@ -91498,7 +92012,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_KeyInputFocusSignal_Emit(void * jarg1, vo
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyInputFocusSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyInputFocusSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::Control) > *result = 0 ;
   
@@ -91524,7 +92038,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_KeyInputFocusSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyInputFocusSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyInputFocusSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *)jarg1; 
@@ -91548,7 +92062,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_KeyInputFocusSignal(void * jarg1)
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_VideoViewSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_VideoViewSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< void (Dali::Toolkit::VideoView &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::VideoView &) > *) 0 ;
   bool result;
@@ -91576,7 +92090,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_VideoViewSignal_Empty(void * jarg
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VideoViewSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_VideoViewSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< void (Dali::Toolkit::VideoView &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::VideoView &) > *) 0 ;
   std::size_t result;
@@ -91604,7 +92118,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_VideoViewSignal_GetConnectionCou
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoViewSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoViewSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::VideoView &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::VideoView &) > *) 0 ;
   void (*arg2)(Dali::Toolkit::VideoView &) = (void (*)(Dali::Toolkit::VideoView &)) 0 ;
   
@@ -91630,7 +92144,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoViewSignal_Connect(void * jarg1, voi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoViewSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoViewSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::VideoView &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::VideoView &) > *) 0 ;
   void (*arg2)(Dali::Toolkit::VideoView &) = (void (*)(Dali::Toolkit::VideoView &)) 0 ;
   
@@ -91656,7 +92170,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoViewSignal_Disconnect(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoViewSignal_Emit(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VideoViewSignal_Emit(void * jarg1, void * jarg2) {
   Dali::Signal< void (Dali::Toolkit::VideoView &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::VideoView &) > *) 0 ;
   Dali::Toolkit::VideoView *arg2 = 0 ;
   
@@ -91686,7 +92200,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VideoViewSignal_Emit(void * jarg1, void *
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VideoViewSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_VideoViewSignal() {
   void * jresult ;
   Dali::Signal< void (Dali::Toolkit::VideoView &) > *result = 0 ;
   
@@ -91712,7 +92226,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_VideoViewSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VideoViewSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_VideoViewSignal(void * jarg1) {
   Dali::Signal< void (Dali::Toolkit::VideoView &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::VideoView &) > *) 0 ;
   
   arg1 = (Dali::Signal< void (Dali::Toolkit::VideoView &) > *)jarg1; 
@@ -91736,7 +92250,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_VideoViewSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SliderValueChangedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Toolkit::Slider,float) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,float) > *) 0 ;
   bool result;
@@ -91764,7 +92278,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_Empty(vo
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_SliderValueChangedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool (Dali::Toolkit::Slider,float) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,float) > *) 0 ;
   std::size_t result;
@@ -91792,7 +92306,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_GetConn
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SliderValueChangedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Toolkit::Slider,float) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,float) > *) 0 ;
   bool (*arg2)(Dali::Toolkit::Slider,float) = (bool (*)(Dali::Toolkit::Slider,float)) 0 ;
   
@@ -91818,7 +92332,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_Connect(void * j
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SliderValueChangedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Toolkit::Slider,float) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,float) > *) 0 ;
   bool (*arg2)(Dali::Toolkit::Slider,float) = (bool (*)(Dali::Toolkit::Slider,float)) 0 ;
   
@@ -91844,7 +92358,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_Disconnect(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_Emit(void * jarg1, void * jarg2, float jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SliderValueChangedSignal_Emit(void * jarg1, void * jarg2, float jarg3) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Toolkit::Slider,float) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,float) > *) 0 ;
   Dali::Toolkit::Slider arg2 ;
@@ -91882,7 +92396,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_SliderValueChangedSignal_Emit(voi
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_SliderValueChangedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_SliderValueChangedSignal() {
   void * jresult ;
   Dali::Signal< bool (Dali::Toolkit::Slider,float) > *result = 0 ;
   
@@ -91908,7 +92422,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_SliderValueChangedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SliderValueChangedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SliderValueChangedSignal(void * jarg1) {
   Dali::Signal< bool (Dali::Toolkit::Slider,float) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,float) > *) 0 ;
   
   arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,float) > *)jarg1; 
@@ -91932,7 +92446,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SliderValueChangedSignal(void * ja
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_Empty(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SliderMarkReachedSignal_Empty(void * jarg1) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Toolkit::Slider,int) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,int) > *) 0 ;
   bool result;
@@ -91960,7 +92474,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_Empty(voi
 }
 
 
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_GetConnectionCount(void * jarg1) {
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_SliderMarkReachedSignal_GetConnectionCount(void * jarg1) {
   unsigned long jresult ;
   Dali::Signal< bool (Dali::Toolkit::Slider,int) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,int) > *) 0 ;
   std::size_t result;
@@ -91988,7 +92502,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_GetConne
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_Connect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SliderMarkReachedSignal_Connect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Toolkit::Slider,int) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,int) > *) 0 ;
   bool (*arg2)(Dali::Toolkit::Slider,int) = (bool (*)(Dali::Toolkit::Slider,int)) 0 ;
   
@@ -92014,7 +92528,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_Connect(void * ja
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_Disconnect(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SliderMarkReachedSignal_Disconnect(void * jarg1, void * jarg2) {
   Dali::Signal< bool (Dali::Toolkit::Slider,int) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,int) > *) 0 ;
   bool (*arg2)(Dali::Toolkit::Slider,int) = (bool (*)(Dali::Toolkit::Slider,int)) 0 ;
   
@@ -92040,7 +92554,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_Disconnect(void *
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_Emit(void * jarg1, void * jarg2, int jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SliderMarkReachedSignal_Emit(void * jarg1, void * jarg2, int jarg3) {
   unsigned int jresult ;
   Dali::Signal< bool (Dali::Toolkit::Slider,int) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,int) > *) 0 ;
   Dali::Toolkit::Slider arg2 ;
@@ -92078,7 +92592,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_SliderMarkReachedSignal_Emit(void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_SliderMarkReachedSignal() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_SliderMarkReachedSignal() {
   void * jresult ;
   Dali::Signal< bool (Dali::Toolkit::Slider,int) > *result = 0 ;
   
@@ -92104,7 +92618,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_SliderMarkReachedSignal() {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SliderMarkReachedSignal(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_SliderMarkReachedSignal(void * jarg1) {
   Dali::Signal< bool (Dali::Toolkit::Slider,int) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,int) > *) 0 ;
   
   arg1 = (Dali::Signal< bool (Dali::Toolkit::Slider,int) > *)jarg1; 
@@ -92128,7 +92642,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_SliderMarkReachedSignal(void * jar
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerPtr__SWIG_0() {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RulerPtr__SWIG_0() {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *result = 0 ;
   
@@ -92154,7 +92668,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerPtr__SWIG_0() {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerPtr__SWIG_1(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RulerPtr__SWIG_1(void * jarg1) {
   void * jresult ;
   Dali::Toolkit::Ruler *arg1 = (Dali::Toolkit::Ruler *) 0 ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *result = 0 ;
@@ -92182,7 +92696,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerPtr__SWIG_1(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerPtr__SWIG_2(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RulerPtr__SWIG_2(void * jarg1) {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = 0 ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *result = 0 ;
@@ -92214,7 +92728,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_RulerPtr__SWIG_2(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RulerPtr(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_RulerPtr(void * jarg1) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   
   arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *)jarg1; 
@@ -92238,7 +92752,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_delete_RulerPtr(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_Get(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RulerPtr_Get(void * jarg1) {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::Toolkit::Ruler *result = 0 ;
@@ -92266,7 +92780,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_Get(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr___deref__(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RulerPtr___deref__(void * jarg1) {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::Toolkit::Ruler *result = 0 ;
@@ -92294,7 +92808,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr___deref__(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr___ref__(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RulerPtr___ref__(void * jarg1) {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::Toolkit::Ruler *result = 0 ;
@@ -92322,7 +92836,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr___ref__(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_Assign__SWIG_0(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RulerPtr_Assign__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg2 = 0 ;
@@ -92356,7 +92870,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_Assign__SWIG_0(void * jarg1, v
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_Assign__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RulerPtr_Assign__SWIG_1(void * jarg1, void * jarg2) {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::Toolkit::Ruler *arg2 = (Dali::Toolkit::Ruler *) 0 ;
@@ -92386,7 +92900,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_Assign__SWIG_1(void * jarg1, v
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Reset__SWIG_0(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerPtr_Reset__SWIG_0(void * jarg1) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   
   arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *)jarg1; 
@@ -92410,7 +92924,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Reset__SWIG_0(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Reset__SWIG_1(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerPtr_Reset__SWIG_1(void * jarg1, void * jarg2) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::Toolkit::Ruler *arg2 = (Dali::Toolkit::Ruler *) 0 ;
   
@@ -92436,7 +92950,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Reset__SWIG_1(void * jarg1, void
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_Detach(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RulerPtr_Detach(void * jarg1) {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::Toolkit::Ruler *result = 0 ;
@@ -92464,7 +92978,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_Detach(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Snap__SWIG_0(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_Snap__SWIG_0(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -92496,7 +93010,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Snap__SWIG_0(void * jarg1, floa
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Snap__SWIG_1(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_Snap__SWIG_1(void * jarg1, float jarg2) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -92526,7 +93040,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Snap__SWIG_1(void * jarg1, floa
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_GetPositionFromPage(void * jarg1, unsigned int jarg2, unsigned int * jarg3, unsigned int jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_GetPositionFromPage(void * jarg1, unsigned int jarg2, unsigned int * jarg3, unsigned int jarg4) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   unsigned int arg2 ;
@@ -92560,7 +93074,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_GetPositionFromPage(void * jarg
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RulerPtr_GetPageFromPosition(void * jarg1, float jarg2, unsigned int jarg3) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RulerPtr_GetPageFromPosition(void * jarg1, float jarg2, unsigned int jarg3) {
   unsigned int jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -92592,7 +93106,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RulerPtr_GetPageFromPosition(void
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RulerPtr_GetTotalPages(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RulerPtr_GetTotalPages(void * jarg1) {
   unsigned int jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   unsigned int result;
@@ -92620,7 +93134,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RulerPtr_GetTotalPages(void * jar
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RulerPtr_GetType(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RulerPtr_GetType(void * jarg1) {
   int jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::Toolkit::Ruler::RulerType result;
@@ -92648,7 +93162,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RulerPtr_GetType(void * jarg1) {
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RulerPtr_IsEnabled(void * jarg1) {
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RulerPtr_IsEnabled(void * jarg1) {
   unsigned int jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   bool result;
@@ -92676,7 +93190,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_NUI_RulerPtr_IsEnabled(void * jarg1)
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Enable(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerPtr_Enable(void * jarg1) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   
   arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *)jarg1; 
@@ -92700,7 +93214,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Enable(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Disable(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerPtr_Disable(void * jarg1) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   
   arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *)jarg1; 
@@ -92724,7 +93238,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Disable(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_SetDomain(void * jarg1, void * jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerPtr_SetDomain(void * jarg1, void * jarg2) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   SwigValueWrapper< Dali::Toolkit::RulerDomain > arg2 ;
   Dali::Toolkit::RulerDomain *argp2 ;
@@ -92756,7 +93270,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_SetDomain(void * jarg1, void * j
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_GetDomain(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RulerPtr_GetDomain(void * jarg1) {
   void * jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   Dali::Toolkit::RulerDomain *result = 0 ;
@@ -92784,7 +93298,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_RulerPtr_GetDomain(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_DisableDomain(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerPtr_DisableDomain(void * jarg1) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   
   arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *)jarg1; 
@@ -92808,7 +93322,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_DisableDomain(void * jarg1) {
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Clamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_Clamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -92842,7 +93356,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Clamp__SWIG_0(void * jarg1, flo
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Clamp__SWIG_1(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_Clamp__SWIG_1(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -92874,7 +93388,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Clamp__SWIG_1(void * jarg1, flo
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Clamp__SWIG_2(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_Clamp__SWIG_2(void * jarg1, float jarg2) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -92904,7 +93418,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Clamp__SWIG_2(void * jarg1, flo
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3, float jarg4, void * jarg5) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_Clamp__SWIG_3(void * jarg1, float jarg2, float jarg3, float jarg4, void * jarg5) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -92944,7 +93458,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_Clamp__SWIG_3(void * jarg1, flo
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_SnapAndClamp__SWIG_0(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -92980,7 +93494,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_0(void * jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_SnapAndClamp__SWIG_1(void * jarg1, float jarg2, float jarg3, float jarg4) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -93014,7 +93528,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_1(void * jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_2(void * jarg1, float jarg2, float jarg3) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_SnapAndClamp__SWIG_2(void * jarg1, float jarg2, float jarg3) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -93046,7 +93560,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_2(void * jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_3(void * jarg1, float jarg2) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_SnapAndClamp__SWIG_3(void * jarg1, float jarg2) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -93076,7 +93590,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_3(void * jar
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_4(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5, void * jarg6) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_RulerPtr_SnapAndClamp__SWIG_4(void * jarg1, float jarg2, float jarg3, float jarg4, float jarg5, void * jarg6) {
   float jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   float arg2 ;
@@ -93118,7 +93632,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_RulerPtr_SnapAndClamp__SWIG_4(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Reference(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerPtr_Reference(void * jarg1) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   
   arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *)jarg1; 
@@ -93142,7 +93656,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Reference(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Unreference(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RulerPtr_Unreference(void * jarg1) {
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   
   arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *)jarg1; 
@@ -93166,7 +93680,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_RulerPtr_Unreference(void * jarg1) {
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RulerPtr_ReferenceCount(void * jarg1) {
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_RulerPtr_ReferenceCount(void * jarg1) {
   int jresult ;
   Dali::IntrusivePtr< Dali::Toolkit::Ruler > *arg1 = (Dali::IntrusivePtr< Dali::Toolkit::Ruler > *) 0 ;
   int result;
@@ -93194,375 +93708,379 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_RulerPtr_ReferenceCount(void * jarg1) {
 }
 
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_NUI_BaseObject_SWIGUpcast(Dali::BaseObject *jarg1) {
+SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_BaseObject_SWIGUpcast(Dali::BaseObject *jarg1) {
     return (Dali::RefObject *)jarg1;
 }
 
-SWIGEXPORT Dali::SignalObserver * SWIGSTDCALL CSharp_NUI_ConnectionTrackerInterface_SWIGUpcast(Dali::ConnectionTrackerInterface *jarg1) {
+SWIGEXPORT Dali::SignalObserver * SWIGSTDCALL CSharp_Dali_ConnectionTrackerInterface_SWIGUpcast(Dali::ConnectionTrackerInterface *jarg1) {
     return (Dali::SignalObserver *)jarg1;
 }
 
-SWIGEXPORT Dali::ConnectionTrackerInterface * SWIGSTDCALL CSharp_NUI_ConnectionTracker_SWIGUpcast(Dali::ConnectionTracker *jarg1) {
+SWIGEXPORT Dali::ConnectionTrackerInterface * SWIGSTDCALL CSharp_Dali_ConnectionTracker_SWIGUpcast(Dali::ConnectionTracker *jarg1) {
     return (Dali::ConnectionTrackerInterface *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_ObjectRegistry_SWIGUpcast(Dali::ObjectRegistry *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_ObjectRegistry_SWIGUpcast(Dali::ObjectRegistry *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_PropertyCondition_SWIGUpcast(Dali::PropertyCondition *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_PropertyCondition_SWIGUpcast(Dali::PropertyCondition *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_PropertyNotification_SWIGUpcast(Dali::PropertyNotification *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_PropertyNotification_SWIGUpcast(Dali::PropertyNotification *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Handle_SWIGUpcast(Dali::Handle *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Handle_SWIGUpcast(Dali::Handle *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_TypeInfo_SWIGUpcast(Dali::TypeInfo *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TypeInfo_SWIGUpcast(Dali::TypeInfo *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_TypeRegistry_SWIGUpcast(Dali::TypeRegistry *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TypeRegistry_SWIGUpcast(Dali::TypeRegistry *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Image_SWIGUpcast(Dali::Image *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Image_SWIGUpcast(Dali::Image *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_PixelData_SWIGUpcast(Dali::PixelData *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_PixelData_SWIGUpcast(Dali::PixelData *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Texture_SWIGUpcast(Dali::Texture *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Texture_SWIGUpcast(Dali::Texture *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Sampler_SWIGUpcast(Dali::Sampler *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Sampler_SWIGUpcast(Dali::Sampler *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_TextureSet_SWIGUpcast(Dali::TextureSet *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TextureSet_SWIGUpcast(Dali::TextureSet *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_PropertyBuffer_SWIGUpcast(Dali::PropertyBuffer *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_PropertyBuffer_SWIGUpcast(Dali::PropertyBuffer *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Geometry_SWIGUpcast(Dali::Geometry *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Geometry_SWIGUpcast(Dali::Geometry *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_NUI_Shader_SWIGUpcast(Dali::Shader *jarg1) {
+SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_Shader_SWIGUpcast(Dali::Shader *jarg1) {
     return (Dali::Handle *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_NUI_Renderer_SWIGUpcast(Dali::Renderer *jarg1) {
+SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_Renderer_SWIGUpcast(Dali::Renderer *jarg1) {
     return (Dali::Handle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_FrameBuffer_SWIGUpcast(Dali::FrameBuffer *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_FrameBuffer_SWIGUpcast(Dali::FrameBuffer *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_RenderTaskList_SWIGUpcast(Dali::RenderTaskList *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_RenderTaskList_SWIGUpcast(Dali::RenderTaskList *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_NUI_RenderTask_SWIGUpcast(Dali::RenderTask *jarg1) {
+SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_RenderTask_SWIGUpcast(Dali::RenderTask *jarg1) {
     return (Dali::Handle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_TouchData_SWIGUpcast(Dali::TouchData *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Touch_SWIGUpcast(Dali::TouchData *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_NUI_GestureDetector_SWIGUpcast(Dali::GestureDetector *jarg1) {
+SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_GestureDetector_SWIGUpcast(Dali::GestureDetector *jarg1) {
     return (Dali::Handle *)jarg1;
 }
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_NUI_LongPressGestureDetector_SWIGUpcast(Dali::LongPressGestureDetector *jarg1) {
+SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_LongPressGestureDetector_SWIGUpcast(Dali::LongPressGestureDetector *jarg1) {
     return (Dali::GestureDetector *)jarg1;
 }
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_NUI_LongPressGesture_SWIGUpcast(Dali::LongPressGesture *jarg1) {
+SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_LongPressGesture_SWIGUpcast(Dali::LongPressGesture *jarg1) {
     return (Dali::Gesture *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_NUI_Actor_SWIGUpcast(Dali::Actor *jarg1) {
+SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_Actor_SWIGUpcast(Dali::Actor *jarg1) {
     return (Dali::Handle *)jarg1;
 }
 
-SWIGEXPORT Dali::Actor * SWIGSTDCALL CSharp_NUI_Layer_SWIGUpcast(Dali::Layer *jarg1) {
+SWIGEXPORT Dali::Actor * SWIGSTDCALL CSharp_Dali_Layer_SWIGUpcast(Dali::Layer *jarg1) {
     return (Dali::Actor *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Stage_SWIGUpcast(Dali::Stage *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Stage_SWIGUpcast(Dali::Stage *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_NUI_CustomActorImpl_SWIGUpcast(Dali::CustomActorImpl *jarg1) {
+SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_CustomActorImpl_SWIGUpcast(Dali::CustomActorImpl *jarg1) {
     return (Dali::RefObject *)jarg1;
 }
 
-SWIGEXPORT Dali::Actor * SWIGSTDCALL CSharp_NUI_CustomActor_SWIGUpcast(Dali::CustomActor *jarg1) {
+SWIGEXPORT Dali::Actor * SWIGSTDCALL CSharp_Dali_CustomActor_SWIGUpcast(Dali::CustomActor *jarg1) {
     return (Dali::Actor *)jarg1;
 }
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_NUI_PanGestureDetector_SWIGUpcast(Dali::PanGestureDetector *jarg1) {
+SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_PanGestureDetector_SWIGUpcast(Dali::PanGestureDetector *jarg1) {
     return (Dali::GestureDetector *)jarg1;
 }
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_NUI_PanGesture_SWIGUpcast(Dali::PanGesture *jarg1) {
+SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_PanGesture_SWIGUpcast(Dali::PanGesture *jarg1) {
     return (Dali::Gesture *)jarg1;
 }
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_NUI_PinchGestureDetector_SWIGUpcast(Dali::PinchGestureDetector *jarg1) {
+SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_PinchGestureDetector_SWIGUpcast(Dali::PinchGestureDetector *jarg1) {
     return (Dali::GestureDetector *)jarg1;
 }
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_NUI_PinchGesture_SWIGUpcast(Dali::PinchGesture *jarg1) {
+SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_PinchGesture_SWIGUpcast(Dali::PinchGesture *jarg1) {
     return (Dali::Gesture *)jarg1;
 }
 
-SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_NUI_TapGestureDetector_SWIGUpcast(Dali::TapGestureDetector *jarg1) {
+SWIGEXPORT Dali::GestureDetector * SWIGSTDCALL CSharp_Dali_TapGestureDetector_SWIGUpcast(Dali::TapGestureDetector *jarg1) {
     return (Dali::GestureDetector *)jarg1;
 }
 
-SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_NUI_TapGesture_SWIGUpcast(Dali::TapGesture *jarg1) {
+SWIGEXPORT Dali::Gesture * SWIGSTDCALL CSharp_Dali_TapGesture_SWIGUpcast(Dali::TapGesture *jarg1) {
     return (Dali::Gesture *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_KeyFrames_SWIGUpcast(Dali::KeyFrames *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_KeyFrames_SWIGUpcast(Dali::KeyFrames *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_NUI_Path_SWIGUpcast(Dali::Path *jarg1) {
+SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_Path_SWIGUpcast(Dali::Path *jarg1) {
     return (Dali::Handle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Animation_SWIGUpcast(Dali::Animation *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Animation_SWIGUpcast(Dali::Animation *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_NUI_LinearConstrainer_SWIGUpcast(Dali::LinearConstrainer *jarg1) {
+SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_LinearConstrainer_SWIGUpcast(Dali::LinearConstrainer *jarg1) {
     return (Dali::Handle *)jarg1;
 }
 
-SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_NUI_PathConstrainer_SWIGUpcast(Dali::PathConstrainer *jarg1) {
+SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_PathConstrainer_SWIGUpcast(Dali::PathConstrainer *jarg1) {
     return (Dali::Handle *)jarg1;
 }
 
-SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_NUI_BufferImage_SWIGUpcast(Dali::BufferImage *jarg1) {
+SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_Dali_BufferImage_SWIGUpcast(Dali::BufferImage *jarg1) {
     return (Dali::Image *)jarg1;
 }
 
-SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_NUI_EncodedBufferImage_SWIGUpcast(Dali::EncodedBufferImage *jarg1) {
+SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_Dali_EncodedBufferImage_SWIGUpcast(Dali::EncodedBufferImage *jarg1) {
     return (Dali::Image *)jarg1;
 }
 
-SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_NUI_NativeImage_SWIGUpcast(Dali::NativeImage *jarg1) {
+SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_Dali_NativeImage_SWIGUpcast(Dali::NativeImage *jarg1) {
     return (Dali::Image *)jarg1;
 }
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_NUI_NativeImageInterface_SWIGUpcast(Dali::NativeImageInterface *jarg1) {
+SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_NativeImageInterface_SWIGUpcast(Dali::NativeImageInterface *jarg1) {
     return (Dali::RefObject *)jarg1;
 }
 
-SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_NUI_ResourceImage_SWIGUpcast(Dali::ResourceImage *jarg1) {
+SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_Dali_ResourceImage_SWIGUpcast(Dali::ResourceImage *jarg1) {
     return (Dali::Image *)jarg1;
 }
 
-SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_NUI_FrameBufferImage_SWIGUpcast(Dali::FrameBufferImage *jarg1) {
+SWIGEXPORT Dali::Image * SWIGSTDCALL CSharp_Dali_FrameBufferImage_SWIGUpcast(Dali::FrameBufferImage *jarg1) {
     return (Dali::Image *)jarg1;
 }
 
-SWIGEXPORT Dali::ResourceImage * SWIGSTDCALL CSharp_NUI_NinePatchImage_SWIGUpcast(Dali::NinePatchImage *jarg1) {
+SWIGEXPORT Dali::ResourceImage * SWIGSTDCALL CSharp_Dali_NinePatchImage_SWIGUpcast(Dali::NinePatchImage *jarg1) {
     return (Dali::ResourceImage *)jarg1;
 }
 
-SWIGEXPORT Dali::Actor * SWIGSTDCALL CSharp_NUI_CameraActor_SWIGUpcast(Dali::CameraActor *jarg1) {
+SWIGEXPORT Dali::Actor * SWIGSTDCALL CSharp_Dali_CameraActor_SWIGUpcast(Dali::CameraActor *jarg1) {
     return (Dali::Actor *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Timer_SWIGUpcast(Dali::Timer *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Timer_SWIGUpcast(Dali::Timer *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_DragAndDropDetector_SWIGUpcast(Dali::DragAndDropDetector *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_DragAndDropDetector_SWIGUpcast(Dali::DragAndDropDetector *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Window_SWIGUpcast(Dali::Window *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Window_SWIGUpcast(Dali::Window *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Application_SWIGUpcast(Dali::Application *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Application_SWIGUpcast(Dali::Application *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_Builder_SWIGUpcast(Dali::Toolkit::Builder *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Builder_SWIGUpcast(Dali::Toolkit::Builder *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_TransitionData_SWIGUpcast(Dali::Toolkit::TransitionData *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_TransitionData_SWIGUpcast(Dali::Toolkit::TransitionData *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::CustomActorImpl * SWIGSTDCALL CSharp_NUI_ViewImpl_SWIGUpcast(Dali::Toolkit::Internal::Control *jarg1) {
+SWIGEXPORT Dali::CustomActorImpl * SWIGSTDCALL CSharp_Dali_ViewImpl_SWIGUpcast(Dali::Toolkit::Internal::Control *jarg1) {
     return (Dali::CustomActorImpl *)jarg1;
 }
 
-SWIGEXPORT Dali::CustomActor * SWIGSTDCALL CSharp_NUI_View_SWIGUpcast(Dali::Toolkit::Control *jarg1) {
+SWIGEXPORT Dali::CustomActor * SWIGSTDCALL CSharp_Dali_View_SWIGUpcast(Dali::Toolkit::Control *jarg1) {
     return (Dali::CustomActor *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_KeyInputFocusManager_SWIGUpcast(Dali::Toolkit::KeyInputFocusManager *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_KeyInputFocusManager_SWIGUpcast(Dali::Toolkit::KeyInputFocusManager *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_Alignment_SWIGUpcast(Dali::Toolkit::Alignment *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Alignment_SWIGUpcast(Dali::Toolkit::Alignment *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_Button_SWIGUpcast(Dali::Toolkit::Button *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Button_SWIGUpcast(Dali::Toolkit::Button *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Button * SWIGSTDCALL CSharp_NUI_CheckBoxButton_SWIGUpcast(Dali::Toolkit::CheckBoxButton *jarg1) {
+SWIGEXPORT Dali::Toolkit::Button * SWIGSTDCALL CSharp_Dali_CheckBoxButton_SWIGUpcast(Dali::Toolkit::CheckBoxButton *jarg1) {
     return (Dali::Toolkit::Button *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Button * SWIGSTDCALL CSharp_NUI_PushButton_SWIGUpcast(Dali::Toolkit::PushButton *jarg1) {
+SWIGEXPORT Dali::Toolkit::Button * SWIGSTDCALL CSharp_Dali_PushButton_SWIGUpcast(Dali::Toolkit::PushButton *jarg1) {
     return (Dali::Toolkit::Button *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Button * SWIGSTDCALL CSharp_NUI_RadioButton_SWIGUpcast(Dali::Toolkit::RadioButton *jarg1) {
+SWIGEXPORT Dali::Toolkit::Button * SWIGSTDCALL CSharp_Dali_RadioButton_SWIGUpcast(Dali::Toolkit::RadioButton *jarg1) {
     return (Dali::Toolkit::Button *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_FlexContainer_SWIGUpcast(Dali::Toolkit::FlexContainer *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_FlexContainer_SWIGUpcast(Dali::Toolkit::FlexContainer *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_ImageView_SWIGUpcast(Dali::Toolkit::ImageView *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_ImageView_SWIGUpcast(Dali::Toolkit::ImageView *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_Model3dView_SWIGUpcast(Dali::Toolkit::Model3dView *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Model3dView_SWIGUpcast(Dali::Toolkit::Model3dView *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_ScrollBar_SWIGUpcast(Dali::Toolkit::ScrollBar *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_ScrollBar_SWIGUpcast(Dali::Toolkit::ScrollBar *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_Scrollable_SWIGUpcast(Dali::Toolkit::Scrollable *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Scrollable_SWIGUpcast(Dali::Toolkit::Scrollable *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_NUI_ItemLayout_SWIGUpcast(Dali::Toolkit::ItemLayout *jarg1) {
+SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_ItemLayout_SWIGUpcast(Dali::Toolkit::ItemLayout *jarg1) {
     return (Dali::RefObject *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Scrollable * SWIGSTDCALL CSharp_NUI_ItemView_SWIGUpcast(Dali::Toolkit::ItemView *jarg1) {
+SWIGEXPORT Dali::Toolkit::Scrollable * SWIGSTDCALL CSharp_Dali_ItemView_SWIGUpcast(Dali::Toolkit::ItemView *jarg1) {
     return (Dali::Toolkit::Scrollable *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_ScrollViewEffect_SWIGUpcast(Dali::Toolkit::ScrollViewEffect *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_ScrollViewEffect_SWIGUpcast(Dali::Toolkit::ScrollViewEffect *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::ScrollViewEffect * SWIGSTDCALL CSharp_NUI_ScrollViewPagePathEffect_SWIGUpcast(Dali::Toolkit::ScrollViewPagePathEffect *jarg1) {
+SWIGEXPORT Dali::Toolkit::ScrollViewEffect * SWIGSTDCALL CSharp_Dali_ScrollViewPagePathEffect_SWIGUpcast(Dali::Toolkit::ScrollViewPagePathEffect *jarg1) {
     return (Dali::Toolkit::ScrollViewEffect *)jarg1;
 }
 
-SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_NUI_Ruler_SWIGUpcast(Dali::Toolkit::Ruler *jarg1) {
+SWIGEXPORT Dali::RefObject * SWIGSTDCALL CSharp_Dali_Ruler_SWIGUpcast(Dali::Toolkit::Ruler *jarg1) {
     return (Dali::RefObject *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Ruler * SWIGSTDCALL CSharp_NUI_DefaultRuler_SWIGUpcast(Dali::Toolkit::DefaultRuler *jarg1) {
+SWIGEXPORT Dali::Toolkit::Ruler * SWIGSTDCALL CSharp_Dali_DefaultRuler_SWIGUpcast(Dali::Toolkit::DefaultRuler *jarg1) {
     return (Dali::Toolkit::Ruler *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Ruler * SWIGSTDCALL CSharp_NUI_FixedRuler_SWIGUpcast(Dali::Toolkit::FixedRuler *jarg1) {
+SWIGEXPORT Dali::Toolkit::Ruler * SWIGSTDCALL CSharp_Dali_FixedRuler_SWIGUpcast(Dali::Toolkit::FixedRuler *jarg1) {
     return (Dali::Toolkit::Ruler *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Scrollable * SWIGSTDCALL CSharp_NUI_ScrollView_SWIGUpcast(Dali::Toolkit::ScrollView *jarg1) {
+SWIGEXPORT Dali::Toolkit::Scrollable * SWIGSTDCALL CSharp_Dali_ScrollView_SWIGUpcast(Dali::Toolkit::ScrollView *jarg1) {
     return (Dali::Toolkit::Scrollable *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_TableView_SWIGUpcast(Dali::Toolkit::TableView *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_TableView_SWIGUpcast(Dali::Toolkit::TableView *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_TextEditor_SWIGUpcast(Dali::Toolkit::TextEditor *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_TextEditor_SWIGUpcast(Dali::Toolkit::TextEditor *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_TextField_SWIGUpcast(Dali::Toolkit::TextField *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_TextField_SWIGUpcast(Dali::Toolkit::TextField *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_TextLabel_SWIGUpcast(Dali::Toolkit::TextLabel *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_TextLabel_SWIGUpcast(Dali::Toolkit::TextLabel *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_AccessibilityManager_SWIGUpcast(Dali::Toolkit::AccessibilityManager *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_AccessibilityManager_SWIGUpcast(Dali::Toolkit::AccessibilityManager *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_StyleManager_SWIGUpcast(Dali::Toolkit::StyleManager *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_StyleManager_SWIGUpcast(Dali::Toolkit::StyleManager *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_Slider_SWIGUpcast(Dali::Toolkit::Slider *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Slider_SWIGUpcast(Dali::Toolkit::Slider *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_VideoView_SWIGUpcast(Dali::Toolkit::VideoView *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_VideoView_SWIGUpcast(Dali::Toolkit::VideoView *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_Popup_SWIGUpcast(Dali::Toolkit::Popup *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_Popup_SWIGUpcast(Dali::Toolkit::Popup *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_ProgressBar_SWIGUpcast(Dali::Toolkit::ProgressBar *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_ProgressBar_SWIGUpcast(Dali::Toolkit::ProgressBar *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_GaussianBlurView_SWIGUpcast(Dali::Toolkit::GaussianBlurView *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_GaussianBlurView_SWIGUpcast(Dali::Toolkit::GaussianBlurView *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_NUI_PageTurnView_SWIGUpcast(Dali::Toolkit::PageTurnView *jarg1) {
+SWIGEXPORT Dali::Toolkit::Control * SWIGSTDCALL CSharp_Dali_PageTurnView_SWIGUpcast(Dali::Toolkit::PageTurnView *jarg1) {
     return (Dali::Toolkit::Control *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::PageTurnView * SWIGSTDCALL CSharp_NUI_PageTurnLandscapeView_SWIGUpcast(Dali::Toolkit::PageTurnLandscapeView *jarg1) {
+SWIGEXPORT Dali::Toolkit::PageTurnView * SWIGSTDCALL CSharp_Dali_PageTurnLandscapeView_SWIGUpcast(Dali::Toolkit::PageTurnLandscapeView *jarg1) {
     return (Dali::Toolkit::PageTurnView *)jarg1;
 }
 
-SWIGEXPORT Dali::Toolkit::PageTurnView * SWIGSTDCALL CSharp_NUI_PageTurnPortraitView_SWIGUpcast(Dali::Toolkit::PageTurnPortraitView *jarg1) {
+SWIGEXPORT Dali::Toolkit::PageTurnView * SWIGSTDCALL CSharp_Dali_PageTurnPortraitView_SWIGUpcast(Dali::Toolkit::PageTurnPortraitView *jarg1) {
     return (Dali::Toolkit::PageTurnView *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_VisualBase_SWIGUpcast(Dali::Toolkit::Visual::Base *jarg1) {
+SWIGEXPORT Dali::Toolkit::Button * SWIGSTDCALL CSharp_Dali_ToggleButton_SWIGUpcast(Dali::Toolkit::ToggleButton *jarg1) {
+    return (Dali::Toolkit::Button *)jarg1;
+}
+
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_VisualBase_SWIGUpcast(Dali::Toolkit::Visual::Base *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_VisualFactory_SWIGUpcast(Dali::Toolkit::VisualFactory *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_VisualFactory_SWIGUpcast(Dali::Toolkit::VisualFactory *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
-SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_NUI_AsyncImageLoader_SWIGUpcast(Dali::Toolkit::AsyncImageLoader *jarg1) {
+SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_AsyncImageLoader_SWIGUpcast(Dali::Toolkit::AsyncImageLoader *jarg1) {
     return (Dali::BaseHandle *)jarg1;
 }
 
diff --git a/dali-csharp-binder/src/dali_wrap.h b/dali-csharp-binder/src/dali_wrap.h
index cab51b3..7775d51 100644
--- a/dali-csharp-binder/src/dali_wrap.h
+++ b/dali-csharp-binder/src/dali_wrap.h
@@ -207,5 +207,27 @@ private:
     void swig_init_callbacks();
 };
 
+class SwigDirector_ItemFactory : public Dali::Toolkit::ItemFactory, public Swig::Director {
+
+public:
+    SwigDirector_ItemFactory();
+    virtual ~SwigDirector_ItemFactory();
+    virtual unsigned int GetNumberOfItems();
+    virtual Dali::Actor NewItem(unsigned int itemId);
+    virtual void ItemReleased(unsigned int itemId, Dali::Actor actor);
+    virtual Dali::Toolkit::ItemFactory::Extension *GetExtension();
+
+    typedef unsigned int (SWIGSTDCALL* SWIG_Callback0_t)();
+    typedef void * (SWIGSTDCALL* SWIG_Callback1_t)(unsigned int);
+    typedef void (SWIGSTDCALL* SWIG_Callback2_t)(unsigned int, void *);
+    void swig_connect_director(SWIG_Callback0_t callbackGetNumberOfItems, SWIG_Callback1_t callbackNewItem, SWIG_Callback2_t callbackItemReleased);
+
+private:
+    SWIG_Callback0_t swig_callbackGetNumberOfItems;
+    SWIG_Callback1_t swig_callbackNewItem;
+    SWIG_Callback2_t swig_callbackItemReleased;
+    void swig_init_callbacks();
+};
+
 
 #endif
diff --git a/dali-csharp-binder/src/devel-property-wrap.cpp b/dali-csharp-binder/src/devel-property-wrap.cpp
new file mode 100644
index 0000000..9f4b387
--- /dev/null
+++ b/dali-csharp-binder/src/devel-property-wrap.cpp
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+#ifndef CSHARP_DEVEL_PROPERTY
+#define CSHARP_DEVEL_PROPERTY
+#endif
+
+#include "common.h"
+
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/scrollable/item-view/item-view-devel.h>
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_BATCH_PARENT_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::DevelActor::Property::BATCH_PARENT;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_SIBLING_ORDER_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::DevelActor::Property::SIBLING_ORDER;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Renderer_Property_BATCHING_ENABLED_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::DevelRenderer::Property::BATCHING_ENABLED;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_TOOLTIP_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelControl::Property::TOOLTIP;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_ItemView_Property_LAYOUT_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelItemView::Property::LAYOUT;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_UNSELECTED_VISUAL_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::UNSELECTED_VISUAL;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_SELECTED_VISUAL_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::SELECTED_VISUAL;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_DISABLED_SELECTED_VISUAL_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_DISABLED_UNSELECTED_VISUAL_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_UNSELECTED_BACKGROUND_VISUAL_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_SELECTED_BACKGROUND_VISUAL_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_DISABLED_UNSELECTED_BACKGROUND_VISUAL_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_DISABLED_SELECTED_BACKGROUND_VISUAL_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_LABEL_RELATIVE_ALIGNMENT_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_LABEL_PADDING_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::LABEL_PADDING;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Button_Property_VISUAL_PADDING_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelButton::Property::VISUAL_PADDING;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Visual_Property_TRANSFORM_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelVisual::Property::TRANSFORM;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Visual_Property_PREMULTIPLIED_ALPHA_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelVisual::Property::PREMULTIPLIED_ALPHA;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_Visual_Property_MIX_COLOR_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelVisual::Property::MIX_COLOR;
+  jresult = (int)result;
+  return jresult;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index e0f9f0e..3b2ae08 100755
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -1,6 +1,6 @@
 Name: dali-csharp-binder
-Version: 1.2.22
-Release: 20170121
+Version: 1.2.25
+Release: 20170214
 Summary: build dali csharp binder
 License: TO_BE_FILLED_IN
 Group: uifw/graphic
-- 
2.7.4