diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index 5a12b891e6..8f570687d3 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -163,7 +163,7 @@ _evas_event_source_events_call(Evas_Object_Protected_Data *src, Evas_Callback_Ty
    Eina_List *l;
    Evas_Object *child_eo;
    Evas_Object_Protected_Data *child;
-   EINA_LIST_FOREACH(src->proxy.event_in, l, child_eo)
+   EINA_LIST_FOREACH(src->proxy.src_event_in, l, child_eo)
      {
         if (src->delete_me) return;
         child = eo_data_get(child_eo, EVAS_OBJ_CLASS);
@@ -211,17 +211,17 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
    ev->output.x = ev->canvas.x;
    ev->output.y = ev->canvas.y;
 
-   if (src->proxy.event_in)
-     src->proxy.event_in = eina_list_free(src->proxy.event_in);
+   if (src->proxy.src_event_in)
+     src->proxy.src_event_in = eina_list_free(src->proxy.src_event_in);
 
    //FIXME: Needs to care the src mouse grab.
    if (src->is_smart)
      {
         int no_rep = 0;
-        src->proxy.event_in = _evas_event_object_list_raw_in_get(eo_e, src->proxy.event_in, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE);
+        src->proxy.src_event_in = _evas_event_object_list_raw_in_get(eo_e, src->proxy.src_event_in, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE);
      }
    else
-    src->proxy.event_in = eina_list_append(src->proxy.event_in, src);
+    src->proxy.src_event_in = eina_list_append(src->proxy.src_event_in, src);
    _evas_event_source_events_call(src, EVAS_CALLBACK_MOUSE_DOWN, ev, event_id);
    ev->canvas = canvas;
    ev->output = output;
@@ -270,7 +270,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas_Event_Mouse_Up *ev,
 
    //FIXME: Needs to care the src mouse grab.
    _evas_event_source_events_call(src, EVAS_CALLBACK_MOUSE_UP, ev, event_id);
-   src->proxy.event_in = eina_list_free(src->proxy.event_in);
+   src->proxy.src_event_in = eina_list_free(src->proxy.src_event_in);
 
    ev->canvas = canvas;
    ev->output = output;
@@ -408,6 +408,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas_Event_Mouse_Out *e
    Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
    Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
    Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
+   Evas_Point output = ev->output;
    Evas_Coord_Point canvas = ev->canvas;
 
    if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
@@ -684,7 +685,7 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list)
              evas_object_event_callback_call(eo_obj, obj,
                                              EVAS_CALLBACK_MOUSE_DOWN, &ev,
                                              event_id);
-             if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+             if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                _evas_event_source_mouse_down_events(eo_obj, eo_e, &ev,
                                                     event_id);
           }
@@ -749,7 +750,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
                        evas_object_event_callback_call(eo_obj, obj,
                                                        EVAS_CALLBACK_MOUSE_OUT,
                                                        &ev, event_id);
-                       if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+                       if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                          _evas_event_source_mouse_out_events(eo_obj, &ev,
                                                              event_id);
                     }
@@ -796,7 +797,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
                             evas_object_event_callback_call(eo_obj_itr, obj_itr,
                                                             EVAS_CALLBACK_MOUSE_IN, &ev_in, event_id);
                             if ((obj_itr->proxy.is_proxy) &&
-                                (obj_itr->proxy.source_events))
+                                (obj_itr->proxy.src_events))
                               _evas_event_source_mouse_in_events(eo_obj_itr,
                                                                  &ev_in,
                                                                  event_id);
@@ -908,7 +909,7 @@ _canvas_event_feed_mouse_up(Eo *eo_e, void *_pd, va_list *list)
                        evas_object_event_callback_call(eo_obj, obj,
                                                        EVAS_CALLBACK_MOUSE_UP,
                                                        &ev, event_id);
-                       if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+                       if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                          _evas_event_source_mouse_up_events(eo_obj, &ev,
                                                             event_id);
                     }
@@ -1032,7 +1033,7 @@ _canvas_event_feed_mouse_wheel(Eo *eo_e, void *_pd, va_list *list)
              evas_object_event_callback_call(eo_obj, obj,
                                              EVAS_CALLBACK_MOUSE_WHEEL, &ev,
                                              event_id);
