diff --git a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h b/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h
index def50e1b99..d9b40d1544 100644
--- a/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h
+++ b/legacy/ecore/src/lib/ecore_directfb/Ecore_DirectFB.h
@@ -172,7 +172,7 @@ EAPI int ecore_directfb_shutdown(void);
 EAPI IDirectFB * ecore_directfb_interface_get(void);
 /* window operations */
 EAPI Ecore_DirectFB_Window * ecore_directfb_window_new(int x, int y, int w, int h);
-EAPI void ecore_directfb_window_del(Ecore_DirectFB_Window *window);
+EAPI void ecore_directfb_window_free(Ecore_DirectFB_Window *window);
 EAPI void ecore_directfb_window_move(Ecore_DirectFB_Window *window, int x, int y);
 EAPI void ecore_directfb_window_resize(Ecore_DirectFB_Window *window, int w, int h);
 EAPI void ecore_directfb_window_focus(Ecore_DirectFB_Window *window);
diff --git a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
index 7f7f6282af..4b7daf33df 100644
--- a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
+++ b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
@@ -506,7 +506,7 @@ ecore_directfb_window_new(int x, int y, int w, int h)
 }
 
 EAPI void
-ecore_directfb_window_del(Ecore_DirectFB_Window *ecore_window)
+ecore_directfb_window_free(Ecore_DirectFB_Window *ecore_window)
 {
 	DFBCHECK(ecore_window->surface->Release(ecore_window->surface));
 	DFBCHECK(ecore_window->window->Release(ecore_window->window));
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
index 78411087bc..9aeb650c2b 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
@@ -283,7 +283,7 @@ static void
 _ecore_evas_directfb_free(Ecore_Evas *ee)
 {
    eina_hash_del(ecore_evases_hash, _ecore_evas_directfb_winid_str_get(ee->engine.directfb.window->id), ee);
-   ecore_directfb_window_del(ee->engine.directfb.window);
+   ecore_directfb_window_free(ee->engine.directfb.window);
    ecore_evases = _ecore_list2_remove(ecore_evases, ee);
    _ecore_evas_directfb_shutdown();
    ecore_directfb_shutdown();
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
index 681769c621..5be7dc47a1 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
@@ -570,7 +570,7 @@ _ecore_evas_win32_free(Ecore_Evas *ee)
 {
    EINA_ERROR_PINFO("ecore evas free\n");
 
-   ecore_win32_window_del(ee->engine.win32.window);
+   ecore_win32_window_free(ee->engine.win32.window);
    eina_hash_del(ecore_evases_hash, _ecore_evas_win32_winid_str_get(ee->engine.win32.window), ee);
    ecore_evases = _ecore_list2_remove(ecore_evases, ee);
    _ecore_evas_win32_shutdown();
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
index bac057242a..8462f0ba3b 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
@@ -488,7 +488,7 @@ _ecore_evas_wince_free(Ecore_Evas *ee)
 {
    EINA_ERROR_PINFO("ecore evas free\n");
 
-   ecore_wince_window_del(ee->engine.wince.window);
+   ecore_wince_window_free(ee->engine.wince.window);
    eina_hash_del(ecore_evases_hash, _ecore_evas_wince_winid_str_get(ee->engine.wince.window), ee);
    ecore_evases = _ecore_list2_remove(ecore_evases, ee);
    _ecore_evas_wince_shutdown();
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
index 4d81f4be4a..a2f8f048fa 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
@@ -1084,7 +1084,7 @@ _ecore_evas_x_init(void)
 static void
 _ecore_evas_x_free(Ecore_Evas *ee)
 {
-   ecore_x_window_del(ee->prop.window);
+   ecore_x_window_free(ee->prop.window);
    if (ee->engine.x.pmap) ecore_x_pixmap_del(ee->engine.x.pmap);
    if (ee->engine.x.mask) ecore_x_pixmap_del(ee->engine.x.mask);
    if (ee->engine.x.gc) ecore_x_gc_del(ee->engine.x.gc);
@@ -1560,7 +1560,7 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha)
 
 	ee->shaped = 0;
 	ee->alpha = alpha;
-	ecore_x_window_del(ee->prop.window);
+	ecore_x_window_free(ee->prop.window);
 	ecore_event_window_unregister(ee->prop.window);
 	if (ee->alpha)
 	  {
@@ -1632,7 +1632,7 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha)
 
 	ee->shaped = 0;
 	ee->alpha = alpha;
-	ecore_x_window_del(ee->prop.window);
+	ecore_x_window_free(ee->prop.window);
 	ecore_event_window_unregister(ee->prop.window);
 	if (ee->alpha)
 	  {
@@ -1696,7 +1696,7 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha)
 
 	ee->shaped = 0;
 	ee->alpha = alpha;
-	ecore_x_window_del(ee->prop.window);
+	ecore_x_window_free(ee->prop.window);
 	ecore_event_window_unregister(ee->prop.window);
 	if (ee->alpha)
 	  {
diff --git a/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h b/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h
index 2e97dacc70..9e6182c345 100644
--- a/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h
+++ b/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h
@@ -335,7 +335,7 @@ EAPI Ecore_Win32_Window *ecore_win32_window_override_new(Ecore_Win32_Window *par
                                                          int                 width,
                                                          int                 height);
 
-EAPI void ecore_win32_window_del(Ecore_Win32_Window *window);
+EAPI void ecore_win32_window_free(Ecore_Win32_Window *window);
 
 EAPI void *ecore_win32_window_hwnd_get(Ecore_Win32_Window *window);
 
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c
index b60c260606..caf47142ce 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_window.c
@@ -75,7 +75,7 @@ ecore_win32_window_override_new(Ecore_Win32_Window *parent,
 }
 
 void
-ecore_win32_window_del(Ecore_Win32_Window *window)
+ecore_win32_window_free(Ecore_Win32_Window *window)
 {
    struct _Ecore_Win32_Window *wnd = window;
 
diff --git a/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h b/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h
index c6f7aa5e91..1ab2ac2568 100644
--- a/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h
+++ b/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h
@@ -209,7 +209,7 @@ EAPI Ecore_WinCE_Window *ecore_wince_window_new(Ecore_WinCE_Window *parent,
                                                 int                 width,
                                                 int                 height);
 
-EAPI void ecore_wince_window_del(Ecore_WinCE_Window *window);
+EAPI void ecore_wince_window_free(Ecore_WinCE_Window *window);
 
 EAPI void *ecore_wince_window_hwnd_get(Ecore_WinCE_Window *window);
 
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c b/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
index 8fa540a078..e024f6e2ce 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
+++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
@@ -97,7 +97,7 @@ ecore_wince_window_new(Ecore_WinCE_Window *parent,
 }
 
 void
-ecore_wince_window_del(Ecore_WinCE_Window *window)
+ecore_wince_window_free(Ecore_WinCE_Window *window)
 {
    if (!window) return;
 
diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
index 467efa3d62..0e2dd39581 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h
+++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
@@ -1030,7 +1030,7 @@ EAPI void             ecore_x_window_configure(Ecore_X_Window win,
 					       Ecore_X_Window sibling,
 					       int stack_mode);
 EAPI void             ecore_x_window_cursor_set(Ecore_X_Window win, Ecore_X_Cursor c);
-EAPI void             ecore_x_window_del(Ecore_X_Window win);
+EAPI void             ecore_x_window_free(Ecore_X_Window win);
 EAPI void             ecore_x_window_ignore_set(Ecore_X_Window win, int ignore);
 EAPI Ecore_X_Window  *ecore_x_window_ignore_list(int *num);
 
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c
index b02eb7a6ad..4aced95864 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c
@@ -306,7 +306,7 @@ ecore_x_window_override_argb_new(Ecore_X_Window parent,
  * @ingroup Ecore_X_Window_Destroy_Group
  */
 EAPI void
-ecore_x_window_del(Ecore_X_Window window)
+ecore_x_window_free(Ecore_X_Window window)
 {
    /* sorry sir, deleting the root window doesn't sound like
     * a smart idea.
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c
index 61fadb6b0a..eebe6087aa 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window.c
@@ -277,7 +277,7 @@ ecore_x_window_configure(Ecore_X_Window win,
  * @ingroup Evas_X_Window_Destroy_Group
  */
 EAPI void
-ecore_x_window_del(Ecore_X_Window win)
+ecore_x_window_free(Ecore_X_Window win)
 {
    /* sorry sir, deleting the root window doesn't sound like
     * a smart idea.