diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 95c569ae64..80f201ab26 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -396,13 +396,19 @@ _reload_format(Evas_Object *obj)
           {
              snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
                       field->location);
-             elm_layout_signal_emit(obj, buf, "efl");
+             if (elm_widget_is_legacy(obj))
+               elm_layout_signal_emit(obj, buf, "elm");
+             else
+               elm_layout_signal_emit(obj, buf, "efl");
           }
         else
           {
              snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
                       field->location);
-             elm_layout_signal_emit(obj, buf, "efl");
+             if (elm_widget_is_legacy(obj))
+               elm_layout_signal_emit(obj, buf, "elm");
+             else
+               elm_layout_signal_emit(obj, buf, "efl");
           }
         if (field->location + 1)
           {
@@ -535,7 +541,10 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
           {
              snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
                       field->location);
-             elm_layout_signal_emit(obj, buf, "efl");
+             if (elm_widget_is_legacy(obj))
+               elm_layout_signal_emit(obj, buf, "elm");
+             else
+               elm_layout_signal_emit(obj, buf, "efl");
 
              if (field->location)
                {
@@ -549,7 +558,10 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
           {
              snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
                       field->location);
-             elm_layout_signal_emit(obj, buf, "efl");
+             if (elm_widget_is_legacy(obj))
+               elm_layout_signal_emit(obj, buf, "elm");
+             else
+               elm_layout_signal_emit(obj, buf, "efl");
           }
      }
 
@@ -993,7 +1005,10 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ
 
         snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
                  field->location);
-        elm_layout_signal_emit(obj, buf, "efl");
+        if (elm_widget_is_legacy(obj))
+          elm_layout_signal_emit(obj, buf, "elm");
+        else
+          elm_layout_signal_emit(obj, buf, "efl");
 
         ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
         edje_object_message_signal_process(wd->resize_obj);
@@ -1010,7 +1025,10 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ
 
         snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
                  field->location);
-        elm_layout_signal_emit(obj, buf, "efl");
+        if (elm_widget_is_legacy(obj))
+          elm_layout_signal_emit(obj, buf, "elm");
+        else
+          elm_layout_signal_emit(obj, buf, "efl");
 
         ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
         edje_object_message_signal_process(wd->resize_obj);