diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 3504eb9f51..54b56485f0 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -4482,18 +4482,6 @@ eo_tokenizer_database_fill(const char *filename)
           {
              const char *class = impl->meth_name;
              Eina_Bool virtual_pure = EINA_FALSE;
-             if (!strcmp(class, "Eo_Base::constructor"))
-               {
-                  Eolian_Function foo_id = database_function_new("constructor", DFLT_CONSTRUCTOR);
-                  database_class_function_add(kls->name, foo_id);
-                  continue;
-               }
-             if (!strcmp(class, "Eo_Base::destructor"))
-               {
-                  Eolian_Function foo_id = database_function_new("destructor", DFLT_DESTRUCTOR);
-                  database_class_function_add(kls->name, foo_id);
-                  continue;
-               }
              if (!strcmp(class, "class::constructor"))
                {
                   database_class_ctor_enable_set(kls->name, EINA_TRUE);
diff --git a/src/lib/eolian/eo_lexer.rl b/src/lib/eolian/eo_lexer.rl
index e31e92a87a..bd2d03c7ed 100644
--- a/src/lib/eolian/eo_lexer.rl
+++ b/src/lib/eolian/eo_lexer.rl
@@ -1455,18 +1455,6 @@ eo_tokenizer_database_fill(const char *filename)
           {
              const char *class = impl->meth_name;
              Eina_Bool virtual_pure = EINA_FALSE;
-             if (!strcmp(class, "Eo_Base::constructor"))
-               {
-                  Eolian_Function foo_id = database_function_new("constructor", DFLT_CONSTRUCTOR);
-                  database_class_function_add(kls->name, foo_id);
-                  continue;
-               }
-             if (!strcmp(class, "Eo_Base::destructor"))
-               {
-                  Eolian_Function foo_id = database_function_new("destructor", DFLT_DESTRUCTOR);
-                  database_class_function_add(kls->name, foo_id);
-                  continue;
-               }
              if (!strcmp(class, "class::constructor"))
                {
                   database_class_ctor_enable_set(kls->name, EINA_TRUE);
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index ef270e281d..ed135d4d94 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -150,7 +150,7 @@ evas_new(void)
 }
 
 EOLIAN static void
-_evas_constructor(Eo *eo_obj, Evas_Public_Data *e)
+_evas_eo_base_constructor(Eo *eo_obj, Evas_Public_Data *e)
 {
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
 
@@ -199,7 +199,7 @@ evas_free(Evas *eo_e)
 }
 
 EOLIAN static void
-_evas_destructor(Eo *eo_e, Evas_Public_Data *e)
+_evas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e)
 {
    Eina_Rectangle *r;
    Evas_Coord_Touch_Point *touch_point;
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index c95c3ad8cc..2d5e6c47c2 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -460,7 +460,7 @@ evas_object_box_add(Evas *evas)
 }
 
 EOLIAN static void
-_evas_box_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
+_evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
 {
    eo_do_super(obj, MY_CLASS, eo_constructor());
    eo_do(obj,
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index caf7615e2b..87f21e577f 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -256,7 +256,7 @@ evas_object_grid_add(Evas *evas)
 }
 
 EOLIAN static void
-_evas_grid_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
+_evas_grid_eo_base_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
 {
    eo_do_super(obj, MY_CLASS, eo_constructor());
    eo_do(obj, evas_obj_smart_attach(_evas_object_grid_smart_class_new()));
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index bee8651ea9..a494a6a98f 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -320,7 +320,7 @@ _init_cow(Eo *eo_obj)
 }
 
 EOLIAN static void
-_evas_image_constructor(Eo *eo_obj, Evas_Image_Data *o)
+_evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    Evas *eo_e;
@@ -2557,7 +2557,7 @@ evas_object_image_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_evas_image_destructor(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED)
+_evas_image_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
 
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index a781ef5c94..9157314728 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -217,7 +217,7 @@ evas_object_line_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_evas_line_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSED)
+_evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj;
    Evas_Line_Data *o;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 18ec09dd04..18ab16c253 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -63,7 +63,7 @@ _init_cow(void)
 }
 
 EOLIAN static void
-_evas_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
+_evas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
 {
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
    eo_do(eo_obj, evas_obj_type_set(MY_CLASS_NAME));
@@ -610,7 +610,7 @@ evas_object_del(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_evas_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
+_evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
 {
    MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
    return;
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index cb1c92c086..2c6d0bdc8b 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -105,7 +105,7 @@ evas_object_polygon_add(Evas *e)
 }
 
 EOLIAN static void
-_evas_polygon_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA_UNUSED)
+_evas_polygon_eo_base_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj;
    Eo *parent;
@@ -280,7 +280,7 @@ evas_object_polygon_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_evas_polygon_destructor(Eo *eo_obj, Evas_Polygon_Data *_pd EINA_UNUSED)
+_evas_polygon_eo_base_destructor(Eo *eo_obj, Evas_Polygon_Data *_pd EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
 
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index 477a2dcd50..8714fc35f0 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -93,7 +93,7 @@ evas_object_rectangle_add(Evas *e)
 }
 
 EOLIAN static void
-_evas_rectangle_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data EINA_UNUSED)
+_evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data EINA_UNUSED)
 {
    Eo *parent;
 
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index b34fb0f82c..2a2aeb2869 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -543,7 +543,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
 }
 
 EOLIAN static void