-             if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+             if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                _evas_event_source_wheel_events(eo_obj, &ev, event_id);
           }
         if (e->delete_me) break;
@@ -1139,7 +1140,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
                          {
                             evas_object_event_callback_call(eo_obj, obj,
                                                             EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
-                       if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+                       if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                          _evas_event_source_mouse_move_events(eo_obj, &ev,
                                                               event_id);
                          }
@@ -1204,7 +1205,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
                                                                       obj,
                                                                       EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
                                       if ((obj->proxy.is_proxy) &&
-                                          (obj->proxy.source_events))
+                                          (obj->proxy.src_events))
                                         _evas_event_source_mouse_out_events(eo_obj, &ev, event_id);
                                    }
                               }
@@ -1298,7 +1299,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
                        ev.cur.canvas.y = e->pointer.y;
                        _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
                        evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
-                       if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+                       if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                          _evas_event_source_mouse_move_events(eo_obj,&ev,
                                                               event_id);
                     }
@@ -1318,7 +1319,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
                             evas_object_event_callback_call(eo_obj, obj,
                                                             EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id);
                             if ((obj->proxy.is_proxy) &&
-                                (obj->proxy.source_events))
+                                (obj->proxy.src_events))
                               _evas_event_source_mouse_out_events(eo_obj, &ev2,
                                                                   event_id);
                          }
@@ -1351,7 +1352,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
                             evas_object_event_callback_call(eo_obj, obj,
                                                             EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2);
                             if ((obj->proxy.is_proxy) &&
-                                (obj->proxy.source_events))
+                                (obj->proxy.src_events))
                               _evas_event_source_mouse_in_events(eo_obj, &ev3,
                                                                  event_id2);
                          }
@@ -1490,7 +1491,7 @@ nogrep:
                        _evas_event_framespace_adjust(eo_obj, &ev.cur.canvas.x, &ev.cur.canvas.y);
                        _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
                        evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
-                       if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+                       if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                          _evas_event_source_mouse_move_events(eo_obj, &ev,
                                                               event_id);
                     }
@@ -1510,7 +1511,7 @@ nogrep:
                             evas_object_event_callback_call(eo_obj, obj,
                                                             EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id);
                             if ((obj->proxy.is_proxy) &&
-                                (obj->proxy.source_events))
+                                (obj->proxy.src_events))
                               _evas_event_source_mouse_out_events(eo_obj, &ev2,
                                                                   event_id);
                          }
@@ -1543,7 +1544,7 @@ nogrep:
                             evas_object_event_callback_call(eo_obj, obj,
                                                             EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2);
                             if ((obj->proxy.is_proxy) &&
-                                (obj->proxy.source_events))
+                                (obj->proxy.src_events))
                               _evas_event_source_mouse_in_events(eo_obj, &ev3,
                                                                  event_id2);
                          }
@@ -1628,7 +1629,7 @@ _canvas_event_feed_mouse_in(Eo *eo_e, void *_pd, va_list *list)
                      evas_object_event_callback_call(eo_obj, obj,
                                                      EVAS_CALLBACK_MOUSE_IN,
                                                      &ev, event_id);
-                     if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+                     if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                        _evas_event_source_mouse_in_events(eo_obj, &ev,
                                                           event_id);
                     }
@@ -1712,7 +1713,7 @@ _canvas_event_feed_mouse_out(Eo *eo_e, void *_pd, va_list *list)
                             evas_object_event_callback_call(eo_obj, obj,
                                                             EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
                             if ((obj->proxy.is_proxy) &&
-                                (obj->proxy.source_events))
+                                (obj->proxy.src_events))
                               _evas_event_source_mouse_out_events(eo_obj, &ev,
                                                                   event_id);
                          }
@@ -1834,7 +1835,7 @@ _canvas_event_feed_multi_down(Eo *eo_e, void *_pd, va_list *list)
              evas_object_event_callback_call(eo_obj, obj,
                                              EVAS_CALLBACK_MULTI_DOWN, &ev,
                                              event_id);
-             if ((obj->proxy.is_proxy) || (obj->proxy.source_events))
+             if ((obj->proxy.is_proxy) || (obj->proxy.src_events))
                _evas_event_source_multi_down_events(eo_obj, &ev, event_id);
           }
         if (e->delete_me) break;
