diff --git a/src/bin/main.c b/src/bin/main.c
index 41e7c304..22da1153 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -684,7 +684,7 @@ elm_main(int argc, char **argv)
    cmdbox = o = elm_entry_add(win);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_FALSE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    elm_entry_input_panel_layout_set(o, ELM_INPUT_PANEL_LAYOUT_TERMINAL);
    elm_entry_autocapital_type_set(o, ELM_AUTOCAPITAL_TYPE_NONE);
    elm_entry_input_panel_enabled_set(o, EINA_TRUE);
diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index e1dd1229..3b845a1c 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -206,7 +206,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_TRUE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    txt = elm_entry_utf8_to_markup(config->wordsep);
    if (txt)
      {
diff --git a/src/bin/options_helpers.c b/src/bin/options_helpers.c
index bdfc887b..57efc1d5 100644
--- a/src/bin/options_helpers.c
+++ b/src/bin/options_helpers.c
@@ -225,7 +225,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_TRUE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    txt = elm_entry_utf8_to_markup(config->helper.email);
    if (txt)
      {
@@ -249,7 +249,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_TRUE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    txt = elm_entry_utf8_to_markup(config->helper.url.image);
    if (txt)
      {
@@ -273,7 +273,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_TRUE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    txt = elm_entry_utf8_to_markup(config->helper.url.video);
    if (txt)
      {
@@ -297,7 +297,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_TRUE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    txt = elm_entry_utf8_to_markup(config->helper.url.general);
    if (txt)
      {
@@ -321,7 +321,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_TRUE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    txt = elm_entry_utf8_to_markup(config->helper.local.image);
    if (txt)
      {
@@ -345,7 +345,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_TRUE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    txt = elm_entry_utf8_to_markup(config->helper.local.video);
    if (txt)
      {
@@ -369,7 +369,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_entry_single_line_set(o, EINA_TRUE);
    elm_entry_scrollable_set(o, EINA_TRUE);
-   elm_entry_scrollbar_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
    txt = elm_entry_utf8_to_markup(config->helper.local.general);
    if (txt)
      {