diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 8134786ae5..497adf121e 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -3,7 +3,7 @@
 
 evas_canvas_eolian_pub_files = \
 	lib/evas/canvas/efl_canvas_object.eo \
-	lib/evas/canvas/efl_canvas_object_event_grabber.eo \
+	lib/evas/canvas/efl_canvas_event_grabber.eo \
 	lib/evas/canvas/efl_canvas_polygon.eo \
 	lib/evas/canvas/efl_canvas_rectangle.eo \
 	lib/evas/canvas/efl_canvas_text.eo \
@@ -253,7 +253,7 @@ lib/evas/canvas/evas_map.h \
 lib/evas/canvas/evas_gl.c \
 lib/evas/canvas/evas_out.c \
 lib/evas/canvas/efl_canvas_image.c \
-lib/evas/canvas/efl_canvas_object_event_grabber.c \
+lib/evas/canvas/efl_canvas_event_grabber.c \
 lib/evas/canvas/efl_canvas_proxy.c \
 lib/evas/canvas/efl_canvas_snapshot.c \
 lib/evas/canvas/efl_canvas_scene3d.c \
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index c6a6a935bb..cb4e069141 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -205,7 +205,7 @@ typedef struct Efl_Canvas_Object_Animation_Event_Info
 
 #if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
 
-#include "canvas/efl_canvas_object_event_grabber.eo.h"
+#include "canvas/efl_canvas_event_grabber.eo.h"
 
  /**
  * @defgroup Evas_3D Evas 3D Extensions
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index acd0dc74d5..ffff908978 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -8086,7 +8086,7 @@ EAPI void evas_object_text_filter_source_set(Evas_Object *obj, const char *name,
  * @since 1.20
  */
 EAPI Evas_Object *evas_object_event_grabber_add(Evas *e);
-#include "canvas/efl_canvas_object_event_grabber.eo.legacy.h"
+#include "canvas/efl_canvas_event_grabber.eo.legacy.h"
 
 #include "canvas/efl_canvas_animation_alpha.eo.legacy.h"
 #include "canvas/efl_canvas_animation.eo.legacy.h"
diff --git a/src/lib/evas/canvas/efl_canvas_object_event_grabber.c b/src/lib/evas/canvas/efl_canvas_event_grabber.c
similarity index 81%
rename from src/lib/evas/canvas/efl_canvas_object_event_grabber.c
rename to src/lib/evas/canvas/efl_canvas_event_grabber.c
index 295c450216..a054c993bf 100644
--- a/src/lib/evas/canvas/efl_canvas_object_event_grabber.c
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c
@@ -1,8 +1,8 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
-#include "efl_canvas_object_event_grabber.eo.h"
+#include "efl_canvas_event_grabber.eo.h"
 
-#define MY_CLASS EFL_CANVAS_OBJECT_EVENT_GRABBER_CLASS
+#define MY_CLASS EFL_CANVAS_EVENT_GRABBER_CLASS
 #define MY_CLASS_NAME "Efl_Object_Event_Grabber"
 #define MY_CLASS_NAME_LEGACY "evas_object_event_grabber"
 
@@ -46,7 +46,7 @@ _efl_canvas_group_group_iterator_free(Efl_Object_Event_Grabber_Iterator *it)
 }
 
 EOLIAN static Eina_Iterator*
