diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index e6b31353da..d6b9a96061 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -42,7 +42,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
            efl_ui_range_value_set(efl_added, 6),
            efl_ui_range_step_set(efl_added, 2),
            efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
-           efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
+           efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
            efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_STEADY,_spin_delay_changed_cb, NULL),
            efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _spin_changed_cb, NULL),
            efl_pack(bx, efl_added));
@@ -51,13 +51,13 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
            efl_ui_range_limits_set(efl_added, -100.0, 100.0),
            efl_ui_range_value_set(efl_added, 0),
            efl_ui_format_string_set(efl_added, "test float %0.2f", EFL_UI_FORMAT_STRING_TYPE_SIMPLE),
-           efl_ui_spin_button_editable_set(efl_added, EINA_FALSE),
+           efl_ui_spin_button_direct_text_input_set(efl_added, EINA_FALSE),
            efl_pack(bx, efl_added));
 
    efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx,
            efl_ui_range_limits_set(efl_added, 1, 12),
            efl_ui_range_value_set(efl_added, 1),
-           efl_ui_spin_button_editable_set(efl_added, EINA_FALSE),
+           efl_ui_spin_button_direct_text_input_set(efl_added, EINA_FALSE),
            efl_ui_format_values_set(efl_added, EINA_C_ARRAY_ACCESSOR_NEW(special_values)),
            efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
            efl_pack(bx, efl_added));
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 0a4a39b171..84b3841fa4 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -162,21 +162,21 @@ _fields_init(Eo *obj)
    pd->year = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
                       efl_ui_range_limits_set(efl_added, 1900, 2037),
                       efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
-                      efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
+                      efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
                       efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
                       efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
 
    pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
                        efl_ui_range_limits_set(efl_added, 1, 12),
                        efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
-                       efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
+                       efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
                        efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
                        efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
 
    pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
                      efl_ui_range_limits_set(efl_added, 1, 31),
                      efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
-                     efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
+                     efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
                      efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
                      efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
 
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 131d84f187..627c6fdefa 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -722,13 +722,13 @@ _efl_ui_spin_button_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Spin_Bu
 }
 
 EOLIAN static void
-_efl_ui_spin_button_editable_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd, Eina_Bool editable)
+_efl_ui_spin_button_direct_text_input_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd, Eina_Bool editable)
 {
    sd->editable = editable;
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_spin_button_editable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd)
+_efl_ui_spin_button_direct_text_input_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd)
 {
    return sd->editable;
 }
diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo
index 06a57f111d..8216c5d3c9 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -40,7 +40,7 @@ class @beta Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Compo
             circulate: bool(false); [[$true to enable circulate or $false to disable it.]]
          }
       }
-      @property editable {
+      @property direct_text_input {
          [[Control whether the spin can be directly edited by the user.
 
            Spin objects can have editing disabled, in which case they can only
@@ -55,7 +55,7 @@ class @beta Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Compo
          get {
          }
          values {
-            editable: bool(false); [[$true to allow users to edit it or $false to don't allow users to edit it directly.]]
+            direct_text_input: bool(false); [[$true to allow users to edit it or $false to don't allow users to edit it directly.]]
          }
       }
    }
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index a1ca671566..901678c48c 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -124,14 +124,14 @@ _fields_init(Eo *obj)
    pd->hour = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
                       efl_ui_range_limits_set(efl_added, 1, 12),
                       efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
-                      efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
+                      efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
                       efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
                       efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
 
    pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
                      efl_ui_range_limits_set(efl_added, 0, 59),
                      efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
-                     efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
+                     efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
                      efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
                      efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));