diff --git a/src/bin/elementary/test_gesture_framework.c b/src/bin/elementary/test_gesture_framework.c
index 41a9ffd49a..ff40711cdd 100644
--- a/src/bin/elementary/test_gesture_framework.c
+++ b/src/bin/elementary/test_gesture_framework.c
@@ -6,7 +6,7 @@
 #define TAP_NAME "tap"
 #define DOUBLE_TAP_NAME "double_tap"
 #define TRIPLE_TAP_NAME "triple_tap"
-#define LONG_TAP_NAME "long_tap"
+#define LONG_PRESS_NAME "long_press"
 #define FLICK_NAME "flick"
 #define LINE_NAME "line"
 #define MOMENTUM_NAME "momentum"
@@ -17,7 +17,7 @@
 #define MAX_DOUBLE_TAP 5
 #define MAX_FLICK 5
 #define MAX_LINE 5
-#define MAX_LONG_TAP 5
+#define MAX_LONG_PRESS 5
 #define MAX_MOMENTUM 5
 #define MAX_ROTATE 1
 #define MAX_TAP 5
@@ -59,7 +59,7 @@ struct _infra_data
    icon_properties *icons;
    Ecore_Timer *colortimer;
    char buf[1024];
-   int long_tap_count;
+   int long_press_count;
 };
 typedef struct _infra_data infra_data;
 
@@ -360,34 +360,34 @@ finger_double_tap_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
 }
 
 static void
-finger_long_tap_start(void *data , Efl_Canvas_Gesture *tap)
+finger_long_press_start(void *data , Efl_Canvas_Gesture *tap)
 {
    Eina_Position2D pos = efl_gesture_hotspot_get(tap);
 
-   _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, START_COLOR);
+   _color_and_icon_set(data, LONG_PRESS_NAME, 1, MAX_TAP, START_COLOR);
    printf("Long Tap Gesture started x,y=<%d,%d> \n", pos.x, pos.y);
 }
 
 static void
-finger_long_tap_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
+finger_long_press_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
 {
-   _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, UPDATE_COLOR);
+   _color_and_icon_set(data, LONG_PRESS_NAME, 1, MAX_TAP, UPDATE_COLOR);
    printf("Long Tap Gesture updated\n");
 }
 
 static void
-finger_long_tap_end(void *data , Efl_Canvas_Gesture *tap)
+finger_long_press_end(void *data , Efl_Canvas_Gesture *tap)
 {
    Eina_Position2D pos = efl_gesture_hotspot_get(tap);
 
-   _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, END_COLOR);
+   _color_and_icon_set(data, LONG_PRESS_NAME, 1, MAX_TAP, END_COLOR);
    printf("Long Tap Gesture ended x,y=<%d,%d> \n",pos.x, pos.y);
 }
 
 static void
-finger_long_tap_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
+finger_long_press_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
 {
-   _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, ABORT_COLOR);
+   _color_and_icon_set(data, LONG_PRESS_NAME, 1, MAX_TAP, ABORT_COLOR);
    printf("Long Tap Aborted\n");
 }
 
@@ -521,22 +521,22 @@ double_tap_gesture_cb(void *data , const Efl_Event *ev)
 }
 
 static void
