diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 4ed285771f..56fe6a7d5e 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -246,7 +246,7 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
 # include <efl_ui_navigation_bar_part.eo.h>
 # include <efl_ui_navigation_bar_part_back_button.eo.h>
 # include <efl_ui_navigation_layout.eo.h>
-# include <efl_ui_clickable_util.eo.h>
+# include <efl_ui_action_connector.eo.h>
 # include <efl_ui_format.eo.h>
 # include <efl_ui_spin.eo.h>
 # include <efl_ui_spin_button.eo.h>
diff --git a/src/lib/elementary/efl_ui_clickable_util.c b/src/lib/elementary/efl_ui_action_connector.c
similarity index 81%
rename from src/lib/elementary/efl_ui_clickable_util.c
rename to src/lib/elementary/efl_ui_action_connector.c
index 8e1c74f8a7..2d3dace64a 100644
--- a/src/lib/elementary/efl_ui_clickable_util.c
+++ b/src/lib/elementary/efl_ui_action_connector.c
@@ -9,7 +9,7 @@
 
 typedef struct {
 
-} Efl_Ui_Clickable_Util_Data;
+} Efl_Ui_Action_Connector_Data;
 
 static void
 _on_press_cb(void *data,
@@ -47,14 +47,14 @@ _theme_move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
      efl_input_clickable_button_state_reset(data, 1);
 }
 
-EFL_CALLBACKS_ARRAY_DEFINE(bind_to_theme_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(bind_clickable_to_theme_callbacks,
   {EFL_EVENT_POINTER_MOVE, _theme_move_cb},
 )
 
 EOLIAN static void
-_efl_ui_clickable_util_bind_to_theme(Efl_Canvas_Layout *object, Efl_Input_Clickable *clickable)
+_efl_ui_action_connector_bind_clickable_to_theme(Efl_Canvas_Layout *object, Efl_Input_Clickable *clickable)
 {
-   efl_event_callback_array_add(object, bind_to_theme_callbacks(), clickable);
+   efl_event_callback_array_add(object, bind_clickable_to_theme_callbacks(), clickable);
 
    efl_layout_signal_callback_add(object, "efl,action,press", "*", clickable, _on_press_cb, NULL);
    efl_layout_signal_callback_add(object, "efl,action,unpress", "*", clickable, _on_unpress_cb, NULL);
@@ -96,16 +96,16 @@ _unpress_cb(void *data, const Efl_Event *ev EINA_UNUSED)
      }
 }
 