@@ -1943,7 +1944,7 @@ _canvas_event_feed_multi_up(Eo *eo_e, void *_pd, va_list *list)
              evas_object_event_callback_call(eo_obj, obj,
                                              EVAS_CALLBACK_MULTI_UP, &ev,
                                              event_id);
-             if ((obj->proxy.is_proxy) || (obj->proxy.source_events))
+             if ((obj->proxy.is_proxy) || (obj->proxy.src_events))
                _evas_event_source_multi_up_events(eo_obj, &ev, event_id);
           }
         if (e->delete_me) break;
@@ -2053,7 +2054,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
                   if (y != ev.cur.canvas.y)
                     ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision
                   evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id);
-                  if ((obj->proxy.is_proxy) || (obj->proxy.source_events))
+                  if ((obj->proxy.is_proxy) || (obj->proxy.src_events))
                     _evas_event_source_multi_move_events(eo_obj, &ev, event_id);
                }
              if (e->delete_me) break;
@@ -2126,7 +2127,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
                   if (y != ev.cur.canvas.y)
                     ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision
                     evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id);
-                  if ((obj->proxy.is_proxy) || (obj->proxy.source_events))
+                  if ((obj->proxy.is_proxy) || (obj->proxy.src_events))
                     _evas_event_source_multi_move_events(eo_obj, &ev, event_id);
                }
              if (e->delete_me) break;
@@ -2415,7 +2416,7 @@ _canvas_event_feed_hold(Eo *eo_e, void *_pd, va_list *list)
           {
              evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD,
                                              &ev, event_id);
-             if ((obj->proxy.is_proxy) && (obj->proxy.source_events))
+             if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
                _evas_event_source_hold_events(eo_obj, &ev, event_id);
           }
         if (e->delete_me) break;
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index 721eaa5ba7..932f11a063 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -573,10 +573,10 @@ _image_source_events_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
    Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
 
    source_events = !!source_events;
-   if (obj->proxy.source_events == source_events) return;
-   obj->proxy.source_events = source_events;
+   if (obj->proxy.src_events == source_events) return;
+   obj->proxy.src_events = source_events;
    if (!o->cur.source) return;
-   if ((obj->proxy.source_invisible) || (!source_events)) return;
+   if ((obj->proxy.src_invisible) || (!source_events)) return;
    //FIXME: Feed mouse events here.
 }
 
@@ -599,7 +599,7 @@ _image_source_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
    Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
    Eina_Bool *source_events = va_arg(*list, Eina_Bool *);
    if (!source_events) return;
-   *source_events = obj->proxy.source_events;
+   *source_events = obj->proxy.src_events;
 }
 
 EAPI void
@@ -623,13 +623,13 @@ _image_source_visible_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
 
    visible = !!visible;
    src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS);
-   if (src_obj->proxy.source_invisible == !visible) return;
-   src_obj->proxy.source_invisible = !visible;
-   src_obj->changed_source_visible = EINA_TRUE;
+   if (src_obj->proxy.src_invisible == !visible) return;
+   src_obj->proxy.src_invisible = !visible;
+   src_obj->changed_src_visible = EINA_TRUE;
    evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE,
                                              EINA_FALSE, EINA_TRUE);
    evas_object_change(o->cur.source, src_obj);
-   if ((!visible) || (!src_obj->proxy.source_events)) return;
+   if ((!visible) || (!src_obj->proxy.src_events)) return;
    //FIXME: Feed mouse events here.
 }
 
@@ -656,7 +656,7 @@ _image_source_visible_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
    if (!visible) return;
    if (!o->cur.source) *visible = EINA_FALSE;
    src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS);
-   if (src_obj) *visible = !src_obj->proxy.source_invisible;
+   if (src_obj) *visible = !src_obj->proxy.src_invisible;
    else *visible = EINA_FALSE;
 }
 
@@ -2671,10 +2671,10 @@ _proxy_unset(Evas_Object *proxy)
    cur_source->proxy.proxies = eina_list_remove(cur_source->proxy.proxies, proxy);
    cur_proxy->proxy.is_proxy = EINA_FALSE;
 