-long_tap_gesture_cb(void *data , const Efl_Event *ev)
+long_press_gesture_cb(void *data , const Efl_Event *ev)
 {
    Efl_Canvas_Gesture *g = ev->info;
    switch(efl_gesture_state_get(g))
    {
       case EFL_GESTURE_STATE_STARTED:
-         finger_long_tap_start(data, g);
+         finger_long_press_start(data, g);
          break;
       case EFL_GESTURE_STATE_UPDATED:
-         finger_long_tap_update(data, g);
+         finger_long_press_update(data, g);
          break;
       case EFL_GESTURE_STATE_CANCELED:
-         finger_long_tap_abort(data, g);
+         finger_long_press_abort(data, g);
          break;
       case EFL_GESTURE_STATE_FINISHED:
-         finger_long_tap_end(data, g);
+         finger_long_press_end(data, g);
          break;
       default:
          break;
@@ -625,7 +625,7 @@ test_gesture_framework(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    elm_table_pack(tb, bx, 2, 0, 1, 1);
 
    /* Box of Long Tap icon and label */
-   bx = create_gesture_box(win, infra->icons, 3, LONG_TAP_NAME, "Long Tap");
+   bx = create_gesture_box(win, infra->icons, 3, LONG_PRESS_NAME, "Long Tap");
    elm_table_pack(tb, bx, 3, 0, 1, 1);
 
    /* Box of Momentum icon and label */
@@ -736,7 +736,7 @@ test_gesture_framework(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 
    // LISTEN FOR GESTURES
    efl_event_callback_add(target, EFL_EVENT_GESTURE_TAP, tap_gesture_cb, infra);
-   efl_event_callback_add(target, EFL_EVENT_GESTURE_LONG_TAP, long_tap_gesture_cb, infra);
+   efl_event_callback_add(target, EFL_EVENT_GESTURE_LONG_PRESS, long_press_gesture_cb, infra);
    efl_event_callback_add(target, EFL_EVENT_GESTURE_DOUBLE_TAP, double_tap_gesture_cb, infra);
    efl_event_callback_add(target, EFL_EVENT_GESTURE_TRIPLE_TAP, triple_tap_gesture_cb, infra);
    efl_event_callback_add(target, EFL_EVENT_GESTURE_MOMENTUM, momentum_gesture_cb, infra);
diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h
index 3d004c9425..f457acc4bf 100644
--- a/src/lib/evas/Efl_Canvas.h
+++ b/src/lib/evas/Efl_Canvas.h
@@ -109,11 +109,11 @@ extern "C" {
 
 #include <gesture/efl_canvas_gesture_double_tap.eo.h>
 #include <gesture/efl_canvas_gesture_flick.eo.h>
-#include <gesture/efl_canvas_gesture_long_tap.eo.h>
+#include <gesture/efl_canvas_gesture_long_press.eo.h>
 #include <gesture/efl_canvas_gesture_momentum.eo.h>
 #include <gesture/efl_canvas_gesture_recognizer_double_tap.eo.h>
 #include <gesture/efl_canvas_gesture_recognizer_flick.eo.h>
-#include <gesture/efl_canvas_gesture_recognizer_long_tap.eo.h>
+#include <gesture/efl_canvas_gesture_recognizer_long_press.eo.h>
 #include <gesture/efl_canvas_gesture_recognizer_momentum.eo.h>
 #include <gesture/efl_canvas_gesture_recognizer_tap.eo.h>
 #include <gesture/efl_canvas_gesture_recognizer_triple_tap.eo.h>
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 409e777853..7d25c38874 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -86,7 +86,7 @@ struct _Efl_Canvas_Object_Animation_Event
 #include "gesture/efl_canvas_gesture_touch.eo.h"
 #include "gesture/efl_canvas_gesture.eo.h"
 #include "gesture/efl_canvas_gesture_tap.eo.h"
-#include "gesture/efl_canvas_gesture_long_tap.eo.h"
+#include "gesture/efl_canvas_gesture_long_press.eo.h"
 #include "gesture/efl_canvas_gesture_double_tap.eo.h"
 #include "gesture/efl_canvas_gesture_triple_tap.eo.h"
 #include "gesture/efl_canvas_gesture_momentum.eo.h"
@@ -95,7 +95,7 @@ struct _Efl_Canvas_Object_Animation_Event
 #include "gesture/efl_canvas_gesture_custom.eo.h"
 #include "gesture/efl_canvas_gesture_recognizer.eo.h"
 #include "gesture/efl_canvas_gesture_recognizer_tap.eo.h"
-#include "gesture/efl_canvas_gesture_recognizer_long_tap.eo.h"
+#include "gesture/efl_canvas_gesture_recognizer_long_press.eo.h"
 #include "gesture/efl_canvas_gesture_recognizer_double_tap.eo.h"
 #include "gesture/efl_canvas_gesture_recognizer_triple_tap.eo.h"
 #include "gesture/efl_canvas_gesture_recognizer_momentum.eo.h"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_events.eo b/src/lib/evas/gesture/efl_canvas_gesture_events.eo
index bbf9ef68fd..01c50a7aa8 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_events.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_events.eo
@@ -6,7 +6,7 @@ interface @beta Efl.Canvas.Gesture_Events
    events {
       gesture,tap: Efl.Canvas.Gesture_Tap; [[Emitted when a Tap gesture has been detected.
         A Tap gesture consists of a touch of the screen (or click of the mouse) quickly followed by
-        a release. If the release happens too late a @[Efl.Canvas.Gesture_Events.gesture,long_tap] event will be
+        a release. If the release happens too late a @[Efl.Canvas.Gesture_Events.gesture,long_press] event will be
         emitted instead.
       ]]
 
@@ -22,7 +22,7 @@ interface @beta Efl.Canvas.Gesture_Events
         @[Efl.Canvas.Gesture_Events.gesture,tap] or @[Efl.Canvas.Gesture_Events.gesture,double_tap] events.
       ]]
 
-      gesture,long_tap: Efl.Canvas.Gesture_Long_Tap; [[Emitted when a Long-tap gesture has been detected.
+      gesture,long_press: Efl.Canvas.Gesture_Long_Press; [[Emitted when a Long-tap gesture has been detected.
         A Long-tap gesture consists of a touch of the screen (or click of the mouse) followed by a release
         after some time. If the release happens too quickly a @[Efl.Canvas.Gesture_Events.gesture,tap] event will be
         emitted instead.
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_press.c b/src/lib/evas/gesture/efl_canvas_gesture_long_press.c
new file mode 100644
index 0000000000..8403a473d1
--- /dev/null
+++ b/src/lib/evas/gesture/efl_canvas_gesture_long_press.c
@@ -0,0 +1,5 @@
+#include "efl_canvas_gesture_private.h"
+
+#define MY_CLASS EFL_CANVAS_GESTURE_LONG_PRESS_CLASS
+
+#include "efl_canvas_gesture_long_press.eo.c"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_long_press.eo
similarity index 56%
rename from src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
rename to src/lib/evas/gesture/efl_canvas_gesture_long_press.eo
index 939da391d7..f039f24ff0 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_long_press.eo
@@ -1,11 +1,11 @@
-class @beta Efl.Canvas.Gesture_Long_Tap extends Efl.Canvas.Gesture
+class @beta Efl.Canvas.Gesture_Long_Press extends Efl.Canvas.Gesture
 {
    [[Long-tap gesture class holding state information.
      See @Efl.Canvas.Gesture to see what this state is and
-     @[Efl.Canvas.Gesture_Events.gesture,long_tap] for a description of the Long-tap gesture.
+     @[Efl.Canvas.Gesture_Events.gesture,long_press] 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;
+   c_prefix: efl_gesture_long_press;
 }
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c
deleted file mode 100644
index 743f4ded90..0000000000
--- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "efl_canvas_gesture_private.h"
-
-#define MY_CLASS EFL_CANVAS_GESTURE_LONG_TAP_CLASS
-
-#include "efl_canvas_gesture_long_tap.eo.c"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.c b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
index 2bee20c248..5f86e4108c 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
@@ -47,8 +47,8 @@ _gesture_recognizer_event_type_get(const Efl_Canvas_Gesture_Recognizer *recogniz
      return EFL_EVENT_GESTURE_DOUBLE_TAP;
    if (type == EFL_CANVAS_GESTURE_TRIPLE_TAP_CLASS)
      return EFL_EVENT_GESTURE_TRIPLE_TAP;
-   if (type == EFL_CANVAS_GESTURE_LONG_TAP_CLASS)
-     return EFL_EVENT_GESTURE_LONG_TAP;
+   if (type == EFL_CANVAS_GESTURE_LONG_PRESS_CLASS)
+     return EFL_EVENT_GESTURE_LONG_PRESS;
    if (type == EFL_CANVAS_GESTURE_MOMENTUM_CLASS)
      return EFL_EVENT_GESTURE_MOMENTUM;
    if (type == EFL_CANVAS_GESTURE_FLICK_CLASS)
@@ -83,7 +83,7 @@ _update_finger_sizes(Efl_Canvas_Gesture_Manager_Data *pd, int finger_size)
    Efl_Canvas_Gesture_Recognizer_Tap_Data *td;
    Efl_Canvas_Gesture_Recognizer_Double_Tap_Data *dtd;
    Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data *ttd;
-   Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *ltd;
+   Efl_Canvas_Gesture_Recognizer_Long_Press_Data *ltd;
    Efl_Canvas_Gesture_Recognizer_Flick_Data *fd;
    Efl_Canvas_Gesture_Recognizer_Zoom_Data *zd;
    const Efl_Event_Description *type;
@@ -103,9 +103,9 @@ _update_finger_sizes(Efl_Canvas_Gesture_Manager_Data *pd, int finger_size)
    ttd = efl_data_scope_get(r, EFL_CANVAS_GESTURE_RECOGNIZER_TRIPLE_TAP_CLASS);
    ttd->finger_size = finger_size;
 
-   type = EFL_EVENT_GESTURE_LONG_TAP;
+   type = EFL_EVENT_GESTURE_LONG_PRESS;
    r = eina_hash_find(pd->m_recognizers, &type);
-   ltd = efl_data_scope_get(r, EFL_CANVAS_GESTURE_RECOGNIZER_LONG_TAP_CLASS);
+   ltd = efl_data_scope_get(r, EFL_CANVAS_GESTURE_RECOGNIZER_LONG_PRESS_CLASS);
    ltd->finger_size = finger_size;
 
    type = EFL_EVENT_GESTURE_FLICK;
@@ -147,7 +147,7 @@ _efl_canvas_gesture_manager_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_M
 
    //Register all types of recognizers at very first time.
    efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_TAP_CLASS, obj));
-   efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_LONG_TAP_CLASS, obj));
+   efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_LONG_PRESS_CLASS, obj));
    efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_DOUBLE_TAP_CLASS, obj));
    efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_TRIPLE_TAP_CLASS, obj));
    efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_MOMENTUM_CLASS, obj));
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_private.h b/src/lib/evas/gesture/efl_canvas_gesture_private.h
index 3ef595c3c8..1b9e7d2ddc 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_private.h
+++ b/src/lib/evas/gesture/efl_canvas_gesture_private.h
@@ -18,7 +18,7 @@ Eina_Bool _event_multi_touch_get(const Efl_Canvas_Gesture_Touch *event);
 typedef struct _Efl_Canvas_Gesture_Manager_Data                Efl_Canvas_Gesture_Manager_Data;
 typedef struct _Efl_Canvas_Gesture_Recognizer_Data             Efl_Canvas_Gesture_Recognizer_Data;
 typedef struct _Efl_Canvas_Gesture_Recognizer_Tap_Data         Efl_Canvas_Gesture_Recognizer_Tap_Data;
