diff --git a/legacy/elementary/src/bin/test_tooltip.c b/legacy/elementary/src/bin/test_tooltip.c
index a7cc2210d7..30695011fc 100644
--- a/legacy/elementary/src/bin/test_tooltip.c
+++ b/legacy/elementary/src/bin/test_tooltip.c
@@ -488,17 +488,17 @@ test_tooltip(void *data       __UNUSED__,
    lst = elm_list_add(win);
    li = elm_list_item_append(lst, "Hello", NULL, NULL, NULL, NULL);
    elm_list_item_tooltip_content_cb_set(li, _tt_item_label, NULL, NULL);
-   elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE);
+   elm_list_item_tooltip_window_mode(li, EINA_TRUE);
    li = elm_list_item_append(lst, "Icon Tooltip", NULL, NULL, NULL, NULL);
    elm_list_item_tooltip_content_cb_set(li, _tt_item_icon, NULL, NULL);
    li = elm_list_item_append(lst, "Big Icon Tooltip", NULL, NULL, NULL, NULL);
    elm_list_item_tooltip_content_cb_set(li, _tt_item_icon2, NULL, NULL);
    elm_list_item_tooltip_style_set(li, "transparent");
-   elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE);
+   elm_list_item_tooltip_window_mode(li, EINA_TRUE);
    li = elm_list_item_append(lst, "Insanely Big Icon Tooltip", NULL, NULL, NULL, NULL);
    elm_list_item_tooltip_content_cb_set(li, _tt_item_icon3, NULL, NULL);
    elm_list_item_tooltip_style_set(li, "transparent");