-   if (cur_source->proxy.source_invisible)
+   if (cur_source->proxy.src_invisible)
      {
-        cur_source->proxy.source_invisible = EINA_FALSE;
-        cur_source->changed_source_visible = EINA_TRUE;
+        cur_source->proxy.src_invisible = EINA_FALSE;
+        cur_source->changed_src_visible = EINA_TRUE;
         evas_object_change(o->cur.source, cur_source);
         evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE,
                                                   EINA_FALSE, EINA_TRUE);
@@ -3696,7 +3696,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
         evas_object_render_pre_visible_change(&e->clip_changes, eo_obj, is_v, was_v);
         if (!o->pixel_updates) goto done;
      }
-   if (obj->changed_map || obj->changed_source_visible)
+   if (obj->changed_map || obj->changed_src_visible)
      {
         evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
         goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_line.c b/legacy/evas/src/lib/canvas/evas_object_line.c
index 9d10810153..76a6263d85 100644
--- a/legacy/evas/src/lib/canvas/evas_object_line.c
+++ b/legacy/evas/src/lib/canvas/evas_object_line.c
@@ -311,7 +311,7 @@ evas_object_line_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
 	evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
 	goto done;
      }
-   if (obj->changed_map || obj->changed_source_visible)
+   if (obj->changed_map || obj->changed_src_visible)
      {
 	evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj,
                                             obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c
index 0771c83f34..d639c576a7 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/legacy/evas/src/lib/canvas/evas_object_main.c
@@ -54,7 +54,7 @@ evas_object_change_reset(Evas_Object *eo_obj)
    obj->changed_color = EINA_FALSE;
    obj->changed_map = EINA_FALSE;
    obj->changed_pchange = EINA_FALSE;
-   obj->changed_source_visible = EINA_FALSE;
+   obj->changed_src_visible = EINA_FALSE;
 }
 
 void
diff --git a/legacy/evas/src/lib/canvas/evas_object_polygon.c b/legacy/evas/src/lib/canvas/evas_object_polygon.c
index 7e4fb065f3..475c555197 100644
--- a/legacy/evas/src/lib/canvas/evas_object_polygon.c
+++ b/legacy/evas/src/lib/canvas/evas_object_polygon.c
@@ -368,7 +368,7 @@ evas_object_polygon_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *
         evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
         goto done;
      }
-   if (obj->changed_map || obj->changed_source_visible)
+   if (obj->changed_map || obj->changed_src_visible)
      {
         evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj);
         goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_rectangle.c b/legacy/evas/src/lib/canvas/evas_object_rectangle.c
index 854e327538..a90aeb77b4 100644
--- a/legacy/evas/src/lib/canvas/evas_object_rectangle.c
+++ b/legacy/evas/src/lib/canvas/evas_object_rectangle.c
@@ -178,7 +178,7 @@ evas_object_rectangle_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
 	evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
 	goto done;
      }
-   if (obj->changed_map || obj->changed_source_visible)
+   if (obj->changed_map || obj->changed_src_visible)
      {
 	evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj);
         goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index afcbd3634b..9502aef7a4 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -1151,7 +1151,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *eo_obj,
    if (freeze_events)
      obj->parent_cache.freeze_events_valid = EINA_FALSE;
    if (source_invisible)
-     obj->parent_cache.source_invisible_valid = EINA_FALSE;
+     obj->parent_cache.src_invisible_valid = EINA_FALSE;
 
    if (!obj->is_smart) return;
    Evas_Object_Smart *o = eo_data_get(eo_obj, MY_CLASS);
@@ -1403,7 +1403,7 @@ evas_object_smart_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
 #endif
      }
 
-   if (obj->changed_map || obj->changed_source_visible)
+   if (obj->changed_map || obj->changed_src_visible)
      evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
                                          eo_obj, obj);
 
diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c
index b7b101397e..0279544448 100644
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/legacy/evas/src/lib/canvas/evas_object_text.c
@@ -1849,7 +1849,7 @@ evas_object_text_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
 					      eo_obj, is_v, was_v);
 	goto done;
      }
-   if (obj->changed_map || obj->changed_source_visible)
+   if (obj->changed_map || obj->changed_src_visible)
      {
 	evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
 					    eo_obj, obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 0977a226ac..2830f666cd 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -10015,7 +10015,7 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
 	evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
 	goto done;
      }