-typedef struct _Efl_Canvas_Gesture_Recognizer_Long_Tap_Data    Efl_Canvas_Gesture_Recognizer_Long_Tap_Data;
+typedef struct _Efl_Canvas_Gesture_Recognizer_Long_Press_Data    Efl_Canvas_Gesture_Recognizer_Long_Press_Data;
 typedef struct _Efl_Canvas_Gesture_Recognizer_Double_Tap_Data  Efl_Canvas_Gesture_Recognizer_Double_Tap_Data;
 typedef struct _Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data  Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data;
 typedef struct _Efl_Canvas_Gesture_Recognizer_Momentum_Data    Efl_Canvas_Gesture_Recognizer_Momentum_Data;
@@ -54,7 +54,7 @@ struct _Efl_Canvas_Gesture_Recognizer_Tap_Data
    int                            finger_size;
 };
 
-struct _Efl_Canvas_Gesture_Recognizer_Long_Tap_Data
+struct _Efl_Canvas_Gesture_Recognizer_Long_Press_Data
 {
    double                          start_timeout;
    Eina_List                      *target_timeout;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.c
similarity index 78%
rename from src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c
rename to src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.c
index 5b173858fa..bcbe5bd592 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.c
@@ -1,18 +1,18 @@
 #include "efl_canvas_gesture_private.h"
 
-#define MY_CLASS                      EFL_CANVAS_GESTURE_RECOGNIZER_LONG_TAP_CLASS
+#define MY_CLASS                      EFL_CANVAS_GESTURE_RECOGNIZER_LONG_PRESS_CLASS
 
-#define EFL_GESTURE_LONG_TAP_TIME_OUT 1.2
+#define EFL_GESTURE_LONG_PRESS_TIME_OUT 1.2
 
 EOLIAN static const Efl_Class *
-_efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *pd EINA_UNUSED)
+_efl_canvas_gesture_recognizer_long_press_efl_canvas_gesture_recognizer_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Recognizer_Long_Press_Data *pd EINA_UNUSED)
 {
-   return EFL_CANVAS_GESTURE_LONG_TAP_CLASS;
+   return EFL_CANVAS_GESTURE_LONG_PRESS_CLASS;
 }
 
 EOLIAN static void
