diff --git a/src/bin/elementary/test_ui_datepicker.c b/src/bin/elementary/test_ui_datepicker.c
index 7ca9563f6a..d7ac9ee50f 100644
--- a/src/bin/elementary/test_ui_datepicker.c
+++ b/src/bin/elementary/test_ui_datepicker.c
@@ -29,8 +29,8 @@ test_ui_datepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
 
    efl_add(EFL_UI_DATEPICKER_CLASS, bx,
            efl_ui_datepicker_date_set(efl_added, 1987, 9, 17),
-           efl_ui_datepicker_max_set(efl_added, 1990, 9, 17),
-           efl_ui_datepicker_min_set(efl_added, 1980, 9, 17),
+           efl_ui_datepicker_date_max_set(efl_added, 1990, 9, 17),
+           efl_ui_datepicker_date_min_set(efl_added, 1980, 9, 17),
            efl_event_callback_add(efl_added, EFL_UI_DATEPICKER_EVENT_CHANGED,_date_changed_cb, NULL),
            efl_pack(bx, efl_added));
 
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 84b3841fa4..9e48ca7784 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -254,7 +254,7 @@ _efl_ui_datepicker_efl_object_destructor(Eo *obj, Efl_Ui_Datepicker_Data *pd)
 }
 
 EOLIAN static void
-_efl_ui_datepicker_min_set(Eo *obj, Efl_Ui_Datepicker_Data *pd EINA_UNUSED, int year, int month, int day)
+_efl_ui_datepicker_date_min_set(Eo *obj, Efl_Ui_Datepicker_Data *pd EINA_UNUSED, int year, int month, int day)
 {
    int new_time[EFL_UI_DATEPICKER_TYPE_COUNT] = {year, month, day};
 
@@ -271,7 +271,7 @@ _efl_ui_datepicker_min_set(Eo *obj, Efl_Ui_Datepicker_Data *pd EINA_UNUSED, int
 }
 
 EOLIAN static void
-_efl_ui_datepicker_min_get(const Eo *obj EINA_UNUSED, Efl_Ui_Datepicker_Data *pd, int *year, int *month, int *day)
+_efl_ui_datepicker_date_min_get(const Eo *obj EINA_UNUSED, Efl_Ui_Datepicker_Data *pd, int *year, int *month, int *day)
 {
    *year = pd->min_date[DATEPICKER_YEAR];
    *month = pd->min_date[DATEPICKER_MONTH];
@@ -279,7 +279,7 @@ _efl_ui_datepicker_min_get(const Eo *obj EINA_UNUSED, Efl_Ui_Datepicker_Data *pd
 }
 
 EOLIAN static void
-_efl_ui_datepicker_max_set(Eo *obj, Efl_Ui_Datepicker_Data *pd EINA_UNUSED, int year, int month, int day)
+_efl_ui_datepicker_date_max_set(Eo *obj, Efl_Ui_Datepicker_Data *pd EINA_UNUSED, int year, int month, int day)
 {
    int new_time[EFL_UI_DATEPICKER_TYPE_COUNT] = {year, month, day};
 
@@ -296,7 +296,7 @@ _efl_ui_datepicker_max_set(Eo *obj, Efl_Ui_Datepicker_Data *pd EINA_UNUSED, int
 }
 
 EOLIAN static void
-_efl_ui_datepicker_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Datepicker_Data *pd, int *year, int *month, int *day)
+_efl_ui_datepicker_date_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Datepicker_Data *pd, int *year, int *month, int *day)
 {
    *year = pd->max_date[DATEPICKER_YEAR];
    *month = pd->max_date[DATEPICKER_MONTH];
diff --git a/src/lib/elementary/efl_ui_datepicker.eo b/src/lib/elementary/efl_ui_datepicker.eo
index 93e7632023..41791053b7 100644
--- a/src/lib/elementary/efl_ui_datepicker.eo
+++ b/src/lib/elementary/efl_ui_datepicker.eo
@@ -7,7 +7,7 @@ class @beta Efl.Ui.Datepicker extends Efl.Ui.Layout_Base
      value using internal entry.
    ]]
    methods {
-      @property min {
+      @property date_min {
          [[The lower boundary of date.
 
            $year: Year. The year range is from 1900 to 2137.
@@ -26,7 +26,7 @@ class @beta Efl.Ui.Datepicker extends Efl.Ui.Layout_Base
             day: int; [[The day value from 1 to 31.]]
          }
       }
-      @property max {
+      @property date_max {
          [[The upper boundary of date.
 
            $year: Year. The year range is from 1900 to 2137.