-EFL_CALLBACKS_ARRAY_DEFINE(bind_to_object_callbacks,
+EFL_CALLBACKS_ARRAY_DEFINE(bind_clickable_to_object_callbacks,
   {EFL_EVENT_POINTER_DOWN, _press_cb},
   {EFL_EVENT_POINTER_UP, _unpress_cb},
 )
 
 EOLIAN static void
-_efl_ui_clickable_util_bind_to_object(Efl_Input_Interface *object, Efl_Input_Clickable *clickable)
+_efl_ui_action_connector_bind_clickable_to_object(Efl_Input_Interface *object, Efl_Input_Clickable *clickable)
 {
-   efl_event_callback_array_add(object, bind_to_object_callbacks(), clickable);
+   efl_event_callback_array_add(object, bind_clickable_to_object_callbacks(), clickable);
 }
 
 
-#include "efl_ui_clickable_util.eo.c"
+#include "efl_ui_action_connector.eo.c"
diff --git a/src/lib/elementary/efl_ui_clickable_util.eo b/src/lib/elementary/efl_ui_action_connector.eo
similarity index 86%
rename from src/lib/elementary/efl_ui_clickable_util.eo
rename to src/lib/elementary/efl_ui_action_connector.eo
index 5db5e67a5c..40fda6a6e6 100644
--- a/src/lib/elementary/efl_ui_clickable_util.eo
+++ b/src/lib/elementary/efl_ui_action_connector.eo
@@ -1,10 +1,10 @@
-class @beta Efl.Ui.Clickable_Util {
-  [[Helper class that connects theme signals or object events to the @Efl.Input.Clickable interface.
+class @beta Efl.Ui.Action_Connector {
+  [[Helper class that connects theme signals or object events to the interfaces which are for actions.
 
-    This simplifies creating widgets that implement the @Efl.Input.Clickable interface.
+    For example, this simplifies creating widgets that implement the @Efl.Input.Clickable interface.
   ]]
   methods {
-    bind_to_theme @class {
+    bind_clickable_to_theme @class {
       [[This will listen to the standard "click" events on a theme and emit the appropriate
         events through the @Efl.Input.Clickable interface.
 
@@ -19,7 +19,7 @@ class @beta Efl.Ui.Clickable_Util {
         clickable : Efl.Input.Clickable; [[The object to call the clickable methods on.]]
       }
     }
-    bind_to_object @class {
+    bind_clickable_to_object @class {
       [[This will listen to the standard "click" events on an object, and emit the appropriate
         events through the @Efl.Input.Clickable interface.
 
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 8292d2985f..f71fb3e0ad 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -247,7 +247,7 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
         edje_object_signal_callback_add
            (wd->resize_obj, "efl,action,unpress", "*",
             _on_unpressed_signal, obj);
-        efl_ui_clickable_util_bind_to_theme(wd->resize_obj, obj);
+        efl_ui_action_connector_bind_clickable_to_theme(wd->resize_obj, obj);
      }
 
    _elm_access_object_register(obj, wd->resize_obj);
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 87bc965a36..fd562191e0 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -310,7 +310,7 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
-   efl_ui_clickable_util_bind_to_theme(wd->resize_obj, obj);
+   efl_ui_action_connector_bind_clickable_to_theme(wd->resize_obj, obj);
    if (elm_widget_is_legacy(obj))
      {
         efl_layout_signal_callback_add
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 2ae9a1b53c..4f8891a0cc 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -142,7 +142,7 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
         edje_object_signal_callback_add
            (wd->resize_obj, "efl,anim,done", "efl",
             _on_recalc_done, obj);
-        efl_ui_clickable_util_bind_to_theme(wd->resize_obj, obj);
+        efl_ui_action_connector_bind_clickable_to_theme(wd->resize_obj, obj);
         efl_event_callback_add(obj, EFL_INPUT_EVENT_CLICKED, _clicked_cb, obj);
      }
 
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 239a099064..342c9d2d56 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -584,7 +584,7 @@ _efl_ui_image_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Data *priv)
      }
    else
      {
-        efl_ui_clickable_util_bind_to_object(priv->hit_rect, obj);
+        efl_ui_action_connector_bind_clickable_to_object(priv->hit_rect, obj);
      }
 
    priv->smooth = EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index bdb42cde08..6b529d210d 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1849,7 +1849,7 @@ _efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable
      (priv->img, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, obj);
    evas_object_event_callback_add
      (priv->img, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, obj);
-   efl_ui_clickable_util_bind_to_object(priv->img, obj);
+   efl_ui_action_connector_bind_clickable_to_object(priv->img, obj);
    evas_object_image_scale_hint_set(priv->img, EVAS_IMAGE_SCALE_HINT_STATIC);
 
    /* XXX: mmm... */
diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c
index edbfd74937..c0c863bf73 100644
--- a/src/lib/elementary/efl_ui_item.c
+++ b/src/lib/elementary/efl_ui_item.c
@@ -223,7 +223,7 @@ _efl_ui_item_efl_object_finalize(Eo *obj, Efl_Ui_Item_Data *pd EINA_UNUSED)
    /* Support Item Focus Feature */
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
-   efl_ui_clickable_util_bind_to_object(wd->resize_obj, obj);
+   efl_ui_action_connector_bind_clickable_to_object(wd->resize_obj, obj);
    return eo;
 }
 
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index d818ec0fcc..30f5770a90 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -438,7 +438,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
      }
    else
      {
-        efl_ui_clickable_util_bind_to_theme(wd->resize_obj, obj);
+        efl_ui_action_connector_bind_clickable_to_theme(wd->resize_obj, obj);
      }
    evas_object_event_callback_add
      (wd->resize_obj, EVAS_CALLBACK_RESIZE,
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 7a90a63827..3adfade9c3 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -2189,7 +2189,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
      (sd->entry_edje, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, obj);
    evas_object_event_callback_add
      (sd->entry_edje, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, obj);
-   efl_ui_clickable_util_bind_to_object(sd->entry_edje, obj);
+   efl_ui_action_connector_bind_clickable_to_object(sd->entry_edje, obj);
 
    efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED,
          _text_size_changed_cb, obj);
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 3216383f41..0ca268998b 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -176,7 +176,7 @@ pub_eo_files = [
   'efl_ui_caching_factory.eo',
   'efl_ui_widget_factory.eo',
   'efl_ui_relative_layout.eo',
-  'efl_ui_clickable_util.eo',
+  'efl_ui_action_connector.eo',
   'efl_ui_format.eo',
   'efl_ui_collection.eo',
   'efl_ui_position_manager_entity.eo',
@@ -929,7 +929,7 @@ elementary_src = [
   'efl_ui_exact_model.c',
   'efl_ui_average_model.c',
   'efl_ui_relative_layout.c',
-  'efl_ui_clickable_util.c',
+  'efl_ui_action_connector.c',
   'efl_ui_format.c',
   'efl_ui_scroll_util.c',
   'efl_ui_collection.c',