-_efl_canvas_gesture_recognizer_long_tap_efl_object_destructor(Eo *obj,
-                                                              Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *pd)
+_efl_canvas_gesture_recognizer_long_press_efl_object_destructor(Eo *obj,
+                                                              Efl_Canvas_Gesture_Recognizer_Long_Press_Data *pd)
 {
    if (pd->timeout)
      ecore_timer_del(pd->timeout);
@@ -21,28 +21,28 @@ _efl_canvas_gesture_recognizer_long_tap_efl_object_destructor(Eo *obj,
 }
 
 static Eina_Bool
-_long_tap_timeout_cb(void *data)
+_long_press_timeout_cb(void *data)
 {
-   Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *pd = data;
+   Efl_Canvas_Gesture_Recognizer_Long_Press_Data *pd = data;
 
    /* FIXME: Needs to propagate this event back to evas! */
    pd->is_timeout = EINA_TRUE;
 
    efl_gesture_state_set(pd->gesture, EFL_GESTURE_STATE_UPDATED);
-   efl_event_callback_call(pd->target, EFL_EVENT_GESTURE_LONG_TAP, pd->gesture);
+   efl_event_callback_call(pd->target, EFL_EVENT_GESTURE_LONG_PRESS, pd->gesture);
 
    return ECORE_CALLBACK_RENEW;
 }
 
 EOLIAN static Efl_Canvas_Gesture_Recognizer_Result
-_efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(Eo *obj,
-                                                                                Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *pd,
+_efl_canvas_gesture_recognizer_long_press_efl_canvas_gesture_recognizer_recognize(Eo *obj,
+                                                                                Efl_Canvas_Gesture_Recognizer_Long_Press_Data *pd,
                                                                                 Efl_Canvas_Gesture *gesture,
                                                                                 Efl_Object *watched,
                                                                                 Efl_Canvas_Gesture_Touch *event)
 {
    double length, start_timeout = pd->start_timeout; // Manhattan distance
-   double timeout = EFL_GESTURE_LONG_TAP_TIME_OUT;
+   double timeout = EFL_GESTURE_LONG_PRESS_TIME_OUT;
    Eina_Position2D pos;
    Eina_Vector2 dist;
    Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
@@ -76,7 +76,7 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
               ecore_timer_del(pd->timeout);
            }
          pd->timeout = ecore_timer_add(timeout,
-                                       _long_tap_timeout_cb, pd);
+                                       _long_press_timeout_cb, pd);
 
          result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
 
@@ -140,4 +140,4 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
    return result;
 }
 
