Eo (base class): Fix .eo file to have proper namespacing for the class naem.

42 files changed, 96 insertions, 96 deletions

diff --git a/src/examples/eolian_cxx/colourable.eo b/src/examples/eolian_cxx/colourable.eo
index 22bd59e4dc..9a28aac27e 100644
--- a/src/examples/eolian_cxx/colourable.eo
+++ b/src/examples/eolian_cxx/colourable.eo
@@ -1,4 +1,4 @@
-class Colourable (Eo_Base)
+class Colourable (Eo.Base)
 {
     /*@ Colourable class. */
     legacy_prefix: legacy;
diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo
index a50600b044..cf5642d9fd 100644
--- a/src/lib/ecore/ecore_animator.eo
+++ b/src/lib/ecore/ecore_animator.eo
@@ -1,4 +1,4 @@
-class Ecore_Animator (Eo_Base)
+class Ecore_Animator (Eo.Base)
 {
    eo_prefix: ecore_animator;
    constructors {
@@ -19,9 +19,9 @@ class Ecore_Animator (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
-      Eo_Base.event_freeze;
-      Eo_Base.event_thaw;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Eo.Base.event_freeze;
+      Eo.Base.event_thaw;
    }
 }
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_idle_enterer.eo b/src/lib/ecore/ecore_idle_enterer.eo
index 80ea36dc1b..b938f87402 100644
--- a/src/lib/ecore/ecore_idle_enterer.eo
+++ b/src/lib/ecore/ecore_idle_enterer.eo
@@ -1,4 +1,4 @@
-class Ecore_Idle_Enterer (Eo_Base)
+class Ecore_Idle_Enterer (Eo.Base)
 {
    eo_prefix: ecore_idle_enterer;
    constructors {
@@ -18,7 +18,7 @@ class Ecore_Idle_Enterer (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
    }
 }
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_idle_exiter.eo b/src/lib/ecore/ecore_idle_exiter.eo
index b463b7ea14..a54de0def2 100644
--- a/src/lib/ecore/ecore_idle_exiter.eo
+++ b/src/lib/ecore/ecore_idle_exiter.eo
@@ -1,4 +1,4 @@
-class Ecore_Idle_Exiter (Eo_Base)
+class Ecore_Idle_Exiter (Eo.Base)
 {
    eo_prefix: ecore_idle_exiter;
    constructors {
@@ -11,7 +11,7 @@ class Ecore_Idle_Exiter (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
    }
 }
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_idler.eo b/src/lib/ecore/ecore_idler.eo
index 87f85a27d1..e81c8efbe3 100644
--- a/src/lib/ecore/ecore_idler.eo
+++ b/src/lib/ecore/ecore_idler.eo
@@ -1,4 +1,4 @@
-class Ecore_Idler (Eo_Base)
+class Ecore_Idler (Eo.Base)
 {
    eo_prefix: ecore_idler;
    constructors {
@@ -11,7 +11,7 @@ class Ecore_Idler (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
    }
 }
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_job.eo b/src/lib/ecore/ecore_job.eo
index cf4a120513..aa524ffca8 100644
--- a/src/lib/ecore/ecore_job.eo
+++ b/src/lib/ecore/ecore_job.eo
@@ -1,4 +1,4 @@
-class Ecore_Job (Eo_Base)
+class Ecore_Job (Eo.Base)
 {
    eo_prefix: ecore_job;
    constructors {
@@ -11,7 +11,7 @@ class Ecore_Job (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
    }
 }
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_parent.eo b/src/lib/ecore/ecore_parent.eo
index 0809b514ac..3faf761273 100644
--- a/src/lib/ecore/ecore_parent.eo
+++ b/src/lib/ecore/ecore_parent.eo
@@ -1,4 +1,4 @@
-class Ecore_Parent (Eo_Base)
+class Ecore_Parent (Eo.Base)
 {
    data: null;
 }
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_poll.eo b/src/lib/ecore/ecore_poll.eo
index 003a0c0bea..fe754f1081 100644
--- a/src/lib/ecore/ecore_poll.eo
+++ b/src/lib/ecore/ecore_poll.eo
@@ -1,4 +1,4 @@
-class Ecore_Poller (Eo_Base)
+class Ecore_Poller (Eo.Base)
 {
    eo_prefix: ecore_poller;
    constructors {
@@ -38,7 +38,7 @@ class Ecore_Poller (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
    }
 }
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_timer.eo b/src/lib/ecore/ecore_timer.eo
index f55880aeb1..a5ebabca9b 100644
--- a/src/lib/ecore/ecore_timer.eo
+++ b/src/lib/ecore/ecore_timer.eo
@@ -1,4 +1,4 @@
-class Ecore_Timer (Eo_Base)
+class Ecore_Timer (Eo.Base)
 {
    /*@ Timers are objects that will call a given callback at some point
     *  in the future. They may also optionall repeat themselves if the
@@ -58,10 +58,10 @@ class Ecore_Timer (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
-      Eo_Base.event_freeze;
-      Eo_Base.event_freeze_count.get;
-      Eo_Base.event_thaw;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Eo.Base.event_freeze;
+      Eo.Base.event_freeze_count.get;
+      Eo.Base.event_thaw;
    }
 }
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index 3c00e9f0e9..fcc3289d50 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -1,4 +1,4 @@
-class Ecore_Audio (Eo_Base)
+class Ecore_Audio (Eo.Base)
 {
    legacy_prefix: null;
    eo_prefix: ecore_audio_obj;
@@ -115,7 +115,7 @@ class Ecore_Audio (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
+      Eo.Base.constructor;
       virtual.source.get;
       virtual.source.set;
       virtual.format.get;
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index f5fe573925..71e774da1e 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -173,8 +173,8 @@ class Ecore_Audio_In (Ecore_Audio)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Ecore_Audio.vio_set;
       virtual.preloaded.get;
       virtual.preloaded.set;
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
index db337b9271..e64237b457 100644
--- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -2,8 +2,8 @@ class Ecore_Audio_In_Sndfile (Ecore_Audio_In)
 {
    eo_prefix: ecore_audio_obj_in_sndfile;
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Ecore_Audio.source.set;
       Ecore_Audio.source.get;
       Ecore_Audio.format.set;
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo
index 496aef2a4a..e0cfebfb68 100644
--- a/src/lib/ecore_audio/ecore_audio_in_tone.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -2,9 +2,9 @@ class Ecore_Audio_In_Tone (Ecore_Audio_In)
 {
    eo_prefix: ecore_audio_obj_in_tone;
    implements {
-      Eo_Base.constructor;
-      Eo_Base.key_data_set;
-      Eo_Base.key_data_get;
+      Eo.Base.constructor;
+      Eo.Base.key_data_set;
+      Eo.Base.key_data_get;
       Ecore_Audio_In.length.set;
       Ecore_Audio_In.seek;
       Ecore_Audio_In.read_internal;
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo
index bfb8045202..f8621e4903 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -33,8 +33,8 @@ class Ecore_Audio_Out (Ecore_Audio)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Ecore_Audio.vio_set;
    }
 }
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index a542d6143f..22375c9761 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -2,8 +2,8 @@ class Ecore_Audio_Out_Pulse (Ecore_Audio_Out)
 {
    eo_prefix: ecore_audio_obj_out_pulse;
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Ecore_Audio.volume.set;
       Ecore_Audio_Out.input_attach;
       Ecore_Audio_Out.input_detach;
diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
index 9e7553d5f9..5f7efc52a6 100644
--- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
@@ -2,8 +2,8 @@ class Ecore_Audio_Out_Sndfile (Ecore_Audio_Out)
 {
    eo_prefix: ecore_audio_obj_out_sndfile;
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Ecore_Audio.source.get;
       Ecore_Audio.source.set;
       Ecore_Audio.format.get;
diff --git a/src/lib/edje/edje.eo b/src/lib/edje/edje.eo
index b45b683cad..d466c16a03 100644
--- a/src/lib/edje/edje.eo
+++ b/src/lib/edje/edje.eo
@@ -2493,9 +2493,9 @@ class Edje (Evas_Smart_Clipped)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
-      Eo_Base.dbg_info_get;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Eo.Base.dbg_info_get;
       Evas_Object_Smart.hide;
       Evas_Object_Smart.calculate;
       Evas_Object_Smart.show;
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index 8dcdde0418..e7b6b74a2d 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -2,8 +2,8 @@ class Edje_Edit (Edje)
 {
    data: Edje_Edit;
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_Object_Smart.del;
       Edje.file.set;
    }
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index a7849a1789..bbeaa05812 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -1,4 +1,4 @@
-abstract Eo_Base ()
+abstract Eo.Base ()
 {
    eo_prefix: eo;
    legacy_prefix: null;
diff --git a/src/lib/evas/canvas/evas.eo b/src/lib/evas/canvas/evas.eo
index 8335a6e918..2241c204f9 100644
--- a/src/lib/evas/canvas/evas.eo
+++ b/src/lib/evas/canvas/evas.eo
@@ -1,4 +1,4 @@
-class Evas (Eo_Base, Evas_Common_Interface)
+class Evas (Eo.Base, Evas_Common_Interface)
 {
    eo_prefix: evas_canvas;
    data: Evas_Public_Data;
@@ -1772,8 +1772,8 @@ class Evas (Eo_Base, Evas_Common_Interface)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_Common_Interface.evas.get;
    }
 
diff --git a/src/lib/evas/canvas/evas_3d_camera.eo b/src/lib/evas/canvas/evas_3d_camera.eo
index ad3db0e75c..8c608a92d5 100644
--- a/src/lib/evas/canvas/evas_3d_camera.eo
+++ b/src/lib/evas/canvas/evas_3d_camera.eo
@@ -100,8 +100,8 @@ class Evas_3D_Camera (Evas_3D_Object, Evas_Common_Interface)
    }
 
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_3D_Object.update_notify;
       Evas_3D_Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_3d_light.eo b/src/lib/evas/canvas/evas_3d_light.eo
index 1eaa682af6..6ef1eb9946 100644
--- a/src/lib/evas/canvas/evas_3d_light.eo
+++ b/src/lib/evas/canvas/evas_3d_light.eo
@@ -256,8 +256,8 @@ class Evas_3D_Light (Evas_3D_Object, Evas_Common_Interface)
    }
 
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_3D_Object.update_notify;
       Evas_3D_Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_3d_material.eo b/src/lib/evas/canvas/evas_3d_material.eo
index 232cc315ac..bd3839022f 100644
--- a/src/lib/evas/canvas/evas_3d_material.eo
+++ b/src/lib/evas/canvas/evas_3d_material.eo
@@ -148,8 +148,8 @@ class Evas_3D_Material (Evas_3D_Object, Evas_Common_Interface)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_3D_Object.update_notify;
       Evas_3D_Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo b/src/lib/evas/canvas/evas_3d_mesh.eo
index 923d93a4ec..cea87f23ee 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_3d_mesh.eo
@@ -396,8 +396,8 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface)
 
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_3D_Object.update_notify;
       Evas_3D_Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_3d_node.eo b/src/lib/evas/canvas/evas_3d_node.eo
index a02186bd9a..328e06963a 100644
--- a/src/lib/evas/canvas/evas_3d_node.eo
+++ b/src/lib/evas/canvas/evas_3d_node.eo
@@ -585,8 +585,8 @@ class Evas_3D_Node (Evas_3D_Object, Evas_Common_Interface)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_3D_Object.update_notify;
       Evas_3D_Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_3d_object.eo b/src/lib/evas/canvas/evas_3d_object.eo
index 4a2d30bac4..20a70d726c 100644
--- a/src/lib/evas/canvas/evas_3d_object.eo
+++ b/src/lib/evas/canvas/evas_3d_object.eo
@@ -1,4 +1,4 @@
-class Evas_3D_Object (Eo_Base, Evas_Common_Interface)
+class Evas_3D_Object (Eo.Base, Evas_Common_Interface)
 {
    legacy_prefix: null;
    data: Evas_3D_Object_Data;
@@ -65,7 +65,7 @@ class Evas_3D_Object (Eo_Base, Evas_Common_Interface)
    }
 
    implements {
-      Eo_Base.constructor;
+      Eo.Base.constructor;
       Evas_Common_Interface.evas.get;
       virtual.update_notify;
       virtual.change_notify;
diff --git a/src/lib/evas/canvas/evas_3d_scene.eo b/src/lib/evas/canvas/evas_3d_scene.eo
index 05f5dd9626..66f48c45df 100644
--- a/src/lib/evas/canvas/evas_3d_scene.eo
+++ b/src/lib/evas/canvas/evas_3d_scene.eo
@@ -165,8 +165,8 @@ class Evas_3D_Scene (Evas_3D_Object, Evas_Common_Interface)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_3D_Object.update_notify;
       Evas_3D_Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_3d_texture.eo b/src/lib/evas/canvas/evas_3d_texture.eo
index 7b82722d4b..390a33d882 100644
--- a/src/lib/evas/canvas/evas_3d_texture.eo
+++ b/src/lib/evas/canvas/evas_3d_texture.eo
@@ -191,8 +191,8 @@ class Evas_3D_Texture (Evas_3D_Object, Evas_Common_Interface)
    }
 
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
       Evas_3D_Object.update_notify;
       Evas_3D_Object.change_notify;
    }
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 04cae39e9a..fc840b4188 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -726,7 +726,7 @@ class Evas_Box (Evas_Smart_Clipped)
    }
    implements {
       class.constructor;
-      Eo_Base.constructor;
+      Eo.Base.constructor;
       Evas_Object.smart_data.get;
       Evas_Object_Smart.calculate;
       Evas_Object_Smart.add;
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 507cc3c21a..b8e46dc07a 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -150,6 +150,6 @@ class Evas_Grid (Evas_Smart_Clipped)
       }
    }
    implements {
-      Eo_Base.constructor;
+      Eo.Base.constructor;
    }
 }
diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo
index a689cbd047..098654a017 100644
--- a/src/lib/evas/canvas/evas_image.eo
+++ b/src/lib/evas/canvas/evas_image.eo
@@ -1244,8 +1244,8 @@ class Evas_Image (Evas_Object)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
-      Eo_Base.dbg_info_get;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Eo.Base.dbg_info_get;
    }
 }
diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo
index 77482dd8dd..af525b5fca 100644
--- a/src/lib/evas/canvas/evas_line.eo
+++ b/src/lib/evas/canvas/evas_line.eo
@@ -24,7 +24,7 @@ class Evas_Line (Evas_Object)
       }
    }
    implements {
-      Eo_Base.constructor;
+      Eo.Base.constructor;
    }
 
 }
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 8cdeb24c49..c8e09624dc 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -1,4 +1,4 @@
-abstract Evas_Object (Eo_Base, Evas_Common_Interface)
+abstract Evas_Object (Eo.Base, Evas_Common_Interface)
 {
    eo_prefix: evas_obj;
    data: Evas_Object_Protected_Data;
@@ -1511,9 +1511,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
-      Eo_Base.dbg_info_get;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Eo.Base.dbg_info_get;
       Evas_Common_Interface.evas.get;
    }
    events {
diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo
index 8ca9ef9f6a..e5562369f3 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -353,7 +353,7 @@ class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface)
    implements {
       class.constructor;
       class.destructor;
-      Eo_Base.constructor;
+      Eo.Base.constructor;
       Evas_Object.smart_type_check_ptr;
       Evas_Object.smart_type_check;
       Evas_Object.smart_data.get;
diff --git a/src/lib/evas/canvas/evas_out.eo b/src/lib/evas/canvas/evas_out.eo
index a1e6d8f88f..4fd3821279 100644
--- a/src/lib/evas/canvas/evas_out.eo
+++ b/src/lib/evas/canvas/evas_out.eo
@@ -1,4 +1,4 @@
-class Evas_Out (Eo_Base)
+class Evas_Out (Eo.Base)
 {
    eo_prefix: evas_out;
    legacy_prefix: evas_output;
@@ -31,8 +31,8 @@ class Evas_Out (Eo_Base)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
    }
 
 }
\ No newline at end of file
diff --git a/src/lib/evas/canvas/evas_polygon.eo b/src/lib/evas/canvas/evas_polygon.eo
index d841857628..ee3c40e819 100644
--- a/src/lib/evas/canvas/evas_polygon.eo
+++ b/src/lib/evas/canvas/evas_polygon.eo
@@ -18,8 +18,8 @@ class Evas_Polygon (Evas_Object)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
    }
 
 }
diff --git a/src/lib/evas/canvas/evas_rectangle.eo b/src/lib/evas/canvas/evas_rectangle.eo
index 3999b850b4..281d3b0007 100644
--- a/src/lib/evas/canvas/evas_rectangle.eo
+++ b/src/lib/evas/canvas/evas_rectangle.eo
@@ -3,6 +3,6 @@ class Evas_Rectangle (Evas_Object)
    legacy_prefix: evas_object_rectangle;
    eo_prefix: evas_obj_rectangle;
    implements {
-      Eo_Base.constructor;
+      Eo.Base.constructor;
    }
 }
diff --git a/src/lib/evas/canvas/evas_smart_clipped.eo b/src/lib/evas/canvas/evas_smart_clipped.eo
index 51a53497c5..0efedf4968 100644
--- a/src/lib/evas/canvas/evas_smart_clipped.eo
+++ b/src/lib/evas/canvas/evas_smart_clipped.eo
@@ -5,7 +5,7 @@ class Evas_Smart_Clipped (Evas_Object_Smart)
    data: Evas_Object_Smart_Clipped_Data;
 
    implements {
-      Eo_Base.constructor;
+      Eo.Base.constructor;
       Evas_Object_Smart.hide;
       Evas_Object_Smart.clip.set;
       Evas_Object_Smart.clip_unset;
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 183e535025..a4ae231900 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -240,7 +240,7 @@ class Evas_Table (Evas_Smart_Clipped)
    }
    implements {
       class.constructor; 
-      Eo_Base.constructor;
+      Eo.Base.constructor;
       Evas_Object_Smart.add;
       Evas_Object_Smart.del;
       Evas_Object_Smart.calculate;
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index bb31f1a7ca..d66653db32 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -439,9 +439,9 @@ class Evas_Text (Evas_Object)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
-      Eo_Base.dbg_info_get;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Eo.Base.dbg_info_get;
       Evas_Object.size.set;
    }
 }
diff --git a/src/lib/evas/canvas/evas_textblock.eo b/src/lib/evas/canvas/evas_textblock.eo
index b7882985b5..96f705098b 100644
--- a/src/lib/evas/canvas/evas_textblock.eo
+++ b/src/lib/evas/canvas/evas_textblock.eo
@@ -304,8 +304,8 @@ class Evas_Textblock (Evas_Object)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
-      Eo_Base.dbg_info_get;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Eo.Base.dbg_info_get;
    }
 }
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index d436400a84..f8af72db77 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -276,9 +276,9 @@ class Evas_Textgrid (Evas_Object)
       }
    }
    implements {
-      Eo_Base.constructor;
-      Eo_Base.destructor;
-      Eo_Base.dbg_info_get;
+      Eo.Base.constructor;
+      Eo.Base.destructor;
+      Eo.Base.dbg_info_get;
    }
 
 }