Eo_Class is no more, RIPdevs/jeyzu/eo--Eo_Class

 ack 'Eo_Class ' -l | xargs sed -i -e 's/Eo_Class /Eo /g'

145 files changed, 157 insertions, 157 deletions

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index f9e42c842..a44b7ad27 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1515,7 +1515,7 @@ _dismiss(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elc_ctxpopup_eo.h b/src/lib/elc_ctxpopup_eo.h
index a26d1919f..6f14a189d 100644
--- a/src/lib/elc_ctxpopup_eo.h
+++ b/src/lib/elc_ctxpopup_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_CTXPOPUP_CLASS elm_obj_ctxpopup_class_get()
 
-const Eo_Class *elm_obj_ctxpopup_class_get(void) EINA_CONST;
+const Eo *elm_obj_ctxpopup_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_CTXPOPUP_BASE_ID;
 
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index c2d1f649d..f15ccc35c 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -1545,7 +1545,7 @@ _elm_fileselector_smart_text_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    unsigned int i;
 
@@ -1599,7 +1599,7 @@ _class_constructor(Eo_Class *klass)
 }
 
 static void
-_class_destructor(Eo_Class *klass EINA_UNUSED)
+_class_destructor(Eo *klass EINA_UNUSED)
 {
    unsigned int i;
 
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index e2182badd..c17d97745 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -503,7 +503,7 @@ _inwin_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elc_fileselector_button_eo.h b/src/lib/elc_fileselector_button_eo.h
index bfa8d25d6..07885d058 100644
--- a/src/lib/elc_fileselector_button_eo.h
+++ b/src/lib/elc_fileselector_button_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_FILESELECTOR_BUTTON_CLASS elm_obj_fileselector_button_class_get()
 
-const Eo_Class *elm_obj_fileselector_button_class_get(void) EINA_CONST;
+const Eo *elm_obj_fileselector_button_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_FILESELECTOR_BUTTON_BASE_ID;
 
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index abdf7e59d..6f4b8cb3b 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -718,7 +718,7 @@ _inwin_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elc_fileselector_entry_eo.h b/src/lib/elc_fileselector_entry_eo.h
index 459e07a0c..943e364da 100644
--- a/src/lib/elc_fileselector_entry_eo.h
+++ b/src/lib/elc_fileselector_entry_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_FILESELECTOR_ENTRY_CLASS elm_obj_fileselector_entry_class_get()
 
-const Eo_Class *elm_obj_fileselector_entry_class_get(void) EINA_CONST;
+const Eo *elm_obj_fileselector_entry_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_FILESELECTOR_ENTRY_BASE_ID;
 
diff --git a/src/lib/elc_fileselector_eo.h b/src/lib/elc_fileselector_eo.h
index 72fbedf4f..41282ee77 100644
--- a/src/lib/elc_fileselector_eo.h
+++ b/src/lib/elc_fileselector_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_FILESELECTOR_CLASS elm_obj_fileselector_class_get()
 
-const Eo_Class *elm_obj_fileselector_class_get(void) EINA_CONST;
+const Eo *elm_obj_fileselector_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_FILESELECTOR_BASE_ID;
 
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index cc640a197..0ea690b29 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -553,7 +553,7 @@ elm_hoversel_item_icon_get(const Elm_Object_Item *it,
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elc_hoversel_eo.h b/src/lib/elc_hoversel_eo.h
index 548941632..510ad44c4 100644
--- a/src/lib/elc_hoversel_eo.h
+++ b/src/lib/elc_hoversel_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_HOVERSEL_CLASS elm_obj_hoversel_class_get()
 
-const Eo_Class *elm_obj_hoversel_class_get(void) EINA_CONST;
+const Eo *elm_obj_hoversel_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_HOVERSEL_BASE_ID;
 
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index b09c712c0..b8e33490b 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -2106,7 +2106,7 @@ _item_filter_remove(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elc_multibuttonentry_eo.h b/src/lib/elc_multibuttonentry_eo.h
index 8813548dd..f4734870d 100644
--- a/src/lib/elc_multibuttonentry_eo.h
+++ b/src/lib/elc_multibuttonentry_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_MULTIBUTTONENTRY_CLASS elm_obj_multibuttonentry_class_get()
 
-const Eo_Class *elm_obj_multibuttonentry_class_get(void) EINA_CONST;
+const Eo *elm_obj_multibuttonentry_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_MULTIBUTTONENTRY_BASE_ID;
 
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 95aab57db..87bbbd8b3 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -2073,7 +2073,7 @@ _elm_naviframe_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_U
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elc_naviframe_eo.h b/src/lib/elc_naviframe_eo.h
index 4f327ff57..8e35232ad 100644
--- a/src/lib/elc_naviframe_eo.h
+++ b/src/lib/elc_naviframe_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_NAVIFRAME_CLASS elm_obj_naviframe_class_get()
 
-const Eo_Class *elm_obj_naviframe_class_get(void) EINA_CONST;
+const Eo *elm_obj_naviframe_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_NAVIFRAME_BASE_ID;
 
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 2f52ed986..78fbe4ea5 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -733,7 +733,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
 
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 767b32ce5..b8256adc7 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -1877,7 +1877,7 @@ _item_append(Eo *obj, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elc_popup_eo.h b/src/lib/elc_popup_eo.h
index 6d0910937..e5b3ad35a 100644
--- a/src/lib/elc_popup_eo.h
+++ b/src/lib/elc_popup_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_POPUP_CLASS elm_obj_popup_class_get()
 
-const Eo_Class *elm_obj_popup_class_get(void) EINA_CONST;
+const Eo *elm_obj_popup_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_POPUP_BASE_ID;
 
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 6623e346e..012985bc7 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -1413,7 +1413,7 @@ elm_access_highlight_next_set(Evas_Object *obj, Elm_Highlight_Direction dir, Eva
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_access.h b/src/lib/elm_access.h
index 8125b369b..a77798473 100644
--- a/src/lib/elm_access.h
+++ b/src/lib/elm_access.h
@@ -8,7 +8,7 @@
 
 #define ELM_OBJ_ACCESS_CLASS elm_obj_access_class_get()
 
-const Eo_Class *elm_obj_access_class_get(void) EINA_CONST;
+const Eo *elm_obj_access_class_get(void) EINA_CONST;
 
 enum _Elm_Access_Info_Type
 {
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 42c94c70e..58fcd3581 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -620,7 +620,7 @@ _elm_actionslider_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_p
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_actionslider_eo.h b/src/lib/elm_actionslider_eo.h
index 90d19df7f..3da549256 100644
--- a/src/lib/elm_actionslider_eo.h
+++ b/src/lib/elm_actionslider_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_ACTIONSLIDER_CLASS elm_obj_actionslider_class_get()
 
-const Eo_Class *elm_obj_actionslider_class_get(void) EINA_CONST;
+const Eo *elm_obj_actionslider_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_ACTIONSLIDER_BASE_ID;
 
diff --git a/src/lib/elm_app_client.c b/src/lib/elm_app_client.c
index dc4f557cb..36e53d3f2 100644
--- a/src/lib/elm_app_client.c
+++ b/src/lib/elm_app_client.c
@@ -376,7 +376,7 @@ _destructor(Eo *eo, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
       EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_app_client_eo.h b/src/lib/elm_app_client_eo.h
index dae6dd8e0..7d68dee71 100644
--- a/src/lib/elm_app_client_eo.h
+++ b/src/lib/elm_app_client_eo.h
@@ -1,6 +1,6 @@
 #define ELM_APP_CLIENT_CLASS elm_app_client_class_get()
 
-const Eo_Class *elm_app_client_class_get(void) EINA_CONST;
+const Eo *elm_app_client_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_APP_CLIENT_BASE_ID;
 
diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c
index 2b8880cc9..5f93aa97b 100644
--- a/src/lib/elm_app_client_view.c
+++ b/src/lib/elm_app_client_view.c
@@ -359,7 +359,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
       EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_app_client_view_eo.h b/src/lib/elm_app_client_view_eo.h
index add28996f..d58dbcb4f 100644
--- a/src/lib/elm_app_client_view_eo.h
+++ b/src/lib/elm_app_client_view_eo.h
@@ -1,6 +1,6 @@
 #define ELM_APP_CLIENT_VIEW_CLASS elm_app_client_view_class_get()
 
-const Eo_Class *elm_app_client_view_class_get(void) EINA_CONST;
+const Eo *elm_app_client_view_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_APP_CLIENT_VIEW_BASE_ID;
 
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index 1fff5b7ed..758093779 100644
--- a/src/lib/elm_app_server.c
+++ b/src/lib/elm_app_server.c
@@ -488,7 +488,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
       EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_app_server_eo.h b/src/lib/elm_app_server_eo.h
index d474f108d..e39250064 100644
--- a/src/lib/elm_app_server_eo.h
+++ b/src/lib/elm_app_server_eo.h
@@ -1,6 +1,6 @@
 #define ELM_APP_SERVER_CLASS elm_app_server_class_get()
 
-const Eo_Class *elm_app_server_class_get(void) EINA_CONST;
+const Eo *elm_app_server_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_APP_SERVER_BASE_ID;
 
diff --git a/src/lib/elm_app_server_view.c b/src/lib/elm_app_server_view.c
index e734540bf..d126982a0 100644
--- a/src/lib/elm_app_server_view.c
+++ b/src/lib/elm_app_server_view.c
@@ -435,7 +435,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
       EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_app_server_view_eo.h b/src/lib/elm_app_server_view_eo.h
index 48ec32ed5..8a1715500 100644
--- a/src/lib/elm_app_server_view_eo.h
+++ b/src/lib/elm_app_server_view_eo.h
@@ -1,6 +1,6 @@
 #define ELM_APP_SERVER_VIEW_CLASS elm_app_server_view_class_get()
 
-const Eo_Class *elm_app_server_view_class_get(void) EINA_CONST;
+const Eo *elm_app_server_view_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_APP_SERVER_VIEW_BASE_ID;
 
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index ae63607e0..1a9b51c08 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -377,7 +377,7 @@ _load_size_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_bg_eo.h b/src/lib/elm_bg_eo.h
index ca0ebd4c4..7666bf749 100644
--- a/src/lib/elm_bg_eo.h
+++ b/src/lib/elm_bg_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_BG_CLASS elm_obj_bg_class_get()
 
-const Eo_Class *elm_obj_bg_class_get(void) EINA_CONST;
+const Eo *elm_obj_bg_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_BG_BASE_ID;
 
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 1c2b01f0f..0575205f3 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -912,7 +912,7 @@ _recalculate(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_box_eo.h b/src/lib/elm_box_eo.h
index 5111b296e..c08314943 100644
--- a/src/lib/elm_box_eo.h
+++ b/src/lib/elm_box_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_BOX_CLASS elm_obj_box_class_get()
 
-const Eo_Class *elm_obj_box_class_get(void) EINA_CONST;
+const Eo *elm_obj_box_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_BOX_BASE_ID;
 
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 70169bf98..d294094ab 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -331,7 +331,7 @@ _elm_bubble_smart_content_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_bubble_eo.h b/src/lib/elm_bubble_eo.h
index 5063ed6ea..6d0d4b25d 100644
--- a/src/lib/elm_bubble_eo.h
+++ b/src/lib/elm_bubble_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_BUBBLE_CLASS elm_obj_bubble_class_get()
 
-const Eo_Class *elm_obj_bubble_class_get(void) EINA_CONST;
+const Eo *elm_obj_bubble_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_BUBBLE_BASE_ID;
 
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 2f8d879f1..718ef4df5 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -506,7 +506,7 @@ _elm_button_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_button_eo.h b/src/lib/elm_button_eo.h
index 341750a57..65869ad7d 100644
--- a/src/lib/elm_button_eo.h
+++ b/src/lib/elm_button_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_BUTTON_CLASS elm_obj_button_class_get()
 
-const Eo_Class *elm_obj_button_class_get(void) EINA_CONST;
+const Eo *elm_obj_button_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_BUTTON_BASE_ID;
 
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 00741b6d0..9091ba31c 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1652,7 +1652,7 @@ _displayed_time_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_calendar_eo.h b/src/lib/elm_calendar_eo.h
index db29c39e5..4757ef2d5 100644
--- a/src/lib/elm_calendar_eo.h
+++ b/src/lib/elm_calendar_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_CALENDAR_CLASS elm_obj_calendar_class_get()
 
-const Eo_Class *elm_obj_calendar_class_get(void) EINA_CONST;
+const Eo *elm_obj_calendar_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_CALENDAR_BASE_ID;
 
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 26384aa8e..55507b8b4 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -443,7 +443,7 @@ _elm_check_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_check_eo.h b/src/lib/elm_check_eo.h
index ab4bda086..d03a94a84 100644
--- a/src/lib/elm_check_eo.h
+++ b/src/lib/elm_check_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_CHECK_CLASS elm_obj_check_class_get()
 
-const Eo_Class *elm_obj_check_class_get(void) EINA_CONST;
+const Eo *elm_obj_check_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_CHECK_BASE_ID;
 
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 442403881..7226452c2 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -1086,7 +1086,7 @@ _elm_clock_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_clock_eo.h b/src/lib/elm_clock_eo.h
index 653c1253b..d02689508 100644
--- a/src/lib/elm_clock_eo.h
+++ b/src/lib/elm_clock_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_CLOCK_CLASS elm_obj_clock_class_get()
 
-const Eo_Class *elm_obj_clock_class_get(void) EINA_CONST;
+const Eo *elm_obj_clock_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_CLOCK_BASE_ID;
 
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 1c1d9b542..0f95b4633 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -2166,7 +2166,7 @@ _palette_name_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
 
diff --git a/src/lib/elm_colorselector_eo.h b/src/lib/elm_colorselector_eo.h
index 93ddc4ce3..2f186b142 100644
--- a/src/lib/elm_colorselector_eo.h
+++ b/src/lib/elm_colorselector_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_COLORSELECTOR_CLASS elm_obj_colorselector_class_get()
 
-const Eo_Class *elm_obj_colorselector_class_get(void) EINA_CONST;
+const Eo *elm_obj_colorselector_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_COLORSELECTOR_BASE_ID;
 
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 3dd61bc02..4dde10283 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -1003,7 +1003,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_conform_eo.h b/src/lib/elm_conform_eo.h
index 0a7aa170d..fbbda8311 100644
--- a/src/lib/elm_conform_eo.h
+++ b/src/lib/elm_conform_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_CONFORMANT_CLASS elm_obj_conformant_class_get()
 
-const Eo_Class *elm_obj_conformant_class_get(void) EINA_CONST;
+const Eo *elm_obj_conformant_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_CONFORMANT_BASE_ID;
 
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 6517588db..84a3e97b4 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -1236,7 +1236,7 @@ _value_max_set(Eo *obj, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_datetime_eo.h b/src/lib/elm_datetime_eo.h
index 93168b437..a0cee4788 100644
--- a/src/lib/elm_datetime_eo.h
+++ b/src/lib/elm_datetime_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_DATETIME_CLASS elm_obj_datetime_class_get()
 
-const Eo_Class *elm_obj_datetime_class_get(void) EINA_CONST;
+const Eo *elm_obj_datetime_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_DATETIME_BASE_ID;
 
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 2e9fdb0d0..75fb2bdc9 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -724,7 +724,7 @@ _elm_dayselector_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_dayselector_eo.h b/src/lib/elm_dayselector_eo.h
index 9bcce9912..aa903e1b7 100644
--- a/src/lib/elm_dayselector_eo.h
+++ b/src/lib/elm_dayselector_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_DAYSELECTOR_CLASS elm_obj_dayselector_class_get()
 
-const Eo_Class *elm_obj_dayselector_class_get(void) EINA_CONST;
+const Eo *elm_obj_dayselector_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_DAYSELECTOR_BASE_ID;
 
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index a2c8656eb..2df2a7eca 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -1974,7 +1974,7 @@ _display_item_num_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_diskselector_eo.h b/src/lib/elm_diskselector_eo.h
index 7cfacd46b..03292791e 100644
--- a/src/lib/elm_diskselector_eo.h
+++ b/src/lib/elm_diskselector_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_DISKSELECTOR_CLASS elm_obj_diskselector_class_get()
 
-const Eo_Class *elm_obj_diskselector_class_get(void) EINA_CONST;
+const Eo *elm_obj_diskselector_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_DISKSELECTOR_BASE_ID;
 
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 5a3e8a796..82e8dd44d 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -5479,7 +5479,7 @@ _elm_entry_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_entry_eo.h b/src/lib/elm_entry_eo.h
index 8ecf86b6c..db93e2d60 100644
--- a/src/lib/elm_entry_eo.h
+++ b/src/lib/elm_entry_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_ENTRY_CLASS elm_obj_entry_class_get()
 
-const Eo_Class *elm_obj_entry_class_get(void) EINA_CONST;
+const Eo *elm_obj_entry_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_ENTRY_BASE_ID;
 
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index a6a662305..b29d63437 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -2215,7 +2215,7 @@ _interaction_direction_hitsize_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_flip_eo.h b/src/lib/elm_flip_eo.h
index 1e17a62f5..cabdcb3e5 100644
--- a/src/lib/elm_flip_eo.h
+++ b/src/lib/elm_flip_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_FLIP_CLASS elm_obj_flip_class_get()
 
-const Eo_Class *elm_obj_flip_class_get(void) EINA_CONST;
+const Eo *elm_obj_flip_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_FLIP_BASE_ID;
 
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index ddd930f51..6414c38a1 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -992,7 +992,7 @@ _elm_flipselector_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_p
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_flipselector_eo.h b/src/lib/elm_flipselector_eo.h
index d9526c5e7..b25cb4847 100644
--- a/src/lib/elm_flipselector_eo.h
+++ b/src/lib/elm_flipselector_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_FLIPSELECTOR_CLASS elm_obj_flipselector_class_get()
 
-const Eo_Class *elm_obj_flipselector_class_get(void) EINA_CONST;
+const Eo *elm_obj_flipselector_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_FLIPSELECTOR_BASE_ID;
 
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index f9feb379a..bc851c20f 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -329,7 +329,7 @@ _collapse_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_frame_eo.h b/src/lib/elm_frame_eo.h
index 24133563d..1346ce1db 100644
--- a/src/lib/elm_frame_eo.h
+++ b/src/lib/elm_frame_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_FRAME_CLASS elm_obj_frame_class_get()
 
-const Eo_Class *elm_obj_frame_class_get(void) EINA_CONST;
+const Eo *elm_obj_frame_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_FRAME_BASE_ID;
 
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index cd7d61fe3..eb814ff6b 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1459,7 +1459,7 @@ _elm_gengrid_pan_smart_pos_min_get(Eo *obj, void *_pd, va_list *list)
 }
 
 static void
-_gengrid_pan_class_constructor(Eo_Class *klass)
+_gengrid_pan_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _elm_gengrid_pan_destructor),
@@ -4039,7 +4039,7 @@ elm_gengrid_nth_item_get(const Evas_Object *obj, unsigned int nth)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_gengrid_eo.h b/src/lib/elm_gengrid_eo.h
index 94f0dc671..e9e4020d3 100644
--- a/src/lib/elm_gengrid_eo.h
+++ b/src/lib/elm_gengrid_eo.h
@@ -5,11 +5,11 @@
  */
 #define ELM_OBJ_GENGRID_PAN_CLASS elm_obj_gengrid_pan_class_get()
 
-const Eo_Class *elm_obj_gengrid_pan_class_get(void) EINA_CONST;
+const Eo *elm_obj_gengrid_pan_class_get(void) EINA_CONST;
 
 #define ELM_OBJ_GENGRID_CLASS elm_obj_gengrid_class_get()
 
-const Eo_Class *elm_obj_gengrid_class_get(void) EINA_CONST;
+const Eo *elm_obj_gengrid_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_GENGRID_BASE_ID;
 
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index bf24d98ab..2ba82e4fb 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2249,7 +2249,7 @@ _elm_genlist_pan_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_genlist_pan_class_constructor(Eo_Class *klass)
+_genlist_pan_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _elm_genlist_pan_destructor),
@@ -7446,7 +7446,7 @@ elm_genlist_nth_item_get(const Evas_Object *obj, unsigned int nth)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_genlist_eo.h b/src/lib/elm_genlist_eo.h
index d25bafca1..63a6f62ad 100644
--- a/src/lib/elm_genlist_eo.h
+++ b/src/lib/elm_genlist_eo.h
@@ -5,11 +5,11 @@
  */
 #define ELM_OBJ_GENLIST_PAN_CLASS elm_obj_genlist_pan_class_get()
 
-const Eo_Class *elm_obj_genlist_pan_class_get(void) EINA_CONST;
+const Eo *elm_obj_genlist_pan_class_get(void) EINA_CONST;
 
 #define ELM_OBJ_GENLIST_CLASS elm_obj_genlist_class_get()
 
-const Eo_Class *elm_obj_genlist_class_get(void) EINA_CONST;
+const Eo *elm_obj_genlist_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_GENLIST_BASE_ID;
 
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 4adbb03ba..8a2149c8a 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -4313,7 +4313,7 @@ _tap_finger_size_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_gesture_layer_eo.h b/src/lib/elm_gesture_layer_eo.h
index fa7cbfbba..ccfa6b154 100644
--- a/src/lib/elm_gesture_layer_eo.h
+++ b/src/lib/elm_gesture_layer_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_GESTURE_LAYER_CLASS elm_obj_gesture_layer_class_get()
 
-const Eo_Class *elm_obj_gesture_layer_class_get(void) EINA_CONST;
+const Eo *elm_obj_gesture_layer_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_GESTURE_LAYER_BASE_ID;
 
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 91bebc93d..5de6d6ec6 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -565,7 +565,7 @@ _changed_set(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_glview_eo.h b/src/lib/elm_glview_eo.h
index 5d6653e2f..d0f28ed99 100644
--- a/src/lib/elm_glview_eo.h
+++ b/src/lib/elm_glview_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_GLVIEW_CLASS elm_obj_glview_class_get()
 
-const Eo_Class *elm_obj_glview_class_get(void) EINA_CONST;
+const Eo *elm_obj_glview_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_GLVIEW_BASE_ID;
 
diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c
index 80bb446ec..535c19e8c 100644
--- a/src/lib/elm_grid.c
+++ b/src/lib/elm_grid.c
@@ -350,7 +350,7 @@ _children_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_grid_eo.h b/src/lib/elm_grid_eo.h
index 853dda210..7eb72f9d8 100644
--- a/src/lib/elm_grid_eo.h
+++ b/src/lib/elm_grid_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_GRID_CLASS elm_obj_grid_class_get()
 
-const Eo_Class *elm_obj_grid_class_get(void) EINA_CONST;
+const Eo *elm_obj_grid_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_GRID_BASE_ID;
 
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 55453c08a..a96abf947 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -842,7 +842,7 @@ _elm_hover_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_hover_eo.h b/src/lib/elm_hover_eo.h
index 782f5258e..76a32af33 100644
--- a/src/lib/elm_hover_eo.h
+++ b/src/lib/elm_hover_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_HOVER_CLASS elm_obj_hover_class_get()
 
-const Eo_Class *elm_obj_hover_class_get(void) EINA_CONST;
+const Eo *elm_obj_hover_class_get(void) EINA_CONST;
 
  extern EAPI Eo_Op ELM_OBJ_HOVER_BASE_ID;
 
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index d203e07c5..909fceb9b 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -1116,7 +1116,7 @@ elm_icon_aspect_fixed_get(const Evas_Object *obj)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_icon_eo.h b/src/lib/elm_icon_eo.h
index 02d077b6d..fc140338d 100644
--- a/src/lib/elm_icon_eo.h
+++ b/src/lib/elm_icon_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_ICON_CLASS elm_obj_icon_class_get()
 
-const Eo_Class *elm_obj_icon_class_get(void) EINA_CONST;
+const Eo *elm_obj_icon_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_ICON_BASE_ID;
 
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index a826a78bc..f80285fdb 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -1654,7 +1654,7 @@ _elm_image_smart_animated_play_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_image_eo.h b/src/lib/elm_image_eo.h
index d34f320c3..86f992df7 100644
--- a/src/lib/elm_image_eo.h
+++ b/src/lib/elm_image_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_IMAGE_CLASS elm_obj_image_class_get()
 
-const Eo_Class *elm_obj_image_class_get(void) EINA_CONST;
+const Eo *elm_obj_image_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_IMAGE_BASE_ID;
 
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index c302929dd..4199dc3d0 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -1751,7 +1751,7 @@ _omit_enabled_get(Eo *obj __UNUSED__, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_index_eo.h b/src/lib/elm_index_eo.h
index 768c5f950..1834f05ef 100644
--- a/src/lib/elm_index_eo.h
+++ b/src/lib/elm_index_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_INDEX_CLASS elm_obj_index_class_get()
 
-const Eo_Class *elm_obj_index_class_get(void) EINA_CONST;
+const Eo *elm_obj_index_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_INDEX_BASE_ID;
 
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index f891d56c1..f44b58f0e 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -330,7 +330,7 @@ end:
 }
 
 static void
-_elm_pan_class_constructor(Eo_Class *klass)
+_elm_pan_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
@@ -4575,7 +4575,7 @@ _elm_scroll_interface_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list
 }
 
 static void
-_elm_scrollable_interface_constructor(Eo_Class *klass)
+_elm_scrollable_interface_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _elm_scroll_interface_constructor),
diff --git a/src/lib/elm_interface_scrollable.h b/src/lib/elm_interface_scrollable.h
index 98fa9b565..93cabfaf6 100644
--- a/src/lib/elm_interface_scrollable.h
+++ b/src/lib/elm_interface_scrollable.h
@@ -32,7 +32,7 @@
  */
 
 #define ELM_OBJ_PAN_CLASS elm_obj_pan_eo_class_get()
-const Eo_Class *elm_obj_pan_eo_class_get(void) EINA_CONST;
+const Eo *elm_obj_pan_eo_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PAN_BASE_ID;
 
@@ -143,7 +143,7 @@ enum
 
 #define ELM_SCROLLABLE_INTERFACE elm_scrollable_interface_get()
 
-const Eo_Class *elm_scrollable_interface_get(void) EINA_CONST;
+const Eo *elm_scrollable_interface_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_SCROLLABLE_INTERFACE_BASE_ID;
 
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index 1c9b5bfe9..fda1e0ef1 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -173,7 +173,7 @@ elm_win_inwin_content_unset(Evas_Object *obj)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_inwin_eo.h b/src/lib/elm_inwin_eo.h
index 5ebee8cb7..e384e10f0 100644
--- a/src/lib/elm_inwin_eo.h
+++ b/src/lib/elm_inwin_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_WIN_INWIN_CLASS elm_obj_win_inwin_class_get()
 
-const Eo_Class *elm_obj_win_inwin_class_get(void) EINA_CONST;
+const Eo *elm_obj_win_inwin_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_WIN_INWIN_BASE_ID;
 
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index b6bf1f7a0..f8c84b4dc 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -725,7 +725,7 @@ _elm_label_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_label_eo.h b/src/lib/elm_label_eo.h
index f79cb95f5..70a705992 100644
--- a/src/lib/elm_label_eo.h
+++ b/src/lib/elm_label_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_LABEL_CLASS elm_obj_label_class_get()
 
-const Eo_Class *elm_obj_label_class_get(void) EINA_CONST;
+const Eo *elm_obj_label_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_LABEL_BASE_ID;
 
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 453b6d018..59aac0b4a 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -2184,7 +2184,7 @@ _constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_layout_eo.h b/src/lib/elm_layout_eo.h
index bbacde2ad..0df455ed1 100644
--- a/src/lib/elm_layout_eo.h
+++ b/src/lib/elm_layout_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_LAYOUT_CLASS elm_obj_layout_class_get()
 
- const Eo_Class *elm_obj_layout_class_get(void) EINA_CONST;
+ const Eo *elm_obj_layout_class_get(void) EINA_CONST;
 
  extern EAPI Eo_Op ELM_OBJ_LAYOUT_BASE_ID;
 
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 3c8c3140a..fbfd3b488 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2678,7 +2678,7 @@ _focus_on_selection_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_list_eo.h b/src/lib/elm_list_eo.h
index 91bbf76e9..3434e0730 100644
--- a/src/lib/elm_list_eo.h
+++ b/src/lib/elm_list_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_LIST_CLASS elm_obj_list_class_get()
 
- const Eo_Class *elm_obj_list_class_get(void) EINA_CONST;
+ const Eo *elm_obj_list_class_get(void) EINA_CONST;
 
  extern EAPI Eo_Op ELM_OBJ_LIST_BASE_ID;
 
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index aa82c32a8..c66d4f786 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -3836,7 +3836,7 @@ _elm_map_pan_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_elm_map_pan_class_constructor(Eo_Class *klass)
+_elm_map_pan_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _elm_map_pan_destructor),
@@ -6499,7 +6499,7 @@ _track_remove(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_map_eo.h b/src/lib/elm_map_eo.h
index f547a9179..1b0748e0d 100644
--- a/src/lib/elm_map_eo.h
+++ b/src/lib/elm_map_eo.h
@@ -1,10 +1,10 @@
 #define ELM_OBJ_MAP_PAN_CLASS elm_obj_map_pan_class_get()
 
-const Eo_Class *elm_obj_map_pan_class_get(void) EINA_CONST;
+const Eo *elm_obj_map_pan_class_get(void) EINA_CONST;
 
 #define ELM_OBJ_MAP_CLASS elm_obj_map_class_get()
 
-const Eo_Class *elm_obj_map_class_get(void) EINA_CONST;
+const Eo *elm_obj_map_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_MAP_BASE_ID;
 
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index 07b3c0e77..7015e175f 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -548,7 +548,7 @@ _auto_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_mapbuf_eo.h b/src/lib/elm_mapbuf_eo.h
index 9602e5721..25cbecd9a 100644
--- a/src/lib/elm_mapbuf_eo.h
+++ b/src/lib/elm_mapbuf_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_MAPBUF_CLASS elm_obj_mapbuf_class_get()
 
-const Eo_Class *elm_obj_mapbuf_class_get(void) EINA_CONST;
+const Eo *elm_obj_mapbuf_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_MAPBUF_BASE_ID;
 
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index bdb002460..ceccf111b 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -1276,7 +1276,7 @@ _selected_item_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_menu_eo.h b/src/lib/elm_menu_eo.h
index e6c8a77e1..b9e6f97d5 100644
--- a/src/lib/elm_menu_eo.h
+++ b/src/lib/elm_menu_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_MENU_CLASS elm_obj_menu_class_get()
 
-const Eo_Class *elm_obj_menu_class_get(void) EINA_CONST;
+const Eo *elm_obj_menu_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_MENU_BASE_ID;
 
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 26fb7933c..8dab2ae13 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -797,7 +797,7 @@ _align_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_notify_eo.h b/src/lib/elm_notify_eo.h
index d0f83896e..88664f410 100644
--- a/src/lib/elm_notify_eo.h
+++ b/src/lib/elm_notify_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_NOTIFY_CLASS elm_obj_notify_class_get()
 
-const Eo_Class *elm_obj_notify_class_get(void) EINA_CONST;
+const Eo *elm_obj_notify_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_NOTIFY_BASE_ID;
 
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 13f4051ab..6d856abe5 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -543,7 +543,7 @@ _toggle(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_panel_eo.h b/src/lib/elm_panel_eo.h
index 6963d6042..de32d743b 100644
--- a/src/lib/elm_panel_eo.h
+++ b/src/lib/elm_panel_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_PANEL_CLASS elm_obj_panel_class_get()
 
-const Eo_Class *elm_obj_panel_class_get(void) EINA_CONST;
+const Eo *elm_obj_panel_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID;
 
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 040bd5eff..bdfe3daa4 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -481,7 +481,7 @@ _elm_panes_smart_content_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED,
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_panes_eo.h b/src/lib/elm_panes_eo.h
index 1b69edec5..a20a5965e 100644
--- a/src/lib/elm_panes_eo.h
+++ b/src/lib/elm_panes_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_PANES_CLASS elm_obj_panes_class_get()
 
-const Eo_Class *elm_obj_panes_class_get(void) EINA_CONST;
+const Eo *elm_obj_panes_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PANES_BASE_ID;
 
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index ae507d7a5..e23f8f4da 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -501,7 +501,7 @@ _aspect_fixed_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_photo_eo.h b/src/lib/elm_photo_eo.h
index 35e9c6136..7850630ea 100644
--- a/src/lib/elm_photo_eo.h
+++ b/src/lib/elm_photo_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_PHOTO_CLASS elm_obj_photo_class_get()
 
-const Eo_Class *elm_obj_photo_class_get(void) EINA_CONST;
+const Eo *elm_obj_photo_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PHOTO_BASE_ID;
 
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 2a59dcda6..3a5186614 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -432,7 +432,7 @@ _elm_photocam_pan_destructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 }
 
 static void
-_photocam_pan_class_constructor(Eo_Class *klass)
+_photocam_pan_class_constructor(Eo *klass)
 {
       const Eo_Op_Func_Description func_desc[] = {
            EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _elm_photocam_pan_destructor),
@@ -2312,7 +2312,7 @@ _gesture_enabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_photocam_eo.h b/src/lib/elm_photocam_eo.h
index 477408c99..cd63c9d31 100644
--- a/src/lib/elm_photocam_eo.h
+++ b/src/lib/elm_photocam_eo.h
@@ -1,10 +1,10 @@
 #define ELM_OBJ_PHOTOCAM_PAN_CLASS elm_obj_photocam_pan_class_get()
 
-const Eo_Class *elm_obj_photocam_pan_class_get(void) EINA_CONST;
+const Eo *elm_obj_photocam_pan_class_get(void) EINA_CONST;
 
 #define ELM_OBJ_PHOTOCAM_CLASS elm_obj_photocam_class_get()
 
-const Eo_Class *elm_obj_photocam_class_get(void) EINA_CONST;
+const Eo *elm_obj_photocam_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PHOTOCAM_BASE_ID;
 
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index 7ae0ef178..489022bae 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -190,7 +190,7 @@ _connect(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_plug_eo.h b/src/lib/elm_plug_eo.h
index 6ea12b2c5..63d161498 100644
--- a/src/lib/elm_plug_eo.h
+++ b/src/lib/elm_plug_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_PLUG_CLASS elm_obj_plug_class_get()
 
-const Eo_Class *elm_obj_plug_class_get(void) EINA_CONST;
+const Eo *elm_obj_plug_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PLUG_BASE_ID;
 
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index b8bd9daf0..e86bd0b7c 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -2165,7 +2165,7 @@ _elm_prefs_shutdown(void)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_prefs_eo.h b/src/lib/elm_prefs_eo.h
index 7605f3bf1..aa0202290 100644
--- a/src/lib/elm_prefs_eo.h
+++ b/src/lib/elm_prefs_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_PREFS_CLASS elm_obj_prefs_class_get()
 
-const Eo_Class *elm_obj_prefs_class_get(void) EINA_CONST;
+const Eo *elm_obj_prefs_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PREFS_BASE_ID;
 
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index ef702d827..d678bd493 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -753,7 +753,7 @@ _elm_progressbar_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_progressbar_eo.h b/src/lib/elm_progressbar_eo.h
index 7cfa6eb44..a9515d81d 100644
--- a/src/lib/elm_progressbar_eo.h
+++ b/src/lib/elm_progressbar_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_PROGRESSBAR_CLASS elm_obj_progressbar_class_get()
 
-const Eo_Class *elm_obj_progressbar_class_get(void) EINA_CONST;
+const Eo *elm_obj_progressbar_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PROGRESSBAR_BASE_ID;
 
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index d29543ad2..6a644efef 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -538,7 +538,7 @@ _elm_radio_smart_activate(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_radio_eo.h b/src/lib/elm_radio_eo.h
index c007d2f8b..a737c15f8 100644
--- a/src/lib/elm_radio_eo.h
+++ b/src/lib/elm_radio_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_RADIO_CLASS elm_obj_radio_class_get()
 
-const Eo_Class *elm_obj_radio_class_get(void) EINA_CONST;
+const Eo *elm_obj_radio_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_RADIO_BASE_ID;
 
diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c
index 2599489cd..fc8704c86 100644
--- a/src/lib/elm_route.c
+++ b/src/lib/elm_route.c
@@ -312,7 +312,7 @@ _latitude_min_max_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_route_eo.h b/src/lib/elm_route_eo.h
index aa4cd3f21..044520e93 100644
--- a/src/lib/elm_route_eo.h
+++ b/src/lib/elm_route_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_ROUTE_CLASS elm_obj_route_class_get()
 
-const Eo_Class *elm_obj_route_class_get(void) EINA_CONST;
+const Eo *elm_obj_route_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_ROUTE_BASE_ID;
 
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index f1b97ea4d..35d9aa64a 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -1264,7 +1264,7 @@ _propagate_events_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_scroller_eo.h b/src/lib/elm_scroller_eo.h
index ac701c20d..30edeb219 100644
--- a/src/lib/elm_scroller_eo.h
+++ b/src/lib/elm_scroller_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_SCROLLER_CLASS elm_obj_scroller_class_get()
 
-const Eo_Class *elm_obj_scroller_class_get(void) EINA_CONST;
+const Eo *elm_obj_scroller_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_SCROLLER_BASE_ID;
 
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index b0332d29a..9e4a0a035 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -946,7 +946,7 @@ elm_segment_control_item_index_get(const Elm_Object_Item *it)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_segment_control_eo.h b/src/lib/elm_segment_control_eo.h
index ddcee090c..f471b536a 100644
--- a/src/lib/elm_segment_control_eo.h
+++ b/src/lib/elm_segment_control_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_SEGMENT_CONTROL_CLASS elm_obj_segment_control_class_get()
 
-const Eo_Class *elm_obj_segment_control_class_get(void) EINA_CONST;
+const Eo *elm_obj_segment_control_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_SEGMENT_CONTROL_BASE_ID;
 
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 639808508..97615c912 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -134,7 +134,7 @@ _elm_separator_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd E
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_separator_eo.h b/src/lib/elm_separator_eo.h
index 30b60f455..1182773fa 100644
--- a/src/lib/elm_separator_eo.h
+++ b/src/lib/elm_separator_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_SEPARATOR_CLASS elm_obj_separator_class_get()
 
-const Eo_Class *elm_obj_separator_class_get(void) EINA_CONST;
+const Eo *elm_obj_separator_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_SEPARATOR_BASE_ID;
 
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 0437c714d..6ca1412ef 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -1337,7 +1337,7 @@ _elm_slider_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_slider_eo.h b/src/lib/elm_slider_eo.h
index 35872d65a..e118ce378 100644
--- a/src/lib/elm_slider_eo.h
+++ b/src/lib/elm_slider_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_SLIDER_CLASS elm_obj_slider_class_get()
 
-const Eo_Class *elm_obj_slider_class_get(void) EINA_CONST;
+const Eo *elm_obj_slider_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_SLIDER_BASE_ID;
 
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 4a96d2190..fc05cfbe6 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -959,7 +959,7 @@ _elm_slideshow_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd E
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_slideshow_eo.h b/src/lib/elm_slideshow_eo.h
index defce7367..759ccda48 100644
--- a/src/lib/elm_slideshow_eo.h
+++ b/src/lib/elm_slideshow_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_SLIDESHOW_CLASS elm_obj_slideshow_class_get()
 
-const Eo_Class *elm_obj_slideshow_class_get(void) EINA_CONST;
+const Eo *elm_obj_slideshow_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_SLIDESHOW_BASE_ID;
 
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 53b89f73d..5a8c0e566 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -1251,7 +1251,7 @@ _elm_spinner_round_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_spinner_eo.h b/src/lib/elm_spinner_eo.h
index 415a4606b..2979c1a96 100644
--- a/src/lib/elm_spinner_eo.h
+++ b/src/lib/elm_spinner_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_SPINNER_CLASS elm_obj_spinner_class_get()
 
-const Eo_Class *elm_obj_spinner_class_get(void) EINA_CONST;
+const Eo *elm_obj_spinner_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_SPINNER_BASE_ID;
 
diff --git a/src/lib/elm_systray.c b/src/lib/elm_systray.c
index bdc7bc162..dab204962 100644
--- a/src/lib/elm_systray.c
+++ b/src/lib/elm_systray.c
@@ -577,7 +577,7 @@ _elm_unneed_systray(void)
 // EObject Stuff
 // =============================================================================
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(ELM_OBJ_SYSTRAY_ID(ELM_OBJ_SYSTRAY_SUB_ID_CATEGORY_SET),
diff --git a/src/lib/elm_systray_eo.h b/src/lib/elm_systray_eo.h
index d95cffaa4..eb53d562f 100644
--- a/src/lib/elm_systray_eo.h
+++ b/src/lib/elm_systray_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_SYSTRAY_CLASS elm_obj_systray_class_get()
 
-const Eo_Class *elm_obj_systray_class_get(void) EINA_CONST;
+const Eo *elm_obj_systray_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_SYSTRAY_BASE_ID;
 
diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c
index 93f2c4cb4..1c5b1643b 100644
--- a/src/lib/elm_table.c
+++ b/src/lib/elm_table.c
@@ -464,7 +464,7 @@ _child_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_table_eo.h b/src/lib/elm_table_eo.h
index dbb3a73ff..56d228177 100644
--- a/src/lib/elm_table_eo.h
+++ b/src/lib/elm_table_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_TABLE_CLASS elm_obj_table_class_get()
 
-const Eo_Class *elm_obj_table_class_get(void) EINA_CONST;
+const Eo *elm_obj_table_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_TABLE_BASE_ID;
 
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 7ab8cace9..a7eda52df 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -1192,7 +1192,7 @@ _editable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_thumb_eo.h b/src/lib/elm_thumb_eo.h
index 02ac25a0d..67b1b0f9f 100644
--- a/src/lib/elm_thumb_eo.h
+++ b/src/lib/elm_thumb_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_THUMB_CLASS elm_obj_thumb_class_get()
 
-const Eo_Class *elm_obj_thumb_class_get(void) EINA_CONST;
+const Eo *elm_obj_thumb_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_THUMB_BASE_ID;
 
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index fd9880407..f35379049 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -3965,7 +3965,7 @@ elm_toolbar_item_bring_in(Elm_Object_Item *it, Elm_Toolbar_Item_Scrollto_Type ty
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_toolbar_eo.h b/src/lib/elm_toolbar_eo.h
index f9706b090..328cb3561 100644
--- a/src/lib/elm_toolbar_eo.h
+++ b/src/lib/elm_toolbar_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_TOOLBAR_CLASS elm_obj_toolbar_class_get()
 
-const Eo_Class *elm_obj_toolbar_class_get(void) EINA_CONST;
+const Eo *elm_obj_toolbar_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_TOOLBAR_BASE_ID;
 
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 2d579cfe0..f2ca695bd 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -740,7 +740,7 @@ _elm_video_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_video_eo.h b/src/lib/elm_video_eo.h
index 6baa254b6..7922a868c 100644
--- a/src/lib/elm_video_eo.h
+++ b/src/lib/elm_video_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_PLAYER_CLASS elm_obj_player_class_get()
 
-const Eo_Class *elm_obj_player_class_get(void) EINA_CONST;
+const Eo *elm_obj_player_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_PLAYER_BASE_ID;
 
@@ -16,7 +16,7 @@ enum
  */
 #define ELM_OBJ_VIDEO_CLASS elm_obj_video_class_get()
 
-const Eo_Class *elm_obj_video_class_get(void) EINA_CONST;
+const Eo *elm_obj_video_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_VIDEO_BASE_ID;
 
diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index 432de0fce..80d8c7754 100644
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -2635,7 +2635,7 @@ elm_web_window_features_region_get(const Elm_Web_Window_Features *wf,
 //
 #if !defined(HAVE_ELEMENTARY_WEB) || !defined(USE_WEBKIT2)
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 9ac867c39..5fc4e2577 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -1304,7 +1304,7 @@ elm_web_window_features_region_get(const Elm_Web_Window_Features *wf,
 
 #if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2)
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_web_eo.h b/src/lib/elm_web_eo.h
index 62e2fa20e..2fb60ebf1 100644
--- a/src/lib/elm_web_eo.h
+++ b/src/lib/elm_web_eo.h
@@ -1,6 +1,6 @@
 #define ELM_OBJ_WEB_CLASS elm_obj_web_class_get()
 
-const Eo_Class *elm_obj_web_class_get(void) EINA_CONST;
+const Eo *elm_obj_web_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_WEB_BASE_ID;
 
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index a758c558f..cbd89105b 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -6195,7 +6195,7 @@ _elm_widget_activate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index c735b2d7d..43c2c450d 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -1071,7 +1071,7 @@ EAPI Eina_Bool elm_selection_selection_has_owner(Evas_Object *obj);
 
 #define ELM_OBJ_WIDGET_CLASS elm_widget_class_get()
 
-const Eo_Class *elm_widget_class_get(void) EINA_CONST;
+const Eo *elm_widget_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_WIDGET_BASE_ID;
 
diff --git a/src/lib/elm_widget_container.h b/src/lib/elm_widget_container.h
index 4427fdd2d..594607cdb 100644
--- a/src/lib/elm_widget_container.h
+++ b/src/lib/elm_widget_container.h
@@ -32,7 +32,7 @@
 
 #define ELM_OBJ_CONTAINER_CLASS elm_obj_container_class_get()
 
-const Eo_Class *elm_obj_container_class_get(void) EINA_CONST;
+const Eo *elm_obj_container_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_CONTAINER_BASE_ID;
 
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 0e12e2b9b..77b4d5184 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -5493,7 +5493,7 @@ elm_win_window_id_get(const Evas_Object *obj)
 }
 
 static void
-_class_constructor(Eo_Class *klass)
+_class_constructor(Eo *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
         EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
diff --git a/src/lib/elm_win_eo.h b/src/lib/elm_win_eo.h
index 21e943067..b7f010006 100644
--- a/src/lib/elm_win_eo.h
+++ b/src/lib/elm_win_eo.h
@@ -5,7 +5,7 @@
  */
 #define ELM_OBJ_WIN_CLASS elm_obj_win_class_get()
 
-const Eo_Class *elm_obj_win_class_get(void) EINA_CONST;
+const Eo *elm_obj_win_class_get(void) EINA_CONST;
 
 extern EAPI Eo_Op ELM_OBJ_WIN_BASE_ID;