diff --git a/apps/csharp/life/src/life_main.cs b/apps/csharp/life/src/life_main.cs
index a7c67771..3de8d68a 100644
--- a/apps/csharp/life/src/life_main.cs
+++ b/apps/csharp/life/src/life_main.cs
@@ -10,14 +10,14 @@ public class LifeWindow
         lifeRender.RenderLayout((Efl.Ui.Win)sender);
     }
 
-    void QuitEvt(object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args ev)
+    void QuitEvt(object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args ev)
     {
         // quit the mainloop
         if (ev.arg == false)
             Efl.Ui.Config.Exit();
     }
 
-    void TouchEvt(object sender, Efl.Input.InterfacePointerDownEvt_Args ev)
+    void TouchEvt(object sender, Efl.Input.IInterfacePointerDownEvt_Args ev)
     {
         int cellx, celly;
         Efl.Ui.Win win = (Efl.Ui.Win)sender;
@@ -29,7 +29,7 @@ public class LifeWindow
         lifeRender.RenderCell(win, cellx, celly);
     }
 
-    void KeyDownEvt(object sender, Efl.Input.InterfaceKeyDownEvt_Args ev)
+    void KeyDownEvt(object sender, Efl.Input.IInterfaceKeyDownEvt_Args ev)
     {
         Efl.Ui.Win win = (Efl.Ui.Win)sender;
         if (ev.arg.GetKey() == "space")
@@ -43,7 +43,7 @@ public class LifeWindow
         win.SetAutohide(true);
 
         // when the user clicks "close" on a window there is a request to hide
-        ((Efl.Gfx.Entity)win).VisibilityChangedEvt += QuitEvt;
+        ((Efl.Gfx.IEntity)win).VisibilityChangedEvt += QuitEvt;
 
         Eina.Size2D sz;
         sz.W = (int)(10 * LifeBoard.Width * win.GetScale());
@@ -53,9 +53,9 @@ public class LifeWindow
         lifeRender = new LifeRender(win, lifeBoard);
         lifeRender.Refresh(win);
 
-        ((Efl.Gfx.Entity)win).SizeChangedEvt += ResizeEvt;
-        ((Efl.Input.Interface)win).PointerDownEvt += TouchEvt;
-        ((Efl.Input.Interface)win).KeyDownEvt += KeyDownEvt;
+        ((Efl.Gfx.IEntity)win).SizeChangedEvt += ResizeEvt;
+        ((Efl.Input.IInterface)win).PointerDownEvt += TouchEvt;
+        ((Efl.Input.IInterface)win).KeyDownEvt += KeyDownEvt;
 
         win.SetSize(sz);
 
diff --git a/apps/csharp/texteditor/src/texteditor_main.cs b/apps/csharp/texteditor/src/texteditor_main.cs
index f6972451..e0591f13 100644
--- a/apps/csharp/texteditor/src/texteditor_main.cs
+++ b/apps/csharp/texteditor/src/texteditor_main.cs
@@ -32,7 +32,7 @@ public class TextEditor
                                                               "texteditor_example.txt");
 
     // Quits the application
