diff --git a/src/lib/ector/ector_renderer_gradient_linear.eo b/src/lib/ector/ector_renderer_gradient_linear.eo
index bf26dce9db..d147faec2b 100644
--- a/src/lib/ector/ector_renderer_gradient_linear.eo
+++ b/src/lib/ector/ector_renderer_gradient_linear.eo
@@ -1,9 +1,9 @@
-mixin Ector.Renderer.Gradient.Linear (Efl.Gfx.Gradient.Linear)
+mixin Ector.Renderer.Gradient.Linear (Efl.Gfx.Gradient_Linear)
 {
    [[Ector gradient linear renderer mixin]]
    eo_prefix: ector_renderer_gradient_linear;
    implements {
-      Efl.Gfx.Gradient.Linear.start { get; set; }
-      Efl.Gfx.Gradient.Linear.end { get; set; }
+      Efl.Gfx.Gradient_Linear.start { get; set; }
+      Efl.Gfx.Gradient_Linear.end { get; set; }
    }
 }
diff --git a/src/lib/ector/ector_renderer_gradient_radial.eo b/src/lib/ector/ector_renderer_gradient_radial.eo
index ae6ffe05fb..c2c8542871 100644
--- a/src/lib/ector/ector_renderer_gradient_radial.eo
+++ b/src/lib/ector/ector_renderer_gradient_radial.eo
@@ -1,10 +1,10 @@
-mixin Ector.Renderer.Gradient.Radial (Efl.Gfx.Gradient.Radial)
+mixin Ector.Renderer.Gradient.Radial (Efl.Gfx.Gradient_Radial)
 {
    [[Ector gradient radial renderer mixin]]
    eo_prefix: ector_renderer_gradient_radial;
    implements {
-      Efl.Gfx.Gradient.Radial.center { get; set; }
-      Efl.Gfx.Gradient.Radial.radius { get; set; }
-      Efl.Gfx.Gradient.Radial.focal { get; set; }
+      Efl.Gfx.Gradient_Radial.center { get; set; }
+      Efl.Gfx.Gradient_Radial.radius { get; set; }
+      Efl.Gfx.Gradient_Radial.focal { get; set; }
    }
 }
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
index b416929e76..b0e7936d1f 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Gradient.Linear (Efl.Gfx.Gradient)
+interface Efl.Gfx.Gradient_Linear (Efl.Gfx.Gradient)
 {
    [[Efl graphics gradient linear interface]]
    methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo b/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
index 40a0bf273e..dbf38c6a37 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Gradient.Radial (Efl.Gfx.Gradient)
+interface Efl.Gfx.Gradient_Radial (Efl.Gfx.Gradient)
 {
    [[Efl graphics gradient radial interface]]
    methods {
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
index 97b60e75a4..3dab9b4907 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
@@ -1,10 +1,10 @@
-class Efl.Canvas.Vg.Gradient_Linear (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient.Linear)
+class Efl.Canvas.Vg.Gradient_Linear (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient_Linear)
 {
    [[Efl vector graphics gradient linear class]]
    legacy_prefix: evas_vg_gradient_linear;
    implements {
-      Efl.Gfx.Gradient.Linear.start { get; set; }
-      Efl.Gfx.Gradient.Linear.end { get; set; }
+      Efl.Gfx.Gradient_Linear.start { get; set; }
+      Efl.Gfx.Gradient_Linear.end { get; set; }
       Efl.Gfx.Path.interpolate;
       Efl.Duplicate.duplicate;
       Efl.Gfx.Path.bounds_get;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
index 0e7af1afab..de631edf83 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
@@ -1,11 +1,11 @@
-class Efl.Canvas.Vg.Gradient_Radial (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient.Radial)
+class Efl.Canvas.Vg.Gradient_Radial (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient_Radial)
 {
    [[Efl vector graphics gradient radial class]]
    legacy_prefix: evas_vg_gradient_radial;
    implements {
-      Efl.Gfx.Gradient.Radial.center { get; set; }
-      Efl.Gfx.Gradient.Radial.radius { get; set; }
-      Efl.Gfx.Gradient.Radial.focal { get; set; }
+      Efl.Gfx.Gradient_Radial.center { get; set; }
+      Efl.Gfx.Gradient_Radial.radius { get; set; }
+      Efl.Gfx.Gradient_Radial.focal { get; set; }
       Efl.Gfx.Path.bounds_get;
       Efl.Gfx.Path.interpolate;
       Efl.Duplicate.duplicate;