diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
index 421774a8cb..89b255cb47 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Surface.Tbm (Efl.Object, Efl.Canvas.Surface)
+class Efl.Canvas.Surface_Tbm (Efl.Object, Efl.Canvas.Surface)
 {
    [[Native Tizen Buffer Manager surface for Efl canvas]]
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
index 59cd2a89d1..e5e80140f7 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Surface.Wayland (Efl.Object, Efl.Canvas.Surface)
+class Efl.Canvas.Surface_Wayland (Efl.Object, Efl.Canvas.Surface)
 {
    [[Native Wayland surface for Efl canvas]]
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
index 2da2e39044..6f4744d123 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
@@ -1,11 +1,11 @@
-struct Efl.Canvas.Surface.X11_Pixmap
+struct Efl.Canvas.Surface_X11_Pixmap
 {
    [[The type used by @Efl.Canvas.Surface.native_buffer.]]
    visual: void_ptr; [[X11 Visual for this Pixmap.]]
    pixmap: ulong;  [[X11 Pixmap ID.]]
 }
 
-class Efl.Canvas.Surface.X11 (Efl.Object, Efl.Canvas.Surface)
+class Efl.Canvas.Surface_X11 (Efl.Object, Efl.Canvas.Surface)
 {
    [[Native X11 surface for Efl canvas]]