-_evas_smart_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED)
+_evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj;
    Evas_Smart_Data *smart;
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 2cf5b194ba..7b828e903a 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -251,7 +251,7 @@ evas_object_smart_clipped_class_get(void)
 }
 
 EOLIAN static void
-_evas_smart_clipped_constructor(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *class_data EINA_UNUSED)
+_evas_smart_clipped_eo_base_constructor(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *class_data EINA_UNUSED)
 {
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
 }
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index b64a0bb0c4..920dda29bf 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -955,7 +955,7 @@ evas_object_table_add(Evas *evas)
 }
 
 EOLIAN static void
-_evas_table_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
+_evas_table_eo_base_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
 {
    eo_do_super(obj, MY_CLASS, eo_constructor());
    eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 4017b1473d..169ab3e2d7 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -378,7 +378,7 @@ evas_object_text_add(Evas *e)
 }
 
 EOLIAN static void
-_evas_text_constructor(Eo *eo_obj, Evas_Text_Data *class_data EINA_UNUSED)
+_evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *class_data EINA_UNUSED)
 {
    eo_do_super(eo_obj, MY_CLASS, eo_constructor());
    evas_object_text_init(eo_obj);
@@ -1521,7 +1521,7 @@ evas_object_text_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_evas_text_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
+_evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    evas_object_text_free(eo_obj, obj);
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index de9885c9fb..16367dfac9 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -5494,7 +5494,7 @@ evas_object_textblock_add(Evas *e)
 }
 
 EOLIAN static void
-_evas_textblock_constructor(Eo *eo_obj, Evas_Textblock_Data *class_data EINA_UNUSED)
+_evas_textblock_eo_base_constructor(Eo *eo_obj, Evas_Textblock_Data *class_data EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    Evas_Textblock_Data *o;
@@ -10553,7 +10553,7 @@ evas_object_textblock_init(Evas_Object *eo_obj)
 }
 
 EOLIAN static void
-_evas_textblock_destructor(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED)
+_evas_textblock_eo_base_destructor(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED)
 {
    evas_object_textblock_free(eo_obj);
    eo_do_super(eo_obj, MY_CLASS, eo_destructor());
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index fe6d0e2572..6870b60d6c 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -474,7 +474,7 @@ evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 }
 
 EOLIAN static void
-_evas_textgrid_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED)
+_evas_textgrid_eo_base_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    evas_object_textgrid_free(eo_obj, obj);
@@ -1063,7 +1063,7 @@ evas_object_textgrid_add(Evas *e)
 }
 
 EOLIAN static void
-_evas_textgrid_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED)
+_evas_textgrid_eo_base_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED)
 {
    Eo *eo_parent;
 
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 4724529d41..314ced98da 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -27,7 +27,7 @@ evas_out_add(Evas *e)
 }
 
 EOLIAN static void
-_evas_out_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
+_evas_out_eo_base_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
 {
    Eo *eo_parent;
    Evas_Public_Data *e;
@@ -52,7 +52,7 @@ evas_output_del(Evas_Out *evo)
 }
 
 EOLIAN static void
-_evas_out_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
+_evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
 {
    Eo *eo_parent;
    Evas_Public_Data *e;