-   if (obj->changed_map || obj->changed_source_visible)
+   if (obj->changed_map || obj->changed_src_visible)
      {
 	evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
                                             eo_obj, obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_textgrid.c b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
index 471248e14e..9ba96ed443 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textgrid.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
@@ -723,7 +723,7 @@ evas_object_textgrid_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
 	evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
 	goto done;
      }
-   if (obj->changed_map || obj->changed_source_visible)
+   if (obj->changed_map || obj->changed_src_visible)
      {
         evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
                                             eo_obj, obj);
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index 42b5f054ea..9762dda943 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -244,7 +244,7 @@ _evas_render_phase1_direct(Evas_Public_Data *e,
                 _evas_render_had_map(obj));
              if ((obj->is_smart) &&
                  ((_evas_render_has_map(eo_obj, obj) ||
-                 (obj->changed_source_visible))))
+                 (obj->changed_src_visible))))
                {
                   RD("      has map + smart\n");
                   _evas_render_prev_cur_clip_cache_add(e, obj);
diff --git a/legacy/evas/src/lib/include/evas_inline.x b/legacy/evas/src/lib/include/evas_inline.x
index 5e6d8cdcf3..4ad3727b89 100644
--- a/legacy/evas/src/lib/include/evas_inline.x
+++ b/legacy/evas/src/lib/include/evas_inline.x
@@ -109,16 +109,16 @@ evas_event_passes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_
 static inline int
 evas_object_is_source_invisible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj)
 {
-   if (obj->parent_cache.source_invisible_valid)
-     return obj->parent_cache.source_invisible;
-   if (obj->proxy.proxies && obj->proxy.source_invisible) return 1;
+   if (obj->parent_cache.src_invisible_valid)
+     return obj->parent_cache.src_invisible;
+   if (obj->proxy.proxies && obj->proxy.src_invisible) return 1;
    if (!obj->smart.parent) return 0;
    Evas_Object_Protected_Data *smart_parent_pd =
       eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS);
-   obj->parent_cache.source_invisible =
+   obj->parent_cache.src_invisible =
       evas_object_is_source_invisible(obj->smart.parent, smart_parent_pd);
-   obj->parent_cache.source_invisible_valid = EINA_TRUE;
-   return obj->parent_cache.source_invisible;
+   obj->parent_cache.src_invisible_valid = EINA_TRUE;
+   return obj->parent_cache.src_invisible;
 }
 
 static inline int
diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h
index e7e0e726bb..e6536fdad3 100644
--- a/legacy/evas/src/lib/include/evas_private.h
+++ b/legacy/evas/src/lib/include/evas_private.h
@@ -595,11 +595,11 @@ struct _Evas_Object_Protected_Data
       Eina_List               *proxies;
       void                    *surface;
       int                      w,h;
-      Eina_List               *event_in;
+      Eina_List               *src_event_in;
       Eina_Bool                redraw : 1;
       Eina_Bool                is_proxy : 1;
-      Eina_Bool                source_invisible : 1;
-      Eina_Bool                source_events: 1;
+      Eina_Bool                src_invisible : 1;
+      Eina_Bool                src_events: 1;
    } proxy;
 
    // Pointer to the Evas_Object itself
@@ -648,8 +648,8 @@ struct _Evas_Object_Protected_Data
       Eina_Bool                pass_events_valid : 1;
       Eina_Bool                freeze_events : 1;
       Eina_Bool                freeze_events_valid : 1;
-      Eina_Bool                source_invisible : 1;
-      Eina_Bool                source_invisible_valid : 1;
+      Eina_Bool                src_invisible : 1;
+      Eina_Bool                src_invisible_valid : 1;
    } parent_cache;
    Eina_Bool                   restack : 1;
    Eina_Bool                   is_active : 1;
@@ -670,7 +670,7 @@ struct _Evas_Object_Protected_Data
    Eina_Bool                   changed_color : 1;
    Eina_Bool                   changed_map : 1;
    Eina_Bool                   changed_pchange : 1;
-   Eina_Bool                   changed_source_visible : 1;
+   Eina_Bool                   changed_src_visible : 1;
    Eina_Bool                   del_ref : 1;
 
    Eina_Bool                   is_frame : 1;