-_efl_canvas_object_event_grabber_efl_canvas_group_group_members_iterate(const Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
+_efl_canvas_event_grabber_efl_canvas_group_group_members_iterate(const Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
 {
    Efl_Object_Event_Grabber_Iterator *it;
 
@@ -67,7 +67,7 @@ _efl_canvas_object_event_grabber_efl_canvas_group_group_members_iterate(const Eo
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_object_event_grabber_efl_canvas_group_group_member_is(const Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED, const Eo *sub_obj)
+_efl_canvas_event_grabber_efl_canvas_group_group_member_is(const Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED, const Eo *sub_obj)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Protected_Data *sub = efl_data_scope_safe_get(sub_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -197,7 +197,7 @@ _efl_canvas_object_event_grabber_child_del(void *data, const Efl_Event *event)
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eo *eo_sub)
+_efl_canvas_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eo *eo_sub)
 {
    Evas_Object_Protected_Data *sub = efl_data_scope_safe_get(eo_sub, EFL_CANVAS_OBJECT_CLASS);
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -250,7 +250,7 @@ _efl_canvas_object_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, E
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eo *member)
+_efl_canvas_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eo *member)
 {
    Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS);
 
@@ -264,45 +264,45 @@ _efl_canvas_object_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EI
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_canvas_group_group_change(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
+_efl_canvas_event_grabber_efl_canvas_group_group_change(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
 {}
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_canvas_group_group_calculate(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
+_efl_canvas_event_grabber_efl_canvas_group_group_calculate(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
 {}
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_canvas_group_group_need_recalculate_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED, Eina_Bool set EINA_UNUSED)
+_efl_canvas_event_grabber_efl_canvas_group_group_need_recalculate_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED, Eina_Bool set EINA_UNUSED)
 {}
 
 EOLIAN static Eina_Bool
-_efl_canvas_object_event_grabber_efl_canvas_group_group_need_recalculate_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
+_efl_canvas_event_grabber_efl_canvas_group_group_need_recalculate_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd EINA_UNUSED)
 {
    return EINA_FALSE;
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_gfx_position_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Position2D pos)
+_efl_canvas_event_grabber_efl_gfx_position_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Position2D pos)
 {
    efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), pos);
    efl_gfx_position_set(pd->rect, pos);
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_gfx_size_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Size2D sz)
+_efl_canvas_event_grabber_efl_gfx_size_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Size2D sz)
 {
    efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), sz);
    efl_gfx_size_set(pd->rect, sz);
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_object_event_grabber_efl_gfx_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
+_efl_canvas_event_grabber_efl_gfx_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
 {
    return pd->vis;
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
+_efl_canvas_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
 {
    if (set)
      {
@@ -319,7 +319,7 @@ _efl_canvas_object_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_gfx_stack_layer_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, short l)
+_efl_canvas_event_grabber_efl_gfx_stack_layer_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, short l)
 {
    efl_gfx_stack_layer_set(efl_super(eo_obj, MY_CLASS), l);
    efl_gfx_stack_layer_set(pd->rect, l);
@@ -339,7 +339,7 @@ _efl_canvas_object_event_grabber_restack(void *data, const Efl_Event *event)
 }
 
 EOLIAN static Eo *
-_efl_canvas_object_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
+_efl_canvas_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
 
@@ -360,7 +360,7 @@ _efl_canvas_object_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_E
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_efl_object_destructor(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
+_efl_canvas_event_grabber_efl_object_destructor(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd)
 {
    Evas_Object_Protected_Data *obj;
    Eina_List *l, *ln;
@@ -372,7 +372,7 @@ _efl_canvas_object_event_grabber_efl_object_destructor(Eo *eo_obj, Efl_Object_Ev
 }
 
 static void
-_efl_canvas_object_event_grabber_class_constructor(Efl_Class *klass)
+_efl_canvas_event_grabber_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
@@ -385,7 +385,7 @@ evas_object_event_grabber_members_list(const Eo *eo_obj)
 }
 
 EOLIAN static void
-_efl_canvas_object_event_grabber_freeze_when_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
+_efl_canvas_event_grabber_freeze_when_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
 {
    set = !!set;
    if (pd->freeze == set) return;
@@ -395,7 +395,7 @@ _efl_canvas_object_event_grabber_freeze_when_visible_set(Eo *eo_obj EINA_UNUSED,
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_object_event_grabber_freeze_when_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
+_efl_canvas_event_grabber_freeze_when_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
 {
    return pd->freeze;
 }
@@ -407,4 +407,4 @@ evas_object_event_grabber_add(Evas *eo_e)
    return efl_add(MY_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added));
 }
 
-#include "efl_canvas_object_event_grabber.eo.c"
+#include "efl_canvas_event_grabber.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_object_event_grabber.eo b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
similarity index 96%
rename from src/lib/evas/canvas/efl_canvas_object_event_grabber.eo
rename to src/lib/evas/canvas/efl_canvas_event_grabber.eo
index 06f586131e..53019d385e 100644
--- a/src/lib/evas/canvas/efl_canvas_object_event_grabber.eo
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Object.Event.Grabber (Efl.Canvas.Group)
+class Efl.Canvas.Event_Grabber (Efl.Canvas.Group)
 {
    [[Low-level rectangle object.