-    private void GUIQuitCb(object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args ea)
+    private void GUIQuitCb(object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args ea)
     {
         if (ea.arg == false)
             Efl.Ui.Config.Exit();
diff --git a/reference/csharp/ui/src/focus_main.cs b/reference/csharp/ui/src/focus_main.cs
index a8d26156..d5948bdf 100644
--- a/reference/csharp/ui/src/focus_main.cs
+++ b/reference/csharp/ui/src/focus_main.cs
@@ -4,7 +4,7 @@ public class Example
 {
     public static void FocusChangedCb(object sender, EventArgs e)
     {
-        Console.WriteLine($"Focus for object {((Efl.Text)sender).GetText()} changed to {((Efl.Ui.Widget)sender).GetFocus()}");
+        Console.WriteLine($"Focus for object {((Efl.IText)sender).GetText()} changed to {((Efl.Ui.Widget)sender).GetFocus()}");
     }
 
 #if WIN32
@@ -20,7 +20,7 @@ public class Example
         win.SetWinType(Efl.Ui.WinType.Basic);
         win.SetText("Focus example");
         win.SetAutohide(true);
-        win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => {
+        win.VisibilityChangedEvt += (object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) => {
             // Exit the EFL main loop
             if (e.arg == false)
                 Efl.Ui.Config.Exit();
diff --git a/reference/csharp/ui/src/ui_container.cs b/reference/csharp/ui/src/ui_container.cs
index 8b611f14..fd1bdf15 100644
--- a/reference/csharp/ui/src/ui_container.cs
+++ b/reference/csharp/ui/src/ui_container.cs
@@ -70,7 +70,7 @@ public class Example
         win.SetWinType(Efl.Ui.WinType.Basic);
         win.SetText("Container demo");
         win.SetAutohide(true);
-        win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => {
+        win.VisibilityChangedEvt += (object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) => {
           // Exit the EFL main loop
           if (e.arg == false)
               Efl.Ui.Config.Exit();
@@ -86,19 +86,19 @@ public class Example
 
         // Create some boxes and set them as the content of the first pane of the container
         var box = CreateBox(win);
-        Efl.ContentConcrete.static_cast(vsplit.GetPart("first")).SetContent(box);
+        Efl.IContentConcrete.static_cast(vsplit.GetPart("first")).SetContent(box);
 
         // Create a second, horizontally-split panes container and set it as the content of
         // the second pane of the first container
         Efl.Ui.Panes hsplit = new Efl.Ui.Panes(win);
         hsplit.SetDirection(Efl.Ui.Dir.Horizontal);
         hsplit.SetSplitRatio(0.85);
-        Efl.ContentConcrete.static_cast(vsplit.GetPart("second")).SetContent(hsplit);
+        Efl.IContentConcrete.static_cast(vsplit.GetPart("second")).SetContent(hsplit);
 
         // Create a table and set it as the content of the first pane of the horizontal
         // container
         var table = CreateTable(win);
-        Efl.ContentConcrete.static_cast(hsplit.GetPart("first")).SetContent(table);
+        Efl.IContentConcrete.static_cast(hsplit.GetPart("first")).SetContent(table);
 
         // Create a button and set it as the content of the second pane of the horizontal
         // container
@@ -109,7 +109,7 @@ public class Example
             // Exit the EFL main loop
             Efl.Ui.Config.Exit();
         };
-        Efl.ContentConcrete.static_cast(hsplit.GetPart("second")).SetContent(quit_btn);
+        Efl.IContentConcrete.static_cast(hsplit.GetPart("second")).SetContent(quit_btn);
 
         // Start the EFL main loop
         Efl.Ui.Config.Run();
diff --git a/reference/csharp/ui/src/ui_sizing.cs b/reference/csharp/ui/src/ui_sizing.cs
index c8cdf901..f84fc4bd 100644
--- a/reference/csharp/ui/src/ui_sizing.cs
+++ b/reference/csharp/ui/src/ui_sizing.cs
@@ -23,7 +23,7 @@ public class Example
         win.SetWinType(Efl.Ui.WinType.Basic);
         win.SetText("Size Control");
         win.SetAutohide(true);
-        win.VisibilityChangedEvt += (object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e) => {
+        win.VisibilityChangedEvt += (object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e) => {
             // Exit the EFL main loop
             if (e.arg == false)
                 Efl.Ui.Config.Exit();
diff --git a/tutorial/csharp/hello-gui/src/gui_main.cs b/tutorial/csharp/hello-gui/src/gui_main.cs
index f27b8ac2..28ce619f 100644
--- a/tutorial/csharp/hello-gui/src/gui_main.cs
+++ b/tutorial/csharp/hello-gui/src/gui_main.cs
@@ -3,7 +3,7 @@ using System;
 public class Example
 {
     // Callback to quit the application
-    public static void QuitCb(object sender, Efl.Gfx.EntityVisibilityChangedEvt_Args e)
+    public static void QuitCb(object sender, Efl.Gfx.IEntityVisibilityChangedEvt_Args e)
     {
         // Exit the EFL main loop
         if (e.arg == false)