Merge branch 'master' into devs/hermet/lottie

32 files changed, 322 insertions, 200 deletions

diff --git a/src/bin/elementary/test_gesture_framework.c b/src/bin/elementary/test_gesture_framework.c
index 5e2e935e49..3b9e57a986 100644
--- a/src/bin/elementary/test_gesture_framework.c
+++ b/src/bin/elementary/test_gesture_framework.c
@@ -370,13 +370,13 @@ tap_gesture_cb(void *data , const Efl_Event *ev)
    Efl_Canvas_Gesture *g = ev->info;
    switch(efl_gesture_state_get(g))
    {
-      case EFL_GESTURE_STARTED:
+      case EFL_GESTURE_STATE_STARTED:
          finger_tap_start(data, g);
          break;
-      case EFL_GESTURE_CANCELED:
+      case EFL_GESTURE_STATE_CANCELED:
          finger_tap_abort(data, g);
          break;
-      case EFL_GESTURE_FINISHED:
+      case EFL_GESTURE_STATE_FINISHED:
          finger_tap_end(data, g);
          break;
       default:
@@ -390,13 +390,13 @@ flick_gesture_cb(void *data , const Efl_Event *ev)
    Efl_Canvas_Gesture *g = ev->info;
    switch(efl_gesture_state_get(g))
    {
-      case EFL_GESTURE_STARTED:
+      case EFL_GESTURE_STATE_STARTED:
          finger_flick_start(data, g);
          break;
-      case EFL_GESTURE_CANCELED:
+      case EFL_GESTURE_STATE_CANCELED:
          finger_flick_abort(data, g);
          break;
-      case EFL_GESTURE_FINISHED:
+      case EFL_GESTURE_STATE_FINISHED:
          finger_flick_end(data, g);
          break;
       default:
@@ -410,16 +410,16 @@ momentum_gesture_cb(void *data , const Efl_Event *ev)
    Efl_Canvas_Gesture *g = ev->info;
    switch(efl_gesture_state_get(g))
    {
-      case EFL_GESTURE_STARTED:
+      case EFL_GESTURE_STATE_STARTED:
          finger_momentum_start(data, g);
          break;
-      case EFL_GESTURE_UPDATED:
+      case EFL_GESTURE_STATE_UPDATED:
          finger_momentum_update(data, g);
          break;
-      case EFL_GESTURE_CANCELED:
+      case EFL_GESTURE_STATE_CANCELED:
          finger_momentum_abort(data, g);
          break;
-      case EFL_GESTURE_FINISHED:
+      case EFL_GESTURE_STATE_FINISHED:
          finger_momentum_end(data, g);
          break;
       default:
@@ -433,16 +433,16 @@ triple_tap_gesture_cb(void *data , const Efl_Event *ev)
    Efl_Canvas_Gesture *g = ev->info;
    switch(efl_gesture_state_get(g))
    {
-      case EFL_GESTURE_STARTED:
+      case EFL_GESTURE_STATE_STARTED:
          finger_triple_tap_start(data, g);
          break;
-      case EFL_GESTURE_UPDATED:
+      case EFL_GESTURE_STATE_UPDATED:
          finger_triple_tap_update(data, g);
          break;
-      case EFL_GESTURE_CANCELED:
+      case EFL_GESTURE_STATE_CANCELED:
          finger_triple_tap_abort(data, g);
          break;
-      case EFL_GESTURE_FINISHED:
+      case EFL_GESTURE_STATE_FINISHED:
          finger_triple_tap_end(data, g);
          break;
       default:
@@ -456,16 +456,16 @@ double_tap_gesture_cb(void *data , const Efl_Event *ev)
    Efl_Canvas_Gesture *g = ev->info;
    switch(efl_gesture_state_get(g))
    {
-      case EFL_GESTURE_STARTED:
+      case EFL_GESTURE_STATE_STARTED:
          finger_double_tap_start(data, g);
          break;
-      case EFL_GESTURE_UPDATED:
+      case EFL_GESTURE_STATE_UPDATED:
          finger_double_tap_update(data, g);
          break;
-      case EFL_GESTURE_CANCELED:
+      case EFL_GESTURE_STATE_CANCELED:
          finger_double_tap_abort(data, g);
          break;
-      case EFL_GESTURE_FINISHED:
+      case EFL_GESTURE_STATE_FINISHED:
          finger_double_tap_end(data, g);
          break;
       default:
@@ -479,16 +479,16 @@ long_tap_gesture_cb(void *data , const Efl_Event *ev)
    Efl_Canvas_Gesture *g = ev->info;
    switch(efl_gesture_state_get(g))
    {
-      case EFL_GESTURE_STARTED:
+      case EFL_GESTURE_STATE_STARTED:
          finger_long_tap_start(data, g);
          break;
-      case EFL_GESTURE_UPDATED:
+      case EFL_GESTURE_STATE_UPDATED:
          finger_long_tap_update(data, g);
          break;
-      case EFL_GESTURE_CANCELED:
+      case EFL_GESTURE_STATE_CANCELED:
          finger_long_tap_abort(data, g);
          break;
-      case EFL_GESTURE_FINISHED:
+      case EFL_GESTURE_STATE_FINISHED:
          finger_long_tap_end(data, g);
          break;
       default:
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index b58520c1b3..bb5aedf39e 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -2432,6 +2432,7 @@ EAPI void               ecore_x_region_window_shape_set(Ecore_X_Region region, E
 EAPI void               ecore_x_region_picture_clip_set(Ecore_X_Region region, Ecore_X_Picture picture, int x_origin, int y_origin);
 EAPI void               ecore_x_cursor_show(void);
 EAPI void               ecore_x_cursor_hide(void);
+EAPI void               ecore_x_root_screen_barriers_set(Ecore_X_Rectangle *screens, int num); /** @since 1.24 */
 
 /**
  * xfixes selection notification request.
diff --git a/src/lib/ecore_x/ecore_x_fixes.c b/src/lib/ecore_x/ecore_x_fixes.c
index dd81b674c8..5582c3e3ef 100644
--- a/src/lib/ecore_x/ecore_x_fixes.c
+++ b/src/lib/ecore_x/ecore_x_fixes.c
@@ -7,6 +7,8 @@
 #include "ecore_x_private.h"
 #include "Ecore_X.h"
 
+#include <X11/Xregion.h>
+
 static int _fixes_available;
 #ifdef ECORE_XFIXES
 static int _fixes_major, _fixes_minor;
@@ -434,3 +436,100 @@ ecore_x_cursor_hide(void)
      }
 #endif  /* ifdef ECORE_XFIXES */
 }
+
+EAPI void
+ecore_x_root_screen_barriers_set(Ecore_X_Rectangle *screens, int num)
+{
+#ifdef ECORE_XFIXES
+   static PointerBarrier *bar = NULL;
+   static int bar_num = 0;
+   static int bar_alloc = 0;
+   Region reg, reg2, reg3;
+   int i, j;
+
+   // clear out old root screen barriers....
+   if (bar)
+     {
+        for (i = 0; i < bar_num; i++)
+          {
+             XFixesDestroyPointerBarrier(_ecore_x_disp, bar[i]);
+          }
+        free(bar);
+     }
+   bar = NULL;
+   bar_num = 0;
+   bar_alloc = 0;
+   if ((!screens) || (num <= 0)) return;
+
+   // set up new ones given the screen list given
+   for (i = 0; i < num; i++)
+     {
+        XRectangle xrect;
+
+        reg = XCreateRegion();
+        reg2 = XCreateRegion();
+        xrect.x = screens[i].x - 1;
+        xrect.y = screens[i].y - 1;
+        xrect.width = screens[i].width + 2;
+        xrect.height = screens[i].height + 2;
+        XUnionRectWithRegion(&xrect, reg, reg2);
+        XDestroyRegion(reg);
+        reg = reg2;
+
+        // reg == screen i + 1 pixel surrounding it
+        for (j = 0; j < num; j++)
+          {
+             // create a region representing screen j
+             reg2 = XCreateRegion();
+             reg3 = XCreateRegion();
+             xrect.x = screens[j].x;
+             xrect.y = screens[j].y;
+             xrect.width = screens[j].width;
+             xrect.height = screens[j].height;
+             XUnionRectWithRegion(&xrect, reg2, reg3);
+             XDestroyRegion(reg2);
+             reg2 = reg3;
+             // reg2 == screen j
+
+             reg3 = XCreateRegion();
+             XSubtractRegion(reg, reg2, reg3);
+             XDestroyRegion(reg);
+             XDestroyRegion(reg2);
+             reg = reg3;
+             // reg now has had screen j cut out of the boundary
+          }
+        // reg is the result of starting with screen i and then with a
+        // 1 pixel boundary around it havnig adjacent screens "cut out"
+        // of that boundary leaving only extra bounds where no screens
+        // are adjacent
+
+        // walk rects and create barriers
+        for (j = 0; j < reg->numRects; j++)
+          {
+             int x1, y1, x2, y2;
+
+             bar_num++;
+             if (bar_num > bar_alloc)
+               {
+                  bar_alloc += 32;
+                  PointerBarrier *t = realloc(bar, bar_alloc * sizeof(PointerBarrier));
+                  if (!t)
+                    {
+                       bar_num--;
+                       return;
+                    }
+                  bar = t;
+               }
+             x1 = reg->rects[j].x1;
+             y1 = reg->rects[j].y1;
+             x2 = reg->rects[j].x2 - 1;
+             y2 = reg->rects[j].y2 - 1;
+             bar[bar_num - 1] =
+               XFixesCreatePointerBarrier(_ecore_x_disp,
+                                          DefaultRootWindow(_ecore_x_disp),
+                                          x1, y1, x2, y2, 0, 0, NULL);
+          }
+        XDestroyRegion(reg);
+     }
+#endif
+}
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 552f57f52a..eb5cf7f0f2 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1549,8 +1549,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
                   Eina_List *l, *ll;
 
                   it = eina_hash_iterator_data_new(collect);
-                  /* the eud structs get manually freed below */
-                  eina_hash_free_cb_set(collect, (void*)eina_list_free);
                   EINA_ITERATOR_FOREACH(it, l)
                     {
                        EINA_LIST_FOREACH(l, ll, eud)
diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c
index 5b61a54aa3..edfe3cec2c 100644
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -98,13 +98,13 @@ _efl_canvas_layout_part_text_efl_text_style_ ##x ##_color_get(const Eo *obj, \
 
 TEXT_COLOR_IMPL(text_background, BACKING)
 TEXT_COLOR_IMPL(text_glow, GLOW)
-TEXT_COLOR_IMPL(text_glow2, GLOW2)
+TEXT_COLOR_IMPL(text_secondary_glow, GLOW2)
 TEXT_COLOR_IMPL(text, NORMAL)
 TEXT_COLOR_IMPL(text_outline, OUTLINE)
 TEXT_COLOR_IMPL(text_shadow, SHADOW)
 TEXT_COLOR_IMPL(text_strikethrough, STRIKETHROUGH)
 TEXT_COLOR_IMPL(text_underline, UNDERLINE)
-TEXT_COLOR_IMPL(text_underline2, UNDERLINE2)
+TEXT_COLOR_IMPL(text_secondary_underline, UNDERLINE2)
 TEXT_COLOR_IMPL(text_underline_dashed, UNDERLINE_DASHED)
 
 EOLIAN static void
@@ -367,13 +367,13 @@ _canvas_layout_user_text_collect(Edje *ed, Edje_User_Defined *eud)
 
       STYLE_COLOR_COLLECT(text_background, BACKING)
       STYLE_COLOR_COLLECT(text_glow, GLOW)
-      STYLE_COLOR_COLLECT(text_glow2, GLOW2)
+      STYLE_COLOR_COLLECT(text_secondary_glow, GLOW2)
       STYLE_COLOR_COLLECT(text, NORMAL)
       STYLE_COLOR_COLLECT(text_outline, OUTLINE)
       STYLE_COLOR_COLLECT(text_shadow, SHADOW)
       STYLE_COLOR_COLLECT(text_strikethrough, STRIKETHROUGH)
       STYLE_COLOR_COLLECT(text_underline, UNDERLINE)
-      STYLE_COLOR_COLLECT(text_underline2, UNDERLINE2)
+      STYLE_COLOR_COLLECT(text_secondary_underline, UNDERLINE2)
       STYLE_COLOR_COLLECT(text_underline_dashed, UNDERLINE_DASHED)
 #undef STYLE_COLOR_COLLECT
 
@@ -486,13 +486,13 @@ _canvas_layout_user_text_apply(Edje_User_Defined *eud, Eo *obj,
 
       STYLE_COLOR_CASE(text_background, BACKING)
       STYLE_COLOR_CASE(text_glow, GLOW)
-      STYLE_COLOR_CASE(text_glow2, GLOW2)
+      STYLE_COLOR_CASE(text_secondary_glow, GLOW2)
       STYLE_COLOR_CASE(text, NORMAL)
       STYLE_COLOR_CASE(text_outline, OUTLINE)
       STYLE_COLOR_CASE(text_shadow, SHADOW)
       STYLE_COLOR_CASE(text_strikethrough, STRIKETHROUGH)
       STYLE_COLOR_CASE(text_underline, UNDERLINE)
-      STYLE_COLOR_CASE(text_underline2, UNDERLINE2)
+      STYLE_COLOR_CASE(text_secondary_underline, UNDERLINE2)
       STYLE_COLOR_CASE(text_underline_dashed, UNDERLINE_DASHED)
 #undef STYLE_COLOR_CASE
 
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index 6c9c4cb06e..a0314f1906 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -45,7 +45,7 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font_Properties, Efl.Text_Style
       Efl.Text_Style.text_background_color { set; get;}
       Efl.Text_Style.text_underline_type { set; }
       Efl.Text_Style.text_underline_color { set; get; }
-      Efl.Text_Style.text_underline2_color { set; get; }
+      Efl.Text_Style.text_secondary_underline_color { set; get; }
       Efl.Text_Style.text_underline_dashed_color { set; get; }
       Efl.Text_Style.text_underline_height { set; }
       Efl.Text_Style.text_underline_dashed_width { set; }
@@ -57,6 +57,6 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font_Properties, Efl.Text_Style
       Efl.Text_Style.text_outline_color { set; get; }
       Efl.Text_Style.text_shadow_color { set; get; }
       Efl.Text_Style.text_glow_color { set; get; }
-      Efl.Text_Style.text_glow2_color { set; get; }
+      Efl.Text_Style.text_secondary_glow_color { set; get; }
    }
 }
diff --git a/src/lib/efl/interfaces/efl_text_style.eo b/src/lib/efl/interfaces/efl_text_style.eo
index 8807e047ac..a975ebdc96 100644
--- a/src/lib/efl/interfaces/efl_text_style.eo
+++ b/src/lib/efl/interfaces/efl_text_style.eo
@@ -156,7 +156,7 @@ interface @beta Efl.Text_Style {
          }
       }
 
-      @property text_underline2_color
+      @property text_secondary_underline_color
       {
          [[Color of the secondary underline. Only valid when @.text_underline_type is
            @Efl.Text_Style_Underline_Type.double.]]
@@ -241,7 +241,7 @@ interface @beta Efl.Text_Style {
          }
       }
 
-      @property text_glow2_color
+      @property text_secondary_glow_color
       {
          [[Color of the secondary glow decoration.
            This is the color of the inner glow (where it touches the text) which
diff --git a/src/lib/efl/interfaces/efl_text_types.eot b/src/lib/efl/interfaces/efl_text_types.eot
index c0451e03aa..d32ab8d2d3 100644
--- a/src/lib/efl/interfaces/efl_text_types.eot
+++ b/src/lib/efl/interfaces/efl_text_types.eot
@@ -18,8 +18,8 @@ struct @beta Efl.Text_Change_Info {
    content: string; [[The content added/removed]]
    position: size; [[The position where it was added/removed]]
    length: size; [[The length of content in characters (not bytes, actual unicode characters)]]
-   insert: bool; [[$true if the content was inserted, $false if removei]]
-   merge: bool; [[$true if can be merged with the previous one. Used for example with insertion when something is already selected]]
+   insertion: bool; [[$true if the content was inserted, $false if removed]]
+   mergeable: bool; [[$true if can be merged with the previous one. Used for example with insertion when something is already selected]]
 }
 
 struct @beta Efl.Text_Range {
@@ -28,5 +28,3 @@ struct @beta Efl.Text_Range {
    start: int; [[The start postion.]]
    end: int; [[The end position.]]
 }
-
-struct @extern @beta Efl.Text_Attribute_Handle; [[EFL text annotations data structure]]
\ No newline at end of file
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 4958a83582..3212632532 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -263,7 +263,7 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_
         if (changeinfo)
           {
              info = calloc(1, sizeof(*info));
-             info->insert = EINA_TRUE;
+             info->insertion = EINA_TRUE;
              info->content = eina_stringshare_add(text);
              info->length =
              eina_unicode_utf8_get_len(info->content);
@@ -272,7 +272,7 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_
           {
              if (have_sel)
                {
-                  info->merge = EINA_TRUE;
+                  info->mergeable = EINA_TRUE;
                }
              info->position =
                 efl_text_cursor_position_get(efl_text_interactive_main_cursor_get(obj));
@@ -589,7 +589,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
 
    tmp = efl_text_cursor_range_text_get(del_start, del_end);
 
-   info.insert = EINA_FALSE;
+   info.insertion = EINA_FALSE;
    info.position = start;
    info.length = end - start;
    info.content = tmp;
@@ -880,7 +880,7 @@ _range_del_emit(Evas_Object *obj, Efl_Text_Cursor *cur1, Efl_Text_Cursor *cur2)
    if (start == end)
       return;
 
-   info.insert = EINA_FALSE;
+   info.insertion = EINA_FALSE;
    info.position = start;
    info.length = end - start;
 
@@ -926,7 +926,7 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data
 
    Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 };
    char *tmp = NULL;
-   info.insert = EINA_FALSE;
+   info.insertion = EINA_FALSE;
    if (backspace)
      {
 
@@ -972,7 +972,7 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data
         evas_textblock_cursor_free(cc);
      }
 
-   info.insert = EINA_FALSE;
+   info.insertion = EINA_FALSE;
    info.position = pos;
    info.length = 1;
    info.content = tmp;
@@ -1452,9 +1452,9 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
              if (en->have_selection)
                {
                   _sel_range_del_emit(obj, en);
-                  info.merge = EINA_TRUE;
+                  info.mergeable = EINA_TRUE;
                }
-             info.insert = EINA_TRUE;
+             info.insertion = EINA_TRUE;
              info.content = string;
              info.position = efl_text_cursor_position_get(cur);
              info.length = eina_unicode_utf8_get_len(string);
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index aeff628640..dd25e39419 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -536,7 +536,7 @@ _selection_data_cb(void *data EINA_UNUSED, Eo *obj,
         efl_text_interactive_all_unselect(obj);
      }
    cur = efl_text_interactive_main_cursor_get(obj);
-   info.insert = EINA_TRUE;
+   info.insertion = EINA_TRUE;
    info.position = efl_text_cursor_position_get(cur);
    info.length = len;
    info.content = buf;
@@ -2199,7 +2199,7 @@ _efl_ui_textbox_selection_cut(Eo *obj, Efl_Ui_Textbox_Data *sd)
    start_pos = efl_text_cursor_position_get(start);
    end_pos = efl_text_cursor_position_get(end);
    tmp = efl_text_cursor_range_text_get(start, end);
-   info.insert = EINA_FALSE;
+   info.insertion = EINA_FALSE;
    info.position = start_pos;
    info.length = end_pos - start_pos;
    info.content = tmp;
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo
index d66ee55fec..72cd8a693e 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock.eo
@@ -149,10 +149,10 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
              Requires $underline.
              See @Efl.Text_Style.text_underline_color.
 
-           - $underline2_color: Color code for the secondary text underline (See bottom for the complete list of
+           - $secondary_underline_color: Color code for the secondary text underline (See bottom for the complete list of
              supported codes). Only valid when $[underline=double].
              Default value is $[rgba(0,0,0,0)] meaning that secondary underline will not be rendered.
-             See @Efl.Text_Style.text_underline2_color.
+             See @Efl.Text_Style.text_secondary_underline_color.
 
            - $underline_dash_color: Color code for the dashed underline (See bottom for the complete list of supported
              codes). Only valid when $[underline=dashed].
@@ -174,10 +174,10 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
              Default value is $[rgba(0,0,0,0)] meaning that no glow will be rendered.
              See @Efl.Text_Style.text_glow_color.
 
-           - $glow2_color: Color code for the secondary (inner) glow component of the text (See bottom for the complete
+           - $secondary_glow_color: Color code for the secondary (inner) glow component of the text (See bottom for the complete
              list of supported codes). Only valid when the $style attribute includes a glow.
              Default value is $[rgba(0,0,0,0)] meaning that only the primary $glow_color will be used.
-             See @Efl.Text_Style.text_glow2_color.
+             See @Efl.Text_Style.text_secondary_glow_color.
 
            - $backing_color: Color code for the background of the text (See bottom for the complete list of supported
              codes). Use a fully transparent color to disable the background.
@@ -232,7 +232,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
              $single (A single line under the text), $on (Alias for $single), $double (Two lines under the text),
              $dashed (A dashed line under the text).
              Default value is $off.
-             Requires either $underline_color, $underline2_color or $underline_dash_color.
+             Requires either $underline_color, $secondary_underline_color or $underline_dash_color.
              See @Efl.Text_Style.text_underline_type.
 
            - $strikethrough: Enables crossed-out text. Possible values are $on and $off.
@@ -473,7 +473,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
       Efl.Text_Style.text_underline_dashed_color { get; set; }
       Efl.Text_Style.text_underline_dashed_width { get; set; }
       Efl.Text_Style.text_underline_dashed_gap { get; set; }
-      Efl.Text_Style.text_underline2_color { get; set; }
+      Efl.Text_Style.text_secondary_underline_color { get; set; }
       Efl.Text_Style.text_strikethrough_type { get; set; }
       Efl.Text_Style.text_strikethrough_color { get; set; }
       Efl.Text_Style.text_effect_type { get; set; }
@@ -481,7 +481,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
       Efl.Text_Style.text_shadow_direction { get; set; }
       Efl.Text_Style.text_shadow_color { get; set; }
       Efl.Text_Style.text_glow_color { get; set; }
-      Efl.Text_Style.text_glow2_color { get; set; }
+      Efl.Text_Style.text_secondary_glow_color { get; set; }
       Efl.Text_Style.text_gfx_filter { get; set; }
       Efl.Text_Format.ellipsis { get; set; }
       Efl.Text_Format.wrap { get; set; }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 3c0d5bf1d1..1dcad334c6 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -1398,11 +1398,13 @@ static const char *langstr = NULL;
 static const char *colorstr = NULL;
 static const char *underline_colorstr = NULL;
 static const char *underline2_colorstr = NULL;
+static const char *secondary_underline_colorstr = NULL;
 static const char *underline_dash_colorstr = NULL;
 static const char *outline_colorstr = NULL;
 static const char *shadow_colorstr = NULL;
 static const char *glow_colorstr = NULL;
 static const char *glow2_colorstr = NULL;
+static const char *secondary_glow_colorstr = NULL;
 static const char *backing_colorstr = NULL;
 static const char *strikethrough_colorstr = NULL;
 static const char *alignstr = NULL;
@@ -1585,11 +1587,13 @@ _format_command_init(void)
         colorstr = eina_stringshare_add("color");
         underline_colorstr = eina_stringshare_add("underline_color");
         underline2_colorstr = eina_stringshare_add("underline2_color");
+        secondary_underline_colorstr = eina_stringshare_add("secondary_underline_color");
         underline_dash_colorstr = eina_stringshare_add("underline_dash_color");
         outline_colorstr = eina_stringshare_add("outline_color");
         shadow_colorstr = eina_stringshare_add("shadow_color");
         glow_colorstr = eina_stringshare_add("glow_color");
         glow2_colorstr = eina_stringshare_add("glow2_color");
+        secondary_glow_colorstr = eina_stringshare_add("secondary_glow_color");
         backing_colorstr = eina_stringshare_add("backing_color");
         strikethrough_colorstr = eina_stringshare_add("strikethrough_color");
         alignstr = eina_stringshare_add("align");
@@ -1640,11 +1644,13 @@ _format_command_shutdown(void)
    eina_stringshare_del(colorstr);
    eina_stringshare_del(underline_colorstr);
    eina_stringshare_del(underline2_colorstr);
+   eina_stringshare_del(secondary_underline_colorstr);
    eina_stringshare_del(underline_dash_colorstr);
    eina_stringshare_del(outline_colorstr);
    eina_stringshare_del(shadow_colorstr);
    eina_stringshare_del(glow_colorstr);
    eina_stringshare_del(glow2_colorstr);
+   eina_stringshare_del(secondary_glow_colorstr);
    eina_stringshare_del(backing_colorstr);
    eina_stringshare_del(strikethrough_colorstr);
    eina_stringshare_del(alignstr);
@@ -1936,7 +1942,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
      evas_common_format_color_parse(param, len,
            &(fmt->color.underline.r), &(fmt->color.underline.g),
            &(fmt->color.underline.b), &(fmt->color.underline.a));
-   else if (cmd == underline2_colorstr)
+   else if (cmd == underline2_colorstr || cmd == secondary_underline_colorstr)
      /**
       * @page evas_textblock_style_page Evas Textblock Style Options
       *
@@ -2045,7 +2051,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
      evas_common_format_color_parse(param, len,
            &(fmt->color.glow.r), &(fmt->color.glow.g),
            &(fmt->color.glow.b), &(fmt->color.glow.a));
-   else if (cmd == glow2_colorstr)
+   else if (cmd == glow2_colorstr || cmd == secondary_glow_colorstr)
      /**
       * @page evas_textblock_style_page Evas Textblock Style Options
       *
@@ -16497,14 +16503,14 @@ _efl_canvas_textblock_efl_text_style_text_underline_dashed_gap_get(const Eo *obj
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_text_underline2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_efl_canvas_textblock_efl_text_style_text_secondary_underline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(underline2);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_text_underline2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_efl_canvas_textblock_efl_text_style_text_secondary_underline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(underline2);
 }
@@ -16671,14 +16677,14 @@ _efl_canvas_textblock_efl_text_style_text_glow_color_get(const Eo *obj EINA_UNUS
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_text_glow2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
+_efl_canvas_textblock_efl_text_style_text_secondary_glow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
 {
    ASYNC_BLOCK;
    _FMT_COLOR_SET(glow2);
 }
 
 static void
-_efl_canvas_textblock_efl_text_style_text_glow2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
+_efl_canvas_textblock_efl_text_style_text_secondary_glow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
 {
    _FMT_COLOR_RET(glow2);
 }
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo
index 87b93ccd9c..c154500244 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_double_tap.eo
@@ -3,6 +3,8 @@ class @beta Efl.Canvas.Gesture_Double_Tap extends Efl.Canvas.Gesture
    [[Double-tap gesture class holding state information.
      See @Efl.Canvas.Gesture to see what this state is and
      @[Efl.Gesture.Events.gesture,double_tap] for a description of the Double-tap gesture.
+
+     Application developers receive these objects inside a gesture event and do not typically need to create their own.
    ]]
    data: null;
    c_prefix: efl_gesture_double_tap;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_flick.eo b/src/lib/evas/gesture/efl_canvas_gesture_flick.eo
index afc8391550..125a538cc9 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_flick.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_flick.eo
@@ -5,6 +5,8 @@ class @beta Efl.Canvas.Gesture_Flick extends Efl.Canvas.Gesture
    [[Flick gesture class holding state information.
      See @Efl.Canvas.Gesture to see what this state is and
      @[Efl.Gesture.Events.gesture,flick] for a description of the Flick gesture.
+
+     Application developers receive these objects inside a gesture event and do not typically need to create their own.
    ]]
    c_prefix: efl_gesture_flick;
    methods {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
index 6c0d0c979d..c182697a58 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
@@ -3,6 +3,8 @@ class @beta Efl.Canvas.Gesture_Long_Tap extends Efl.Canvas.Gesture
    [[Long-tap gesture class holding state information.
      See @Efl.Canvas.Gesture to see what this state is and
      @[Efl.Gesture.Events.gesture,long_tap] for a description of the Long-tap gesture.
+
+     Application developers receive these objects inside a gesture event and do not typically need to create their own.
    ]]
    data: null;
    c_prefix: efl_gesture_long_tap;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.c b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
index d5103186e1..a2d3077404 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
@@ -182,7 +182,7 @@ _efl_canvas_gesture_manager_filter_event(void *data, Eo *target, void *event)
 
              //This is for handling the case that mouse event pairs dont match.
 			 //Such as the case of canceling gesture recognition after a mouse down.
-             if (efl_gesture_touch_state_get(touch_event) == EFL_GESTURE_TOUCH_UNKNOWN)
+             if (efl_gesture_touch_state_get(touch_event) == EFL_GESTURE_TOUCH_STATE_UNKNOWN)
                continue;
 
              recognizer = eina_hash_find(pd->m_recognizers, &gesture_type);
@@ -194,30 +194,30 @@ _efl_canvas_gesture_manager_filter_event(void *data, Eo *target, void *event)
 
 			 //Gesture detecting.
              recog_result = efl_gesture_recognizer_recognize(recognizer, gesture, target, touch_event);
-             recog_state = recog_result & EFL_GESTURE_RESULT_MASK;
+             recog_state = recog_result & EFL_GESTURE_RECOGNIZER_RESULT_RESULT_MASK;
 
              Efl_Canvas_Gesture_Recognizer_Data *rd =
                efl_data_scope_get(recognizer, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
 
-             if (recog_state == EFL_GESTURE_TRIGGER)
+             if (recog_state == EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER)
                {
-                  if (efl_gesture_state_get(gesture) == EFL_GESTURE_NONE)
-                    efl_gesture_state_set(gesture, EFL_GESTURE_STARTED);
+                  if (efl_gesture_state_get(gesture) == EFL_GESTURE_STATE_NONE)
+                    efl_gesture_state_set(gesture, EFL_GESTURE_STATE_STARTED);
                   else
-                    efl_gesture_state_set(gesture, EFL_GESTURE_UPDATED);
+                    efl_gesture_state_set(gesture, EFL_GESTURE_STATE_UPDATED);
                }
-             else if (recog_state == EFL_GESTURE_FINISH)
+             else if (recog_state == EFL_GESTURE_RECOGNIZER_RESULT_FINISH)
                {
-                  efl_gesture_state_set(gesture, EFL_GESTURE_FINISHED);
+                  efl_gesture_state_set(gesture, EFL_GESTURE_STATE_FINISHED);
                }
-             else if (recog_state == EFL_GESTURE_MAYBE)
+             else if (recog_state == EFL_GESTURE_RECOGNIZER_RESULT_MAYBE)
                {
                   continue;
                }
-             else if (recog_state == EFL_GESTURE_CANCEL)
+             else if (recog_state == EFL_GESTURE_RECOGNIZER_RESULT_CANCEL)
                {
-                  if (efl_gesture_state_get(gesture) != EFL_GESTURE_NONE)
-                    efl_gesture_state_set(gesture, EFL_GESTURE_CANCELED);
+                  if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE)
+                    efl_gesture_state_set(gesture, EFL_GESTURE_STATE_CANCELED);
                   else
                     {
                        //Need to recognize events that occur consecutively
@@ -226,7 +226,7 @@ _efl_canvas_gesture_manager_filter_event(void *data, Eo *target, void *event)
                          continue;
                     }
                }
-             else if (recog_state == EFL_GESTURE_IGNORE)
+             else if (recog_state == EFL_GESTURE_RECOGNIZER_RESULT_IGNORE)
                {
                   continue;
                }
@@ -235,7 +235,7 @@ _efl_canvas_gesture_manager_filter_event(void *data, Eo *target, void *event)
              efl_event_callback_call(target, gesture_type, gesture);
 
              //If the current event recognizes the gesture continuously, dont delete gesture.
-             if (((recog_state == EFL_GESTURE_FINISH) || (recog_state == EFL_GESTURE_CANCEL)) &&
+             if (((recog_state == EFL_GESTURE_RECOGNIZER_RESULT_FINISH) || (recog_state == EFL_GESTURE_RECOGNIZER_RESULT_CANCEL)) &&
                  !rd->continues)
                {
                   _cleanup_cached_gestures(pd, target, gesture_type);
@@ -314,37 +314,37 @@ _find_match_recognizer(Efl_Canvas_Gesture_Manager_Data *pd, Efl_Canvas_Gesture_R
 
    switch (type)
      {
-       case EFL_GESTURE_TAP:
+       case EFL_GESTURE_RECOGNIZER_TYPE_TAP:
          {
             event_type = EFL_EVENT_GESTURE_TAP;
             break;
          }
-       case EFL_GESTURE_DOUBLETAP:
+       case EFL_GESTURE_RECOGNIZER_TYPE_DOUBLETAP:
          {
             event_type = EFL_EVENT_GESTURE_DOUBLE_TAP;
             break;
          }
-       case EFL_GESTURE_TRIPLETAP:
+       case EFL_GESTURE_RECOGNIZER_TYPE_TRIPLETAP:
          {
             event_type = EFL_EVENT_GESTURE_TRIPLE_TAP;
             break;
          }
-       case EFL_GESTURE_LONGTAP:
+       case EFL_GESTURE_RECOGNIZER_TYPE_LONGTAP:
          {
             event_type = EFL_EVENT_GESTURE_LONG_TAP;
             break;
          }
-       case EFL_GESTURE_MOMENTUM:
+       case EFL_GESTURE_RECOGNIZER_TYPE_MOMENTUM:
          {
             event_type = EFL_EVENT_GESTURE_MOMENTUM;
             break;
          }
-       case EFL_GESTURE_FLICK:
+       case EFL_GESTURE_RECOGNIZER_TYPE_FLICK:
          {
             event_type = EFL_EVENT_GESTURE_FLICK;
             break;
          }
-       case EFL_GESTURE_ZOOM:
+       case EFL_GESTURE_RECOGNIZER_TYPE_ZOOM:
          {
             event_type = EFL_EVENT_GESTURE_ZOOM;
             break;
@@ -410,8 +410,8 @@ _get_state(Efl_Canvas_Gesture_Manager_Data *pd,
             object_gesture->type == type)
          {
             //The gesture is already processed waiting for cleanup
-            if (((efl_gesture_state_get(object_gesture->gesture) == EFL_GESTURE_FINISHED) ||
-                (efl_gesture_state_get(object_gesture->gesture) == EFL_GESTURE_CANCELED)) &&
+            if (((efl_gesture_state_get(object_gesture->gesture) == EFL_GESTURE_STATE_FINISHED) ||
+                (efl_gesture_state_get(object_gesture->gesture) == EFL_GESTURE_STATE_CANCELED)) &&
                 (!rd->continues))
               {
                  _cleanup_cached_gestures(pd, target, type);
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_momentum.eo b/src/lib/evas/gesture/efl_canvas_gesture_momentum.eo
index 0f78ad69aa..df0e0720db 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_momentum.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_momentum.eo
@@ -5,6 +5,8 @@ class @beta Efl.Canvas.Gesture_Momentum extends Efl.Canvas.Gesture
    [[Momentum gesture class holding state information.
      See @Efl.Canvas.Gesture to see what this state is and
      @[Efl.Gesture.Events.gesture,momentum] for a description of the Momentum gesture.
+
+     Application developers receive these objects inside a gesture event and do not typically need to create their own.
    ]]
    c_prefix: efl_gesture_momentum;
    methods {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.c
index 8a83e2f945..e7c242b11c 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.c
@@ -2,7 +2,7 @@
 
 #define MY_CLASS EFL_CANVAS_GESTURE_RECOGNIZER_CLASS
 
-#define EFL_GESTURE_TAP_FINGER_SIZE 10
+#define EFL_GESTURE_RECOGNIZER_TYPE_TAP_FINGER_SIZE 10
 EOLIAN static Eina_Value *
 _efl_canvas_gesture_recognizer_config_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Recognizer_Data *pd, const char *name)
 {
@@ -21,7 +21,7 @@ _efl_canvas_gesture_recognizer_efl_object_constructor(Eo *obj, Efl_Canvas_Gestur
 {
    obj = efl_constructor(efl_super(obj, MY_CLASS));
 
-   pd->finger_size = EFL_GESTURE_TAP_FINGER_SIZE;
+   pd->finger_size = EFL_GESTURE_RECOGNIZER_TYPE_TAP_FINGER_SIZE;
 
    return obj;
 }
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c
index 1656bb633f..4319ab77b0 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c
@@ -29,7 +29,7 @@ _tap_timeout_cb(void *data)
    rd = efl_data_scope_get(data, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
    pd = efl_data_scope_get(data, EFL_CANVAS_GESTURE_RECOGNIZER_DOUBLE_TAP_CLASS);
 
-   efl_gesture_state_set(pd->gesture, EFL_GESTURE_CANCELED);
+   efl_gesture_state_set(pd->gesture, EFL_GESTURE_STATE_CANCELED);
    efl_event_callback_call(pd->target, EFL_EVENT_GESTURE_DOUBLE_TAP, pd->gesture);
 
    efl_gesture_manager_gesture_clean_up(rd->manager, pd->target, EFL_EVENT_GESTURE_DOUBLE_TAP);
@@ -50,7 +50,7 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
    double timeout = TAP_TIME_OUT;
    Eina_Position2D pos;
    Eina_Vector2 dist;
-   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_CANCEL;
+   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
    Efl_Canvas_Gesture_Recognizer_Data *rd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
 
    pd->target = watched;
@@ -72,7 +72,7 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
 
    switch (efl_gesture_touch_state_get(event))
      {
-      case EFL_GESTURE_TOUCH_BEGIN:
+      case EFL_GESTURE_TOUCH_STATE_BEGIN:
            {
               pos = efl_gesture_touch_start_point_get(event);
               efl_gesture_hotspot_set(gesture, pos);
@@ -82,16 +82,16 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
               else
                 pd->timeout = ecore_timer_add(timeout, _tap_timeout_cb, obj);
 
-              result = EFL_GESTURE_TRIGGER;
+              result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
               break;
            }
 
-      case EFL_GESTURE_TOUCH_UPDATE:
+      case EFL_GESTURE_TOUCH_STATE_UPDATE:
            {
-              result = EFL_GESTURE_IGNORE;
+              result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
 
-              if (efl_gesture_state_get(gesture) != EFL_GESTURE_NONE &&
+              if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
                   !efl_gesture_touch_multi_touch_get(event))
                 {
                    dist = efl_gesture_touch_distance(event, 0);
@@ -105,7 +105,7 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
                              pd->timeout = NULL;
                           }
 
-                        result = EFL_GESTURE_CANCEL;
+                        result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
 
                         pd->tap_count = 0;
                      }
@@ -113,10 +113,10 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
 
               break;
            }
-      case EFL_GESTURE_TOUCH_END:
+      case EFL_GESTURE_TOUCH_STATE_END:
            {
 
-              if (efl_gesture_state_get(gesture) != EFL_GESTURE_NONE &&
+              if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
                   !efl_gesture_touch_multi_touch_get(event))
                 {
                    dist = efl_gesture_touch_distance(event, 0);
@@ -130,7 +130,7 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
                              if (pd->timeout)
                                ecore_timer_reset(pd->timeout);
 
-                             result = EFL_GESTURE_TRIGGER;
+                             result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
                           }
                         else
                           {
@@ -140,10 +140,10 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
                                   pd->timeout = NULL;
                                }
 
-                             if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_END)
-                               result = EFL_GESTURE_FINISH;
+                             if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_END)
+                               result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
                              else
-                               result = EFL_GESTURE_TRIGGER;
+                               result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
                              pd->tap_count = 0;
                           }
@@ -156,7 +156,7 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
                              pd->timeout = NULL;
                           }
 
-                        result = EFL_GESTURE_CANCEL;
+                        result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
 
                         pd->tap_count = 0;
                      }
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c
index 4968c61b34..dee7ca364d 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c
@@ -70,8 +70,8 @@ _single_line_process(Eo *obj,
 {
    switch (efl_gesture_touch_state_get(event))
      {
-       case EFL_GESTURE_TOUCH_BEGIN:
-       case EFL_GESTURE_TOUCH_UPDATE:
+       case EFL_GESTURE_TOUCH_STATE_BEGIN:
+       case EFL_GESTURE_TOUCH_STATE_UPDATE:
          if (!pd->t_st)
            {
               pd->st_line = efl_gesture_touch_cur_point_get(event);
@@ -84,7 +84,7 @@ _single_line_process(Eo *obj,
 
          break;
 
-       case EFL_GESTURE_TOUCH_END:
+       case EFL_GESTURE_TOUCH_STATE_END:
          {
             if (!pd->t_st) return;
 
@@ -177,7 +177,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
    double angle;
    Eina_Value *val;
    unsigned char glayer_continues_enable;
-   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_CANCEL;
+   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
    Eina_Bool touch_up = EINA_FALSE;
    Efl_Canvas_Gesture_Flick_Data *fd = efl_data_scope_get(gesture, EFL_CANVAS_GESTURE_FLICK_CLASS);
    Efl_Canvas_Gesture_Recognizer_Data *rd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
@@ -190,14 +190,14 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
    //without mouse up.
    //Recognizing the gesture again, even though it was canceled during gesture
    //recognition.
-   if (efl_gesture_state_get(gesture) == EFL_GESTURE_CANCELED)
-     efl_gesture_state_set(gesture, EFL_GESTURE_NONE);
+   if (efl_gesture_state_get(gesture) == EFL_GESTURE_STATE_CANCELED)
+     efl_gesture_state_set(gesture, EFL_GESTURE_STATE_NONE);
 
-   if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_END)
+   if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_END)
      touch_up = EINA_TRUE;
 
    //This is to handle a case with a mouse click on the target object.
-   if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_END && !pd->touched)
+   if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_END && !pd->touched)
      efl_gesture_manager_gesture_clean_up(rd->manager, watched, EFL_EVENT_GESTURE_FLICK);
 
    if (glayer_continues_enable && !pd->touched)
@@ -206,7 +206,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
        pd->line_angle = -1.0;
        rd->continues = EINA_TRUE;
 
-       return EFL_GESTURE_IGNORE;
+       return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
      }
 
    _single_line_process(obj, pd, gesture, fd, event);
@@ -238,7 +238,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
 
                   if (touch_up) rd->continues = EINA_FALSE;
 
-                  return EFL_GESTURE_CANCEL;
+                  return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
                }
 
              /* We may finish line if momentum is zero */
@@ -273,7 +273,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
 
                   if (touch_up) rd->continues = EINA_FALSE;
 
-                  return EFL_GESTURE_CANCEL;
+                  return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
                }
           }
      }
@@ -296,42 +296,42 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
 
      if (touch_up) rd->continues = EINA_FALSE;
 
-     return EFL_GESTURE_CANCEL;
+     return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
    }
 
    switch (efl_gesture_touch_state_get(event))
      {
-      case EFL_GESTURE_TOUCH_BEGIN:
-      case EFL_GESTURE_TOUCH_UPDATE:
+      case EFL_GESTURE_TOUCH_STATE_BEGIN:
+      case EFL_GESTURE_TOUCH_STATE_UPDATE:
         {
            if (pd->t_st)
              {
                 if (glayer_continues_enable && pd->t_end)
                   {
-                     result = EFL_GESTURE_FINISH;
+                     result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
                   }
                 else
                   {
-                     result = EFL_GESTURE_TRIGGER;
+                     result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
                   }
              }
            break;
         }
 
-      case EFL_GESTURE_TOUCH_END:
+      case EFL_GESTURE_TOUCH_STATE_END:
         {
            if (!pd->t_st)
              {
                 pd->touched = EINA_FALSE;
                 rd->continues = EINA_FALSE;
 
-                return EFL_GESTURE_CANCEL;
+                return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
              }
            if (pd->t_st && pd->t_end)
              {
                 rd->continues = EINA_FALSE;
 
-                result = EFL_GESTURE_FINISH;
+                result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
              }
 
            efl_gesture_hotspot_set(gesture, efl_gesture_touch_cur_point_get(event));
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c
index 8f6773588b..f936a37dca 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c
@@ -30,7 +30,7 @@ _long_tap_timeout_cb(void *data)
    /* FIXME: Needs to propagate this event back to evas! */
    pd->is_timeout = EINA_TRUE;
 
-   efl_gesture_state_set(pd->gesture, EFL_GESTURE_UPDATED);
+   efl_gesture_state_set(pd->gesture, EFL_GESTURE_STATE_UPDATED);
    efl_event_callback_call(pd->target, EFL_EVENT_GESTURE_LONG_TAP, pd->gesture);
 
    return ECORE_CALLBACK_RENEW;
@@ -47,7 +47,7 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
    double timeout = EFL_GESTURE_LONG_TAP_TIME_OUT;
    Eina_Position2D pos;
    Eina_Vector2 dist;
-   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_CANCEL;
+   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
    Efl_Canvas_Gesture_Recognizer_Data *rd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
 
    pd->target = watched;
@@ -70,7 +70,7 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
 
    switch (efl_gesture_touch_state_get(event))
      {
-      case EFL_GESTURE_TOUCH_BEGIN:
+      case EFL_GESTURE_TOUCH_STATE_BEGIN:
         {
            pos = efl_gesture_touch_start_point_get(event);
            efl_gesture_hotspot_set(gesture, pos);
@@ -82,12 +82,12 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
            pd->timeout = ecore_timer_add(timeout,
                                          _long_tap_timeout_cb, pd);
 
-           result = EFL_GESTURE_TRIGGER;
+           result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
            break;
         }
 
-      case EFL_GESTURE_TOUCH_UPDATE:
+      case EFL_GESTURE_TOUCH_STATE_UPDATE:
         {
            dist = efl_gesture_touch_distance(event, 0);
            length = fabs(dist.x) + fabs(dist.y);
@@ -100,17 +100,17 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
                      pd->timeout = NULL;
                   }
 
-                result = EFL_GESTURE_CANCEL;
+                result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
              }
            else
              {
-                result = EFL_GESTURE_MAYBE;
+                result = EFL_GESTURE_RECOGNIZER_RESULT_MAYBE;
              }
 
            break;
         }
 
-      case EFL_GESTURE_TOUCH_END:
+      case EFL_GESTURE_TOUCH_STATE_END:
         {
            if (pd->timeout)
              {
@@ -118,18 +118,18 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
                 pd->timeout = NULL;
              }
 
-           if (efl_gesture_state_get(gesture) != EFL_GESTURE_NONE &&
+           if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
                !efl_gesture_touch_multi_touch_get(event))
              {
                 dist = efl_gesture_touch_distance(event, 0);
                 length = fabs(dist.x) + fabs(dist.y);
                 if (length <= rd->finger_size && pd->is_timeout)
                   {
-                     result = EFL_GESTURE_FINISH;
+                     result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
                   }
                 else
                   {
-                     result = EFL_GESTURE_CANCEL;
+                     result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
                   }
              }
 
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c
index 2e007cc0f9..9926f92087 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c
@@ -76,7 +76,7 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
 {
    Eina_Value *val;
    unsigned char glayer_continues_enable;
-   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_CANCEL;
+   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
    Efl_Canvas_Gesture_Momentum_Data *md = efl_data_scope_get(gesture, EFL_CANVAS_GESTURE_MOMENTUM_CLASS);
 
    val = efl_gesture_recognizer_config_get(obj, "glayer_continues_enable");
@@ -89,17 +89,17 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
      {
        pd->touched = EINA_TRUE;
 
-	   return EFL_GESTURE_IGNORE;
+	   return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
 	 }
 
    switch (efl_gesture_touch_state_get(event))
      {
-      case EFL_GESTURE_TOUCH_BEGIN:
-      case EFL_GESTURE_TOUCH_UPDATE:
+      case EFL_GESTURE_TOUCH_STATE_BEGIN:
+      case EFL_GESTURE_TOUCH_STATE_UPDATE:
         {
            if (!pd->t_st)
              {
-                if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_BEGIN ||
+                if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_BEGIN ||
                     glayer_continues_enable)
                   {
                      pd->t_st = pd->t_end =  efl_gesture_touch_cur_timestamp_get(event);
@@ -109,7 +109,7 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
 
                      efl_gesture_hotspot_set(gesture, pd->st_line);
 
-                     return EFL_GESTURE_TRIGGER;
+                     return EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
                   }
              }
 
@@ -150,18 +150,18 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
            _momentum_set(obj, md, pd->st_line, efl_gesture_touch_cur_point_get(event),
                          pd->t_st, efl_gesture_touch_cur_timestamp_get(event));
 
-           result = EFL_GESTURE_TRIGGER;
+           result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
            break;
         }
 
-      case EFL_GESTURE_TOUCH_END:
+      case EFL_GESTURE_TOUCH_STATE_END:
         {
            if (!pd->t_st)
              {
                 pd->touched = EINA_FALSE;
 
-                return EFL_GESTURE_CANCEL;
+                return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
              }
 
            if ((efl_gesture_touch_cur_timestamp_get(event) - MOMENTUM_TIMEOUT) > pd->t_end)
@@ -177,9 +177,9 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
 
            if ((fabs(md->momentum.x) > EFL_GESTURE_MINIMUM_MOMENTUM) ||
                (fabs(md->momentum.y) > EFL_GESTURE_MINIMUM_MOMENTUM))
-                result = EFL_GESTURE_FINISH;
+                result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
            else
-                result = EFL_GESTURE_CANCEL;
+                result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
 
            memset(pd, 0, sizeof(Efl_Canvas_Gesture_Recognizer_Momentum_Data));
 
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c
index 8f53a0585a..5f99d713d4 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c
@@ -4,7 +4,7 @@
 
 //FIXME: It doesnt have matched config value.
 //       may using dobule tap timeout value?
-#define EFL_GESTURE_TAP_TIME_OUT 0.33
+#define EFL_GESTURE_RECOGNIZER_TYPE_TAP_TIME_OUT 0.33
 
 EOLIAN static Efl_Canvas_Gesture *
 _efl_canvas_gesture_recognizer_tap_efl_canvas_gesture_recognizer_add(Eo *obj,
@@ -19,7 +19,7 @@ _tap_timeout_cb(void *data)
 {
    Efl_Canvas_Gesture_Recognizer_Tap_Data *pd = data;
 
-   efl_gesture_state_set(pd->gesture, EFL_GESTURE_CANCELED);
+   efl_gesture_state_set(pd->gesture, EFL_GESTURE_STATE_CANCELED);
    efl_event_callback_call(pd->target, EFL_EVENT_GESTURE_TAP, pd->gesture);
 
    return ECORE_CALLBACK_CANCEL;
@@ -36,7 +36,7 @@ _efl_canvas_gesture_recognizer_tap_efl_canvas_gesture_recognizer_recognize(Eo *o
    double length;
    Eina_Position2D pos;
    Eina_Vector2 dist;
-   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_CANCEL;
+   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
    Efl_Canvas_Gesture_Recognizer_Data *rd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
 
    pd->target = watched;
@@ -44,22 +44,22 @@ _efl_canvas_gesture_recognizer_tap_efl_canvas_gesture_recognizer_recognize(Eo *o
 
    switch (efl_gesture_touch_state_get(event))
      {
-      case EFL_GESTURE_TOUCH_BEGIN:
+      case EFL_GESTURE_TOUCH_STATE_BEGIN:
         {
            pos = efl_gesture_touch_start_point_get(event);
            efl_gesture_hotspot_set(gesture, pos);
 
            if (pd->timeout)
              ecore_timer_del(pd->timeout);
-           pd->timeout = ecore_timer_add(EFL_GESTURE_TAP_TIME_OUT, _tap_timeout_cb, pd);
+           pd->timeout = ecore_timer_add(EFL_GESTURE_RECOGNIZER_TYPE_TAP_TIME_OUT, _tap_timeout_cb, pd);
 
-           result = EFL_GESTURE_TRIGGER;
+           result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
            break;
         }
 
-      case EFL_GESTURE_TOUCH_UPDATE:
-      case EFL_GESTURE_TOUCH_END:
+      case EFL_GESTURE_TOUCH_STATE_UPDATE:
+      case EFL_GESTURE_TOUCH_STATE_END:
         {
            if (pd->timeout)
              {
@@ -67,17 +67,17 @@ _efl_canvas_gesture_recognizer_tap_efl_canvas_gesture_recognizer_recognize(Eo *o
                 pd->timeout = NULL;
              }
 
-           if (efl_gesture_state_get(gesture) != EFL_GESTURE_NONE &&
+           if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
                !efl_gesture_touch_multi_touch_get(event))
              {
                 dist = efl_gesture_touch_distance(event, 0);
                 length = fabs(dist.x) + fabs(dist.y);
                 if (length <= rd->finger_size)
                   {
-                     if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_END)
-                       result = EFL_GESTURE_FINISH;
+                     if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_END)
+                       result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
                      else
-                       result = EFL_GESTURE_TRIGGER;
+                       result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
                   }
              }
 
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c
index cd54d45886..04f2c28951 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c
@@ -29,7 +29,7 @@ _tap_timeout_cb(void *data)
    rd = efl_data_scope_get(data, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
    pd = efl_data_scope_get(data, EFL_CANVAS_GESTURE_RECOGNIZER_TRIPLE_TAP_CLASS);
 
-   efl_gesture_state_set(pd->gesture, EFL_GESTURE_CANCELED);
+   efl_gesture_state_set(pd->gesture, EFL_GESTURE_STATE_CANCELED);
    efl_event_callback_call(pd->target, EFL_EVENT_GESTURE_TRIPLE_TAP, pd->gesture);
 
    efl_gesture_manager_gesture_clean_up(rd->manager, pd->target, EFL_EVENT_GESTURE_TRIPLE_TAP);
@@ -50,7 +50,7 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
    double timeout = TAP_TIME_OUT;
    Eina_Position2D pos;
    Eina_Vector2 dist;
-   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_CANCEL;
+   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
    Efl_Canvas_Gesture_Recognizer_Data *rd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
 
    pd->target = watched;
@@ -72,7 +72,7 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
 
    switch (efl_gesture_touch_state_get(event))
      {
-      case EFL_GESTURE_TOUCH_BEGIN:
+      case EFL_GESTURE_TOUCH_STATE_BEGIN:
            {
               pos = efl_gesture_touch_start_point_get(event);
               efl_gesture_hotspot_set(gesture, pos);
@@ -82,16 +82,16 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
               else
                 pd->timeout = ecore_timer_add(timeout, _tap_timeout_cb, obj);
 
-              result = EFL_GESTURE_TRIGGER;
+              result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
               break;
            }
 
-      case EFL_GESTURE_TOUCH_UPDATE:
+      case EFL_GESTURE_TOUCH_STATE_UPDATE:
            {
-              result = EFL_GESTURE_IGNORE;
+              result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
 
-              if (efl_gesture_state_get(gesture) != EFL_GESTURE_NONE &&
+              if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
                   !efl_gesture_touch_multi_touch_get(event))
                 {
                    dist = efl_gesture_touch_distance(event, 0);
@@ -105,7 +105,7 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
                              pd->timeout = NULL;
                           }
 
-                        result = EFL_GESTURE_CANCEL;
+                        result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
 
                         pd->tap_count = 0;
                      }
@@ -113,10 +113,10 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
 
               break;
            }
-      case EFL_GESTURE_TOUCH_END:
+      case EFL_GESTURE_TOUCH_STATE_END:
            {
 
-              if (efl_gesture_state_get(gesture) != EFL_GESTURE_NONE &&
+              if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
                   !efl_gesture_touch_multi_touch_get(event))
                 {
                    dist = efl_gesture_touch_distance(event, 0);
@@ -130,7 +130,7 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
                              if (pd->timeout)
                                ecore_timer_reset(pd->timeout);
 
-                             result = EFL_GESTURE_TRIGGER;
+                             result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
                           }
                         else
                           {
@@ -140,10 +140,10 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
                                   pd->timeout = NULL;
                                }
 
-                             if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_END)
-                               result = EFL_GESTURE_FINISH;
+                             if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_END)
+                               result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
                              else
-                               result = EFL_GESTURE_TRIGGER;
+                               result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
                              pd->tap_count = 0;
                           }
@@ -156,7 +156,7 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
                              pd->timeout = NULL;
                           }
 
-                        result = EFL_GESTURE_CANCEL;
+                        result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
 
                         pd->tap_count = 0;
                      }
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.c
index 0bd41f55b6..504b3c3bcf 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.c
@@ -131,7 +131,7 @@ _efl_canvas_gesture_recognizer_zoom_efl_canvas_gesture_recognizer_recognize(Eo *
    Eina_Value *val;
    unsigned char zoom_finger_enable;
    unsigned char glayer_continues_enable;
-   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_CANCEL;
+   Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
    Efl_Canvas_Gesture_Zoom_Data *zd = efl_data_scope_get(gesture, EFL_CANVAS_GESTURE_ZOOM_CLASS);
    Efl_Canvas_Gesture_Touch_Data *td = efl_data_scope_get(event, EFL_CANVAS_GESTURE_TOUCH_CLASS);
    Efl_Canvas_Gesture_Recognizer_Data *rd = efl_data_scope_get(obj, EFL_CANVAS_GESTURE_RECOGNIZER_CLASS);
@@ -164,26 +164,26 @@ _efl_canvas_gesture_recognizer_zoom_efl_canvas_gesture_recognizer_recognize(Eo *
 
    switch (efl_gesture_touch_state_get(event))
      {
-      case EFL_GESTURE_TOUCH_UPDATE:
+      case EFL_GESTURE_TOUCH_STATE_UPDATE:
         {
            if ((!glayer_continues_enable) && (!pd->zoom_st.cur.timestamp))
              {
-                return EFL_GESTURE_IGNORE;
+                return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
              }
            EINA_FALLTHROUGH;
         }
-      case EFL_GESTURE_TOUCH_BEGIN:
+      case EFL_GESTURE_TOUCH_STATE_BEGIN:
         {
            if (td->touch_down > 2)
              {
-                return EFL_GESTURE_CANCEL;
+                return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
              }
 
            if (!pd->zoom_st.cur.timestamp) /* Now scan touched-devices list
                                             * and find other finger */
              {
                 if (!efl_gesture_touch_multi_touch_get(event))
-                  return EFL_GESTURE_IGNORE;
+                  return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
 
                 Pointer_Data *p1 = eina_hash_find(td->touch_points, &id1);
                 Pointer_Data *p2 = eina_hash_find(td->touch_points, &id2);
@@ -204,11 +204,11 @@ _efl_canvas_gesture_recognizer_zoom_efl_canvas_gesture_recognizer_recognize(Eo *
 
                 zd->radius = pd->zoom_base / 2.0;
 
-                if ((efl_gesture_state_get(gesture) != EFL_GESTURE_STARTED) &&
-                    (efl_gesture_state_get(gesture) != EFL_GESTURE_UPDATED))
-                  return EFL_GESTURE_TRIGGER;
+                if ((efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_STARTED) &&
+                    (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_UPDATED))
+                  return EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
-                return EFL_GESTURE_CANCEL;
+                return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
              }
 
            Pointer_Data *p2 = eina_hash_find(td->touch_points, &id2);
@@ -232,13 +232,13 @@ _efl_canvas_gesture_recognizer_zoom_efl_canvas_gesture_recognizer_recognize(Eo *
                   {
                      pd->next_step = zd->zoom;
 
-                     return EFL_GESTURE_TRIGGER;
+                     return EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
                   }
              }
 
-           return EFL_GESTURE_IGNORE;
+           return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
         }
-      case EFL_GESTURE_TOUCH_END:
+      case EFL_GESTURE_TOUCH_STATE_END:
         {
            if (td->touch_down == 0)
              {
@@ -247,20 +247,20 @@ _efl_canvas_gesture_recognizer_zoom_efl_canvas_gesture_recognizer_recognize(Eo *
                 memset(pd, 0, sizeof(Efl_Canvas_Gesture_Recognizer_Zoom_Data));
                 efl_gesture_manager_gesture_clean_up(rd->manager, watched, EFL_EVENT_GESTURE_ZOOM);
 
-                return EFL_GESTURE_IGNORE;
+                return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
              }
            if ((pd->zoom_base) && (pd->zoom_distance_tolerance == 0))
              {
                 memset(pd, 0, sizeof(Efl_Canvas_Gesture_Recognizer_Zoom_Data));
 
-                return EFL_GESTURE_FINISH;
+                return EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
              }
 
-           if (efl_gesture_state_get(gesture) != EFL_GESTURE_NONE)
+           if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE)
              {
                 memset(pd, 0, sizeof(Efl_Canvas_Gesture_Recognizer_Zoom_Data));
 
-                return EFL_GESTURE_CANCEL;
+                return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
              }
         }
 
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
index 0e940608d3..238c487e61 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
@@ -3,6 +3,8 @@ class @beta Efl.Canvas.Gesture_Tap extends Efl.Canvas.Gesture
    [[Tap gesture class holding state information.
      See @Efl.Canvas.Gesture to see what this state is and
      @[Efl.Gesture.Events.gesture,tap] for a description of the Tap gesture.
+
+     Application developers receive these objects inside a gesture event and do not typically need to create their own.
    ]]
    data: null;
    c_prefix: efl_gesture_tap;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_touch.c b/src/lib/evas/gesture/efl_canvas_gesture_touch.c
index bec99b7539..c2c2900db4 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_touch.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_touch.c
@@ -17,7 +17,7 @@ _touch_points_reset(Efl_Canvas_Gesture_Touch_Data *pd)
    eina_hash_free(pd->touch_points);
    pd->touch_points = eina_hash_int32_new(EINA_FREE_CB(_hash_free_cb));
    pd->touch_down = 0;
-   pd->state = EFL_GESTURE_TOUCH_UNKNOWN;
+   pd->state = EFL_GESTURE_TOUCH_STATE_UNKNOWN;
 }
 
 EOLIAN static Efl_Object *
@@ -101,15 +101,15 @@ _efl_canvas_gesture_touch_point_record(Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_T
 
    if (!id && (action ==  EFL_POINTER_ACTION_DOWN))
      {
-        pd->state = EFL_GESTURE_TOUCH_BEGIN;
+        pd->state = EFL_GESTURE_TOUCH_STATE_BEGIN;
      }
    else if (action ==  EFL_POINTER_ACTION_UP)
      {
-        pd->state = EFL_GESTURE_TOUCH_END;
+        pd->state = EFL_GESTURE_TOUCH_STATE_END;
      }
    else
      {
-        pd->state = EFL_GESTURE_TOUCH_UPDATE;
+        pd->state = EFL_GESTURE_TOUCH_STATE_UPDATE;
      }
    return;
 
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo
index abedc442d4..a85bf6b671 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_triple_tap.eo
@@ -3,6 +3,8 @@ class @beta Efl.Canvas.Gesture_Triple_Tap extends Efl.Canvas.Gesture
    [[Triple-tap gesture class holding state information.
      See @Efl.Canvas.Gesture to see what this state is and
      @[Efl.Gesture.Events.gesture,triple_tap] for a description of the Triple-tap gesture.
+
+     Application developers receive these objects inside a gesture event and do not typically need to create their own.
    ]]
    data: null;
    c_prefix: efl_gesture_triple_tap;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_types.eot b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
index 96a2ff6293..8cde6e18a0 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_types.eot
+++ b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
@@ -1,7 +1,7 @@
 enum @beta Efl.Canvas.Gesture_Touch_State
 {
    [[ This enum type describes the state of a touch event. ]]
-   legacy: efl_gesture_touch;
+   legacy: efl_gesture_touch_state;
    unknown = 0, [[Gesture Touch State unknown]]
    begin ,      [[First fingure touch down]]
    update,      [[fingure touch update]]
@@ -11,7 +11,7 @@ enum @beta Efl.Canvas.Gesture_Touch_State
 enum @beta Efl.Canvas.Gesture_State
 {
    [[ This enum type describes the state of a gesture. ]]
-   legacy: efl_gesture;
+   legacy: efl_gesture_state;
    none    = 0, [[No gesture state]]
    started = 1, [[A continuous gesture has started.]]
    updated,     [[A gesture continues.]]
@@ -22,7 +22,7 @@ enum @beta Efl.Canvas.Gesture_State
 enum @beta Efl.Canvas.Gesture_Recognizer_Result
 {
    [[ This enum type describes the state of a gesture recognizer. ]]
-   legacy: efl_gesture;
+   legacy: efl_gesture_recognizer_result;
 
    ignore    = 0x0001, [[The event does not change the state of the recognizer.]]
    maybe     = 0x0002, [[The event changed the internal state of the recognizer, but it isn't clear yet if it is a  gesture or not. The recognizer needs to filter more events to decide.]]
@@ -35,7 +35,7 @@ enum @beta Efl.Canvas.Gesture_Recognizer_Result
 enum @beta Efl.Canvas.Gesture_Recognizer_Type
 {
    [[ This enum type describes the state of a touch event. ]]
-   legacy: efl_gesture;
+   legacy: efl_gesture_recognizer_type;
    tap = 0,
    doubleTap,
    tripleTap,
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_zoom.eo b/src/lib/evas/gesture/efl_canvas_gesture_zoom.eo
index c41610bf77..4620225db0 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_zoom.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_zoom.eo
@@ -3,6 +3,8 @@ class @beta Efl.Canvas.Gesture_Zoom extends Efl.Canvas.Gesture
    [[Zoom gesture class holding state information.
      See @Efl.Canvas.Gesture to see what this state is and
      @[Efl.Gesture.Events.gesture,zoom] for a description of the Zoom gesture.
+
+     Application developers receive these objects inside a gesture event and do not typically need to create their own.
    ]]
    c_prefix: efl_gesture_zoom;
    methods {
diff --git a/src/lib/evas/gesture/efl_gesture_events.eo b/src/lib/evas/gesture/efl_gesture_events.eo
index d80c0bbb77..5c907b9f3c 100644
--- a/src/lib/evas/gesture/efl_gesture_events.eo
+++ b/src/lib/evas/gesture/efl_gesture_events.eo
@@ -1,5 +1,7 @@
 interface @beta Efl.Gesture.Events
 {
+   [[Interface for objects capable of emitting gesture events, like @Efl.Canvas.Object.
+   ]]
    event_c_prefix: efl;
    events {
       gesture,tap: Efl.Canvas.Gesture_Tap; [[Emitted when a Tap gesture has been detected.
@@ -32,6 +34,8 @@ interface @beta Efl.Gesture.Events
       ]]
 
       gesture,flick: Efl.Canvas.Gesture_Flick; [[Emitted when a Flick gesture has been detected.
+        A Flick gesture consists of a quick displacement of the finger while touching the screen (or while
+        holding down a mouse button) followed by a release before slowing down.
       ]]
 
       gesture,zoom: Efl.Canvas.Gesture_Zoom; [[Emitted when a Zoom gesture has been detected.
diff --git a/src/tests/edje/edje_test_text.c b/src/tests/edje/edje_test_text.c
index 0939f8bbbf..bb8499c049 100644
--- a/src/tests/edje/edje_test_text.c
+++ b/src/tests/edje/edje_test_text.c
@@ -104,10 +104,12 @@ EFL_START_TEST(edje_test_textblock)
    obj = edje_object_add(evas);
    ck_assert(edje_object_file_set(obj, test_layout_get("test_textblock.edj"), "test_textblock"));
    txt = edje_object_part_text_get(obj, "text");
-   ck_assert(txt || !strcmp(txt, "Bye"));
+   ck_assert_ptr_ne(txt, NULL);
+   ck_assert_int_eq(strcmp(txt, "Bye"), 0);
    edje_object_part_text_set(obj, "text", buf);
    txt = edje_object_part_text_get(obj, "text");
-   ck_assert(txt || !strcmp(txt, buf));
+   ck_assert_ptr_ne(txt, NULL);
+   ck_assert_int_eq(strcmp(txt, buf), 0);
 
    Evas_Object *obj2 = edje_object_add(evas);
    ck_assert(edje_object_file_set(obj2, test_layout_get("test_textblock.edj"), "test_tc_textblock"));
@@ -240,7 +242,7 @@ _basic_check(Eo *layout, Eina_Bool set)
                    255, 255, 255, 255);
              efl_text_glow_color_set(efl_part(layout, "text"),
                    255, 255, 255, 255);
-             efl_text_glow2_color_set(efl_part(layout, "text"),
+             efl_text_secondary_glow_color_set(efl_part(layout, "text"),
                    255, 255, 255, 255);
              efl_text_outline_color_set(efl_part(layout, "text"),
                    255, 255, 255, 255);
@@ -250,7 +252,7 @@ _basic_check(Eo *layout, Eina_Bool set)
                    255, 255, 255, 255);
              efl_text_underline_color_set(efl_part(layout, "text"),
                    255, 255, 255, 255);
-             efl_text_underline2_color_set(efl_part(layout, "text"),
+             efl_text_secondary_underline_color_set(efl_part(layout, "text"),
                    255, 255, 255, 255);
              efl_text_underline_dashed_color_set(efl_part(layout, "text"),
                    255, 255, 255, 255);
@@ -274,7 +276,7 @@ _basic_check(Eo *layout, Eina_Bool set)
         ck_assert_int_eq(b, 255);
         ck_assert_int_eq(a, 255);
 
-        efl_text_glow2_color_get(efl_part(layout, "text"), &r, &g, &b, &a);
+        efl_text_secondary_glow_color_get(efl_part(layout, "text"), &r, &g, &b, &a);
         ck_assert_int_eq(r, 255);
         ck_assert_int_eq(g, 255);
         ck_assert_int_eq(b, 255);
@@ -304,7 +306,7 @@ _basic_check(Eo *layout, Eina_Bool set)
         ck_assert_int_eq(b, 255);
         ck_assert_int_eq(a, 255);
 
-        efl_text_underline2_color_get(efl_part(layout, "text"), &r, &g, &b, &a);
+        efl_text_secondary_underline_color_get(efl_part(layout, "text"), &r, &g, &b, &a);
         ck_assert_int_eq(r, 255);
         ck_assert_int_eq(g, 255);
         ck_assert_int_eq(b, 255);