diff --git a/src/lib/evas/canvas/efl_canvas_animation_alpha.eo b/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
index 78e2792619..621e86a707 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-class Efl.Canvas.Animation.Alpha (Efl.Canvas.Animation)
+class Efl.Canvas.Animation_Alpha (Efl.Canvas.Animation)
 {
    [[Efl alpha animation class]]
    eo_prefix: efl_animation_alpha;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group.eo b/src/lib/evas/canvas/efl_canvas_animation_group.eo
index b75afac6ac..1041c21589 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_group.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-abstract Efl.Canvas.Animation.Group (Efl.Canvas.Animation)
+abstract Efl.Canvas.Animation_Group (Efl.Canvas.Animation)
 {
    [[Efl group animation abstract class]]
    eo_prefix: efl_animation_group;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
index b5db2ce634..cabf201ef6 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-class Efl.Canvas.Animation.Group.Parallel (Efl.Canvas.Animation.Group)
+class Efl.Canvas.Animation_Group_Parallel (Efl.Canvas.Animation_Group)
 {
    [[Efl group parallel animation class]]
    eo_prefix: efl_animation_group_parallel;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo b/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo
index 0e02e90d87..468845a9bd 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-class Efl.Canvas.Animation.Group.Sequential (Efl.Canvas.Animation.Group)
+class Efl.Canvas.Animation_Group_Sequential (Efl.Canvas.Animation_Group)
 {
    [[Efl group sequential animation class]]
    data: null;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index 606ec9b2b4..c858ed2566 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-class Efl.Canvas.Animation.Player (Efl.Object, Efl.Player)
+class Efl.Canvas.Animation_Player (Efl.Object, Efl.Player)
 {
    [[Efl animation object class]]
    eo_prefix: efl_animation_player;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_rotate.eo b/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
index d092d2a2ea..a5ff56d907 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-class Efl.Canvas.Animation.Rotate (Efl.Canvas.Animation)
+class Efl.Canvas.Animation_Rotate (Efl.Canvas.Animation)
 {
    [[Efl rotate animation class]]
    eo_prefix: efl_animation_rotate;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale.eo b/src/lib/evas/canvas/efl_canvas_animation_scale.eo
index f3112ed9c3..5a92926b79 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_scale.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_scale.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-class Efl.Canvas.Animation.Scale (Efl.Canvas.Animation)
+class Efl.Canvas.Animation_Scale (Efl.Canvas.Animation)
 {
    [[Efl scale animation class]]
    eo_prefix: efl_animation_scale;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate.eo b/src/lib/evas/canvas/efl_canvas_animation_translate.eo
index a8be5cbe78..29daa14481 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_translate.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_translate.eo
@@ -1,6 +1,6 @@
 import efl_canvas_animation_types;
 
-class Efl.Canvas.Animation.Translate (Efl.Canvas.Animation)
+class Efl.Canvas.Animation_Translate (Efl.Canvas.Animation)
 {
    [[Efl translate animation class]]
    eo_prefix: efl_animation_translate;