-   elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE);
+   elm_list_item_tooltip_window_mode(li, EINA_TRUE);
    evas_object_size_hint_weight_set(lst, EVAS_HINT_EXPAND,
                                     EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(lst, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index cfff39321a..31814a7739 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -9660,7 +9660,7 @@ extern "C" {
     * This function allows a tooltip to expand beyond its parant window's canvas.
     * It will instead be limited only by the size of the display.
     */
-   EAPI Eina_Bool          elm_gengrid_item_tooltip_size_restrict_disable(Elm_Gengrid_Item *item, Eina_Bool disable);
+   EAPI Eina_Bool          elm_gengrid_item_tooltip_window_mode(Elm_Gengrid_Item *item, Eina_Bool disable);
    /**
     * @brief Retrieve size restriction state of an object's tooltip
     * @param item The tooltip's anchor object
@@ -9670,7 +9670,7 @@ extern "C" {
     * its parant window's canvas.
     * It will instead be limited only by the size of the display.
     */
-   EAPI Eina_Bool          elm_gengrid_item_tooltip_size_restrict_disabled_get(const Elm_Gengrid_Item *item);
+   EAPI Eina_Bool          elm_gengrid_item_tooltip_window_moded_get(const Elm_Gengrid_Item *item);
    /**
     * Set the type of mouse pointer/cursor decoration to be shown,
     * when the mouse pointer is over the given gengrid widget item
@@ -16063,8 +16063,8 @@ extern "C" {
    EAPI void         elm_object_tooltip_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI void         elm_object_tooltip_style_set(Evas_Object *obj, const char *style) EINA_ARG_NONNULL(1);
    EAPI const char  *elm_object_tooltip_style_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
-   EAPI Eina_Bool    elm_tooltip_size_restrict_disable(Evas_Object *obj, Eina_Bool disable) EINA_ARG_NONNULL(1);
-   EAPI Eina_Bool    elm_tooltip_size_restrict_disabled_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+   EAPI Eina_Bool    elm_object_tooltip_window_mode_set(Evas_Object *obj, Eina_Bool disable) EINA_ARG_NONNULL(1);
+   EAPI Eina_Bool    elm_object_tooltip_window_mode_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
 
    /**
     * @}
@@ -17532,7 +17532,7 @@ extern "C" {
     * This function allows a tooltip to expand beyond its parant window's canvas.
     * It will instead be limited only by the size of the display.
     */
-   EAPI Eina_Bool        elm_list_item_tooltip_size_restrict_disable(Elm_List_Item *item, Eina_Bool disable) EINA_ARG_NONNULL(1);
+   EAPI Eina_Bool        elm_list_item_tooltip_window_mode(Elm_List_Item *item, Eina_Bool disable) EINA_ARG_NONNULL(1);
    /**
     * @brief Retrieve size restriction state of an object's tooltip
     * @param obj The tooltip's anchor object
@@ -17542,7 +17542,7 @@ extern "C" {
     * its parant window's canvas.
     * It will instead be limited only by the size of the display.
     */
-   EAPI Eina_Bool        elm_list_item_tooltip_size_restrict_disabled_get(const Elm_List_Item *item) EINA_ARG_NONNULL(1);
+   EAPI Eina_Bool        elm_list_item_tooltip_window_moded_get(const Elm_List_Item *item) EINA_ARG_NONNULL(1);
 
    /**
     * Set the content to be shown in the tooltip item.
@@ -20000,7 +20000,7 @@ extern "C" {
     * This function allows a tooltip to expand beyond its parant window's canvas.
     * It will instead be limited only by the size of the display.
     */
-   EAPI Eina_Bool          elm_genlist_item_tooltip_size_restrict_disable(Elm_Genlist_Item *item, Eina_Bool disable);
+   EAPI Eina_Bool          elm_genlist_item_tooltip_window_mode(Elm_Genlist_Item *item, Eina_Bool disable);
    /**
     * @brief Retrieve size restriction state of an object's tooltip
     * @param item The tooltip's anchor object
@@ -20010,7 +20010,7 @@ extern "C" {
     * its parant window's canvas.
     * It will instead be limited only by the size of the display.
     */
-   EAPI Eina_Bool          elm_genlist_item_tooltip_size_restrict_disabled_get(const Elm_Genlist_Item *item);
+   EAPI Eina_Bool          elm_genlist_item_tooltip_window_moded_get(const Elm_Genlist_Item *item);
    /**
     * Set the type of mouse pointer/cursor decoration to be shown,
     * when the mouse pointer is over the given genlist widget item
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index a1532e2590..df5ad3c567 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -1041,7 +1041,7 @@ _item_realize(Elm_Gen_Item *it)
                                                it->tooltip.content_cb,
                                                it->tooltip.data, NULL);
         elm_widget_item_tooltip_style_set(it, it->tooltip.style);
-        elm_widget_item_tooltip_size_restrict_disable(it, it->tooltip.free_size);
+        elm_widget_item_tooltip_window_mode(it, it->tooltip.free_size);
      }
 
    if (it->mouse_cursor)
@@ -2413,7 +2413,7 @@ elm_gengrid_item_tooltip_content_cb_set(Elm_Gen_Item           *it,
                                                it->tooltip.content_cb,
                                                it->tooltip.data, NULL);
         elm_widget_item_tooltip_style_set(it, it->tooltip.style);
-        elm_widget_item_tooltip_size_restrict_disable(it, it->tooltip.free_size);
+        elm_widget_item_tooltip_window_mode(it, it->tooltip.free_size);
      }
 
    return;
@@ -2456,16 +2456,16 @@ elm_gengrid_item_tooltip_style_get(const Elm_Gen_Item *it)
 }
 
 EAPI Eina_Bool
-elm_gengrid_item_tooltip_size_restrict_disable(Elm_Gen_Item *it, Eina_Bool disable)
+elm_gengrid_item_tooltip_window_mode(Elm_Gen_Item *it, Eina_Bool disable)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
    it->tooltip.free_size = disable;
-   if (VIEW(it)) return elm_widget_item_tooltip_size_restrict_disable(it, disable);
+   if (VIEW(it)) return elm_widget_item_tooltip_window_mode(it, disable);
    return EINA_TRUE;
 }
 
 EAPI Eina_Bool
-elm_gengrid_item_tooltip_size_restrict_disabled_get(const Elm_Gen_Item *it)
+elm_gengrid_item_tooltip_window_moded_get(const Elm_Gen_Item *it)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
    return it->tooltip.free_size;
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 468cb6dc5e..4c188c01fb 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -1935,7 +1935,7 @@ _item_realize(Elm_Gen_Item *it,
                                                it->tooltip.content_cb,
                                                it->tooltip.data, NULL);
         elm_widget_item_tooltip_style_set(it, it->tooltip.style);
-        elm_widget_item_tooltip_size_restrict_disable(it, it->tooltip.free_size);
+        elm_widget_item_tooltip_window_mode(it, it->tooltip.free_size);
      }
 
    if (it->mouse_cursor)
@@ -4511,7 +4511,7 @@ elm_genlist_item_tooltip_content_cb_set(Elm_Gen_Item           *it,
                                                it->tooltip.content_cb,
                                                it->tooltip.data, NULL);
         elm_widget_item_tooltip_style_set(it, it->tooltip.style);
-        elm_widget_item_tooltip_size_restrict_disable(it, it->tooltip.free_size);
+        elm_widget_item_tooltip_window_mode(it, it->tooltip.free_size);
      }
 
    return;
@@ -4554,16 +4554,16 @@ elm_genlist_item_tooltip_style_get(const Elm_Gen_Item *it)
 }
 
 EAPI Eina_Bool
-elm_genlist_item_tooltip_size_restrict_disable(Elm_Gen_Item *it, Eina_Bool disable)
+elm_genlist_item_tooltip_window_mode(Elm_Gen_Item *it, Eina_Bool disable)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
    it->tooltip.free_size = disable;
-   if (VIEW(it)) return elm_widget_item_tooltip_size_restrict_disable(it, disable);
+   if (VIEW(it)) return elm_widget_item_tooltip_window_mode(it, disable);
    return EINA_TRUE;
 }
 
 EAPI Eina_Bool
-elm_genlist_item_tooltip_size_restrict_disabled_get(const Elm_Gen_Item *it)
+elm_genlist_item_tooltip_window_moded_get(const Elm_Gen_Item *it)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
    return it->tooltip.free_size;
diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c
index 6634326f5b..c67f7b4497 100644
--- a/legacy/elementary/src/lib/elm_list.c
+++ b/legacy/elementary/src/lib/elm_list.c
@@ -1921,17 +1921,17 @@ elm_list_item_tooltip_unset(Elm_List_Item *item)
 }
 
 EAPI Eina_Bool
-elm_list_item_tooltip_size_restrict_disable(Elm_List_Item *item, Eina_Bool disable)
+elm_list_item_tooltip_window_mode(Elm_List_Item *item, Eina_Bool disable)
 {
    ELM_LIST_ITEM_CHECK_DELETED_RETURN(item, EINA_FALSE);
-   return elm_widget_item_tooltip_size_restrict_disable(item, disable);
+   return elm_widget_item_tooltip_window_mode(item, disable);
 }
 
 EAPI Eina_Bool
-elm_list_item_tooltip_size_restrict_disabled_get(const Elm_List_Item *item)
+elm_list_item_tooltip_window_moded_get(const Elm_List_Item *item)
 {
    ELM_LIST_ITEM_CHECK_DELETED_RETURN(item, EINA_FALSE);
-   return elm_widget_item_tooltip_size_restrict_disabled_get(item);
+   return elm_widget_item_tooltip_window_moded_get(item);
 }
 
 EAPI void
diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c
index e904410d37..f6775c106b 100644
--- a/legacy/elementary/src/lib/elm_widget.c
+++ b/legacy/elementary/src/lib/elm_widget.c
@@ -3130,17 +3130,17 @@ _elm_widget_item_tooltip_style_set(Elm_Widget_Item *item,
 }
 
 EAPI Eina_Bool
-_elm_widget_item_tooltip_size_restrict_disable(Elm_Widget_Item *item, Eina_Bool disable)
+_elm_widget_item_tooltip_window_mode(Elm_Widget_Item *item, Eina_Bool disable)
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_FALSE);
-   return elm_tooltip_size_restrict_disable(item->view, disable);
+   return elm_object_tooltip_window_mode_set(item->view, disable);
 }
 
 EAPI Eina_Bool
-_elm_widget_item_tooltip_size_restrict_disabled_get(const Elm_Widget_Item *item)
+_elm_widget_item_tooltip_window_moded_get(const Elm_Widget_Item *item)
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_FALSE);
-   return elm_tooltip_size_restrict_disabled_get(item->view);
+   return elm_object_tooltip_window_mode_get(item->view);
 }
 
 /**
diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h
index 21b7d1b682..f53b8c5828 100644
--- a/legacy/elementary/src/lib/elm_widget.h
+++ b/legacy/elementary/src/lib/elm_widget.h
@@ -438,8 +438,8 @@ EAPI void             _elm_widget_item_tooltip_translatable_text_set(Elm_Widget_
 EAPI void             _elm_widget_item_tooltip_content_cb_set(Elm_Widget_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
 EAPI void             _elm_widget_item_tooltip_unset(Elm_Widget_Item *item);
 EAPI void             _elm_widget_item_tooltip_style_set(Elm_Widget_Item *item, const char *style);
-EAPI Eina_Bool        _elm_widget_item_tooltip_size_restrict_disable(Elm_Widget_Item *item, Eina_Bool disable);
-EAPI Eina_Bool        _elm_widget_item_tooltip_size_restrict_disabled_get(const Elm_Widget_Item *item);
+EAPI Eina_Bool        _elm_widget_item_tooltip_window_mode(Elm_Widget_Item *item, Eina_Bool disable);
+EAPI Eina_Bool        _elm_widget_item_tooltip_window_moded_get(const Elm_Widget_Item *item);
 EAPI const char      *_elm_widget_item_tooltip_style_get(const Elm_Widget_Item *item);
 EAPI void             _elm_widget_item_cursor_set(Elm_Widget_Item *item, const char *cursor);
 EAPI const char      *_elm_widget_item_cursor_get(const Elm_Widget_Item *item);
@@ -542,11 +542,11 @@ EAPI void             elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
 #define elm_widget_item_tooltip_style_set(item, style) \
   _elm_widget_item_tooltip_style_set((Elm_Widget_Item *)item, style)
 
-#define elm_widget_item_tooltip_size_restrict_disable(item, disable) \
-  _elm_widget_item_tooltip_size_restrict_disable((Elm_Widget_Item *)item, disable)
+#define elm_widget_item_tooltip_window_mode(item, disable) \
+  _elm_widget_item_tooltip_window_mode((Elm_Widget_Item *)item, disable)
 
-#define elm_widget_item_tooltip_size_restrict_disabled_get(item) \
-  _elm_widget_item_tooltip_size_restrict_disabled_get((Elm_Widget_Item *)item)
+#define elm_widget_item_tooltip_window_moded_get(item) \
+  _elm_widget_item_tooltip_window_moded_get((Elm_Widget_Item *)item)
 /**
  * Convenience function to query item's tooltip style.
  * @see _elm_widget_item_tooltip_style_get()
diff --git a/legacy/elementary/src/lib/els_tooltip.c b/legacy/elementary/src/lib/els_tooltip.c
index 99b6b075fa..68d1db8043 100644
--- a/legacy/elementary/src/lib/els_tooltip.c
+++ b/legacy/elementary/src/lib/els_tooltip.c
@@ -936,7 +936,7 @@ elm_tooltip_delay_set(double delay)
  * It will instead be limited only by the size of the display.
  */
 EAPI Eina_Bool
-elm_tooltip_size_restrict_disable(Evas_Object *obj, Eina_Bool disable)
+elm_object_tooltip_window_mode_set(Evas_Object *obj, Eina_Bool disable)
 {
    ELM_TOOLTIP_GET_OR_RETURN(tt, obj, EINA_FALSE);
    return tt->free_size = disable;
@@ -952,7 +952,7 @@ elm_tooltip_size_restrict_disable(Evas_Object *obj, Eina_Bool disable)
  * It will instead be limited only by the size of the display.
  */
 EAPI Eina_Bool
-elm_tooltip_size_restrict_disabled_get(const Evas_Object *obj)
+elm_object_tooltip_window_mode_get(const Evas_Object *obj)
 {
    ELM_TOOLTIP_GET_OR_RETURN(tt, obj, EINA_FALSE);
    return tt->free_size;