diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc
index a0c23597c2..cc913e253b 100644
--- a/data/elementary/themes/edc/efl/datepicker.edc
+++ b/data/elementary/themes/edc/efl/datepicker.edc
@@ -282,25 +282,25 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
    }
    programs {
       program { "entry_active";
-         signal: "efl,state,entry,active";
+         signal: "efl,entry,visible,on";
          source: "efl";
          action: STATE_SET "active";
          target: "efl.entry";
       }
       program { "entry_inactive";
-         signal: "efl,state,entry,inactive";
+         signal: "efl,entry,visible,off";
          source: "efl";
          action: STATE_SET "default";
          target: "efl.entry";
       }
       program { "text_button_active";
-         signal: "efl,state,button,active";
+         signal: "efl,button,visible,on";
          source: "efl";
          action: STATE_SET "default";
          target: "efl.text_button";
       }
       program { "text_button_inactive";
-         signal: "efl,state,button,inactive";
+         signal: "efl,button,visible,off";
          source: "efl";
          action: STATE_SET "inactive";
          target: "efl.text_button";
diff --git a/data/elementary/themes/edc/efl/spin_button.edc b/data/elementary/themes/edc/efl/spin_button.edc
index 91dff76c20..5008295218 100644
--- a/data/elementary/themes/edc/efl/spin_button.edc
+++ b/data/elementary/themes/edc/efl/spin_button.edc
@@ -101,25 +101,25 @@ group { "efl/spin_button/horizontal";
    }
    programs {
       program { "entry_active";
-         signal: "efl,state,entry,active";
+         signal: "efl,entry,visible,on";
          source: "efl";
          action: STATE_SET "active";
          target: "efl.entry";
       }
       program { "entry_inactive";
-         signal: "efl,state,entry,inactive";
+         signal: "efl,entry,visible,off";
          source: "efl";
          action: STATE_SET "default";
          target: "efl.entry";
       }
       program { "text_button_active";
-         signal: "efl,state,button,active";
+         signal: "efl,button,visible,on";
          source: "efl";
          action: STATE_SET "default";
          target: "efl.text_button";
       }
       program { "text_button_inactive";
-         signal: "efl,state,button,inactive";
+         signal: "efl,button,visible,off";
          source: "efl";
          action: STATE_SET "inactive";
          target: "efl.text_button";
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index a4c9122822..bbfd7d7286 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -167,8 +167,8 @@ _entry_hide(Evas_Object *obj)
 {
    Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS);
 
-   efl_layout_signal_emit(obj, "efl,state,button,active", "efl");
-   efl_layout_signal_emit(obj, "efl,state,entry,inactive", "efl");
+   efl_layout_signal_emit(obj, "efl,button,visible,on", "efl");
+   efl_layout_signal_emit(obj, "efl,entry,visible,off", "efl");
 
    if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj)))
      sd->entry_reactivate = EINA_TRUE;
@@ -343,7 +343,7 @@ _entry_show_cb(void *data,
    elm_object_focus_set(obj, EINA_TRUE);
    elm_entry_select_all(obj);
    sd->entry_visible = EINA_TRUE;
-   efl_layout_signal_emit(data, "efl,state,button,inactive", "efl");
+   efl_layout_signal_emit(data, "efl,button,visible,off", "efl");
 }
 
 static void
@@ -378,7 +378,7 @@ _toggle_entry(Evas_Object *obj)
         efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED,
                                _entry_focus_changed_cb, obj);
         sd->entry_visible = EINA_TRUE;
-        efl_layout_signal_emit(obj, "efl,state,entry,active", "efl");
+        efl_layout_signal_emit(obj, "efl,entry,visible,on", "efl");
         {
            Eina_List *items = NULL;