-#include "efl_canvas_gesture_recognizer_long_tap.eo.c"
+#include "efl_canvas_gesture_recognizer_long_press.eo.c"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.eo
similarity index 52%
rename from src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
rename to src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.eo
index 9eb9d6afab..316b74d683 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.eo
@@ -1,10 +1,10 @@
-class @beta Efl.Canvas.Gesture_Recognizer_Long_Tap extends Efl.Canvas.Gesture_Recognizer
+class @beta Efl.Canvas.Gesture_Recognizer_Long_Press extends Efl.Canvas.Gesture_Recognizer
 {
    [[This is the recognizer for Long-tap gestures.
-     See @Efl.Canvas.Gesture_Long_Tap and @Efl.Canvas.Gesture_Recognizer.
+     See @Efl.Canvas.Gesture_Long_Press and @Efl.Canvas.Gesture_Recognizer.
      For internal use only.
    ]]
-   c_prefix: efl_gesture_recognizer_long_tap;
+   c_prefix: efl_gesture_recognizer_long_press;
    implements {
       Efl.Object.destructor;
       Efl.Canvas.Gesture_Recognizer.type { get; }
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index 5daa6f6f30..7c2fc28a31 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -4,7 +4,7 @@ pub_eo_files = [
   'efl_canvas_gesture_tap.eo',
   'efl_canvas_gesture_double_tap.eo',
   'efl_canvas_gesture_triple_tap.eo',
-  'efl_canvas_gesture_long_tap.eo',
+  'efl_canvas_gesture_long_press.eo',
   'efl_canvas_gesture_momentum.eo',
   'efl_canvas_gesture_flick.eo',
   'efl_canvas_gesture_zoom.eo',
@@ -13,7 +13,7 @@ pub_eo_files = [
   'efl_canvas_gesture_recognizer_tap.eo',
   'efl_canvas_gesture_recognizer_double_tap.eo',
   'efl_canvas_gesture_recognizer_triple_tap.eo',
-  'efl_canvas_gesture_recognizer_long_tap.eo',
+  'efl_canvas_gesture_recognizer_long_press.eo',
   'efl_canvas_gesture_recognizer_momentum.eo',
   'efl_canvas_gesture_recognizer_flick.eo',
   'efl_canvas_gesture_recognizer_zoom.eo',
@@ -68,7 +68,7 @@ evas_src += files([
   'efl_canvas_gesture_tap.c',
   'efl_canvas_gesture_double_tap.c',
   'efl_canvas_gesture_triple_tap.c',
-  'efl_canvas_gesture_long_tap.c',
+  'efl_canvas_gesture_long_press.c',
   'efl_canvas_gesture_momentum.c',
   'efl_canvas_gesture_flick.c',
   'efl_canvas_gesture_zoom.c',
@@ -77,7 +77,7 @@ evas_src += files([
   'efl_canvas_gesture_recognizer_tap.c',
   'efl_canvas_gesture_recognizer_double_tap.c',
   'efl_canvas_gesture_recognizer_triple_tap.c',
-  'efl_canvas_gesture_recognizer_long_tap.c',
+  'efl_canvas_gesture_recognizer_long_press.c',
   'efl_canvas_gesture_recognizer_momentum.c',
   'efl_canvas_gesture_recognizer_flick.c',
   'efl_canvas_gesture_recognizer_zoom.c',
diff --git a/src/tests/elementary/efl_ui_test_gesture.c b/src/tests/elementary/efl_ui_test_gesture.c
index 0f7d270853..c176818331 100644
--- a/src/tests/elementary/efl_ui_test_gesture.c
+++ b/src/tests/elementary/efl_ui_test_gesture.c
@@ -26,7 +26,7 @@ typedef enum
 enum
 {
    TAP,
-   LONG_TAP,
+   LONG_PRESS,
    DOUBLE_TAP,
    TRIPLE_TAP,
    MOMENTUM,
@@ -87,7 +87,7 @@ setup(void)
 #define WATCH(type) \
    efl_event_callback_add(rect, EFL_EVENT_GESTURE_##type, gesture_cb, &count[(type)])
    WATCH(TAP);
-   WATCH(LONG_TAP);
+   WATCH(LONG_PRESS);
    WATCH(DOUBLE_TAP);
    WATCH(TRIPLE_TAP);
    WATCH(MOMENTUM);
@@ -105,7 +105,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
    /* basic tap */
    click_object(rect);
    CHECK_ALL(TAP, 1, 0, 1, 0);
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0);
    CHECK_ALL(TRIPLE_TAP, 1, 1, 0, 0);
    CHECK_ZERO(MOMENTUM);
@@ -117,7 +117,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
    /* add a second tap */
    click_object(rect);
    CHECK_ALL(TAP, 1, 0, 1, 0);
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* UPDATE -> FINISH */
    CHECK_ALL(DOUBLE_TAP, 0, 1, 1, 0);
    CHECK_ALL(TRIPLE_TAP, 0, 2, 0, 0);
@@ -130,7 +130,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
    /* add a third tap */
    click_object(rect);
    CHECK_ALL(TAP, 1, 0, 1, 0);
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* UPDATE -> FINISH */
    CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0);
    CHECK_ALL(TRIPLE_TAP, 0, 1, 1, 0);
@@ -146,7 +146,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
    click_object_at(rect, 500, 500);
    click_object_at(rect, 505, 505);
    CHECK_ALL(TAP, 2, 0, 2, 0);
-   CHECK_ALL(LONG_TAP, 2, 0, 0, 2);
+   CHECK_ALL(LONG_PRESS, 2, 0, 0, 2);
    /* UPDATE -> FINISH */
    CHECK_ALL(DOUBLE_TAP, 1, 2, 1, 0);
    CHECK_ALL(TRIPLE_TAP, 1, 3, 0, 0);
@@ -161,7 +161,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
    /* verify multiple simultaneous presses treated as same press */
    multi_click_object(rect, 2);
    CHECK_ALL(TAP, 1, 0, 1, 0);
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0);
    CHECK_ALL(TRIPLE_TAP, 1, 1, 0, 0);
    CHECK_ZERO(MOMENTUM);
@@ -173,7 +173,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
 
    multi_click_object(rect, 2);
    CHECK_ALL(TAP, 1, 0, 1, 0);
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* UPDATE -> FINISH */
    CHECK_ALL(DOUBLE_TAP, 0, 1, 1, 0);
    CHECK_ALL(TRIPLE_TAP, 0, 2, 0, 0);
@@ -186,7 +186,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
 
    multi_click_object(rect, 2);
    CHECK_ALL(TAP, 1, 0, 1, 0);
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* UPDATE -> FINISH */
    CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0);
    CHECK_ALL(TRIPLE_TAP, 0, 1, 1, 0);
@@ -200,7 +200,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
 
    multi_click_object(rect, 10);
    CHECK_ALL(TAP, 1, 0, 1, 0);
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    CHECK_ALL(TRIPLE_TAP, 1, 0, 0, 1);
    CHECK_ZERO(MOMENTUM);
@@ -212,7 +212,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
 }
 EFL_END_TEST
 
-EFL_START_TEST(test_efl_ui_gesture_long_tap)
+EFL_START_TEST(test_efl_ui_gesture_long_press)
 {
    Eo *rect = setup();
    double timeout = 1.2;
@@ -225,7 +225,7 @@ EFL_START_TEST(test_efl_ui_gesture_long_tap)
    /* press */
    press_object(rect);
    CHECK_ALL(TAP, 1, 0, 0, 0);
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 0);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 0);
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 0);
    CHECK_ALL(TRIPLE_TAP, 1, 0, 0, 0);
    CHECK_ZERO(MOMENTUM);
@@ -238,7 +238,7 @@ EFL_START_TEST(test_efl_ui_gesture_long_tap)
 
    /* verify longpress */
    CHECK_ALL(TAP, 0, 0, 0, 1);
-   CHECK_ALL(LONG_TAP, 0, 1, 0, 0);
+   CHECK_ALL(LONG_PRESS, 0, 1, 0, 0);
    CHECK_ALL(DOUBLE_TAP, 0, 0, 0, 1);
    CHECK_ALL(TRIPLE_TAP, 0, 0, 0, 1);
    CHECK_ZERO(MOMENTUM);
@@ -249,7 +249,7 @@ EFL_START_TEST(test_efl_ui_gesture_long_tap)
    evas_event_feed_mouse_up(e, 1, 0, 2, NULL);
 
    CHECK_ZERO(TAP);
-   CHECK_ALL(LONG_TAP, 0, 0, 1, 0);
+   CHECK_ALL(LONG_PRESS, 0, 0, 1, 0);
    CHECK_ZERO(DOUBLE_TAP);
    CHECK_ZERO(TRIPLE_TAP);
    CHECK_ZERO(MOMENTUM);
@@ -267,7 +267,7 @@ EFL_START_TEST(test_efl_ui_gesture_long_tap)
 
    /* verify longpress */
    CHECK_ALL(TAP, 0, 1, 0, 0);
-   CHECK_ALL(LONG_TAP, 0, 1, 0, 0);
+   CHECK_ALL(LONG_PRESS, 0, 1, 0, 0);
    CHECK_ALL(DOUBLE_TAP, 0, 0, 0, 1);
    CHECK_ALL(TRIPLE_TAP, 0, 0, 0, 1);
    CHECK_ALL(MOMENTUM, 1, 0, 0, 0);
@@ -292,7 +292,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
    /* canceled */
    CHECK_ALL(TAP, 1, 0, 0, 1);
    /* canceled */
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* canceled */
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    /* canceled */
@@ -313,7 +313,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
    /* canceled */
    CHECK_ALL(TAP, 1, 0, 0, 1);
    /* canceled */
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* canceled */
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    /* canceled */
@@ -331,7 +331,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
    /* canceled */
    CHECK_ALL(TAP, 1, 0, 0, 1);
    /* canceled */
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* canceled */
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    /* canceled */
@@ -349,7 +349,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
    /* canceled */
    CHECK_ALL(TAP, 1, 0, 0, 1);
    /* canceled */
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* canceled */
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    /* canceled */
@@ -368,7 +368,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
    /* canceled */
    CHECK_ALL(TAP, 1, 0, 0, 1);
    /* canceled */
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* canceled */
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    /* canceled */
@@ -386,7 +386,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
    /* canceled */
    CHECK_ALL(TAP, 1, 0, 0, 1);
    /* canceled */
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* canceled */
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    /* canceled */
@@ -474,7 +474,7 @@ EFL_START_TEST(test_efl_ui_gesture_zoom)
    /* canceled */
    CHECK_ALL(TAP, 1, 0, 0, 1);
    /* canceled */
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* canceled */
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    /* canceled */
@@ -502,7 +502,7 @@ EFL_START_TEST(test_efl_ui_gesture_zoom)
    /* canceled */
    CHECK_ALL(TAP, 1, 0, 0, 1);
    /* canceled */
-   CHECK_ALL(LONG_TAP, 1, 0, 0, 1);
+   CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
    /* canceled */
    CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
    /* canceled */
@@ -624,7 +624,7 @@ EFL_END_TEST
 void efl_ui_test_gesture(TCase *tc)
 {
    tcase_add_test(tc, test_efl_ui_gesture_taps);
-   tcase_add_test(tc, test_efl_ui_gesture_long_tap);
+   tcase_add_test(tc, test_efl_ui_gesture_long_press);
    tcase_add_test(tc, test_efl_ui_gesture_flick);
    tcase_add_test(tc, test_efl_ui_gesture_zoom);
    tcase_add_test(tc, test_efl_ui_gesture_custom);