diff --git a/legacy/evas/src/bin/evas_test_main.c b/legacy/evas/src/bin/evas_test_main.c
index 24d16e763e..f2c197c724 100644
--- a/legacy/evas/src/bin/evas_test_main.c
+++ b/legacy/evas/src/bin/evas_test_main.c
@@ -1976,11 +1976,11 @@ setup(void)
    Evas_Object        *ob;
    int                 iw, ih;
 
-   evas_object_font_path_prepend(evas, FN);
-   //  evas_object_image_cache_set(evas, 1024 * 1024);
-   //  evas_object_font_cache_set(evas, 256 * 1024);
-   evas_object_image_cache_set(evas, 0);
-   evas_object_font_cache_set(evas, 0);
+   evas_font_path_prepend(evas, FN);
+   //  evas_image_cache_set(evas, 1024 * 1024);
+   //  evas_font_cache_set(evas, 256 * 1024);
+   evas_image_cache_set(evas, 0);
+   evas_font_cache_set(evas, 0);
 
    ob = evas_object_image_add(evas);
    evas_object_image_file_set(ob, IM "backdrop.png", NULL);
diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h
index 54331a66f3..1114129e56 100644
--- a/legacy/evas/src/lib/Evas.h
+++ b/legacy/evas/src/lib/Evas.h
@@ -303,10 +303,10 @@ extern "C" {
    int               evas_object_image_smooth_scale_get(Evas_Object *obj);
    void              evas_object_image_reload          (Evas_Object *obj);
        
-   void              evas_object_image_cache_flush     (Evas *e);
-   void              evas_object_image_cache_reload    (Evas *e);
-   void              evas_object_image_cache_set       (Evas *e, int size);
-   int               evas_object_image_cache_get       (Evas *e);
+   void              evas_image_cache_flush            (Evas *e);
+   void              evas_image_cache_reload           (Evas *e);
+   void              evas_image_cache_set              (Evas *e, int size);
+   int               evas_image_cache_get              (Evas *e);
    
    Evas_Object      *evas_object_text_add              (Evas *e);
    void              evas_object_text_font_set         (Evas_Object *obj, const char *font, double size);
@@ -323,14 +323,14 @@ extern "C" {
    int               evas_object_text_char_pos_get     (Evas_Object *obj, int pos, double *cx, double *cy, double *cw, double *ch);
    int               evas_object_text_char_coords_get  (Evas_Object *obj, double x, double y, double *cx, double *cy, double *cw, double *ch);
 
-   void              evas_object_font_path_clear       (Evas *e);
-   void              evas_object_font_path_append      (Evas *e, const char *path);
-   void              evas_object_font_path_prepend     (Evas *e, const char *path);
-   const Evas_List  *evas_object_font_path_list        (Evas *e);
+   void              evas_font_path_clear              (Evas *e);
+   void              evas_font_path_append             (Evas *e, const char *path);
+   void              evas_font_path_prepend            (Evas *e, const char *path);
+   const Evas_List  *evas_font_path_list               (Evas *e);
        
-   void              evas_object_font_cache_flush      (Evas *e);
-   void              evas_object_font_cache_set        (Evas *e, int size);
-   int               evas_object_font_cache_get        (Evas *e);       
+   void              evas_font_cache_flush             (Evas *e);
+   void              evas_font_cache_set               (Evas *e, int size);
+   int               evas_font_cache_get               (Evas *e);       
    
    void              evas_object_del                   (Evas_Object *obj);
 
diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c
index f61cd4b2a2..9a51fcc825 100644
--- a/legacy/evas/src/lib/canvas/evas_main.c
+++ b/legacy/evas/src/lib/canvas/evas_main.c
@@ -94,7 +94,7 @@ evas_free(Evas *e)
 	evas_layer_free(lay);
      }
    
-   evas_object_font_path_clear(e);   
+   evas_font_path_clear(e);   
    e->pointer.object.in = evas_list_free(e->pointer.object.in);
    
    if (e->name_hash) evas_hash_free(e->name_hash);
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index 2ca49c610a..870cebc6d6 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -550,7 +550,7 @@ evas_object_image_reload(Evas_Object *obj)
    return;
    MAGIC_CHECK_END();
    evas_object_image_unload(obj);
-   evas_object_image_cache_flush(obj->layer->evas);
+   evas_image_cache_flush(obj->layer->evas);
    evas_object_image_load(obj);
    o->changed = 1;
    evas_object_change(obj);
@@ -559,7 +559,7 @@ evas_object_image_reload(Evas_Object *obj)
 
 
 void
-evas_object_image_cache_flush(Evas *e)
+evas_image_cache_flush(Evas *e)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -569,7 +569,7 @@ evas_object_image_cache_flush(Evas *e)
 }
 
 void
-evas_object_image_cache_reload(Evas *e)
+evas_image_cache_reload(Evas *e)
 {
    Evas_Object_List *l;
    
@@ -577,7 +577,7 @@ evas_object_image_cache_reload(Evas *e)
    return;
    MAGIC_CHECK_END();
 
-   evas_object_image_cache_flush(e);
+   evas_image_cache_flush(e);
    for (l = (Evas_Object_List *)e->layers; l; l = l->next)
      {
 	Evas_Layer *layer;
@@ -597,7 +597,7 @@ evas_object_image_cache_reload(Evas *e)
 	       }
 	  }
      }
-   evas_object_image_cache_flush(e);
+   evas_image_cache_flush(e);
    for (l = (Evas_Object_List *)e->layers; l; l = l->next)
      {
 	Evas_Layer *layer;
@@ -619,11 +619,11 @@ evas_object_image_cache_reload(Evas *e)
 	       }
 	  }
      }
-   evas_object_image_cache_flush(e);
+   evas_image_cache_flush(e);
 }
 
 void
-evas_object_image_cache_set(Evas *e, int size)
+evas_image_cache_set(Evas *e, int size)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -634,7 +634,7 @@ evas_object_image_cache_set(Evas *e, int size)
 }
 
 int
-evas_object_image_cache_get(Evas *e)
+evas_image_cache_get(Evas *e)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return 0;
diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c
index 76251ebd67..d4c9e9b17a 100644
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/legacy/evas/src/lib/canvas/evas_object_text.c
@@ -525,7 +525,7 @@ evas_object_text_char_coords_get(Evas_Object *obj, double x, double y, double *c
 
 
 void
-evas_object_font_path_clear(Evas *e)
+evas_font_path_clear(Evas *e)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -538,7 +538,7 @@ evas_object_font_path_clear(Evas *e)
 }
 
 void
-evas_object_font_path_append(Evas *e, const char *path)
+evas_font_path_append(Evas *e, const char *path)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -548,7 +548,7 @@ evas_object_font_path_append(Evas *e, const char *path)
 }
 
 void
-evas_object_font_path_prepend(Evas *e, const char *path)
+evas_font_path_prepend(Evas *e, const char *path)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -558,7 +558,7 @@ evas_object_font_path_prepend(Evas *e, const char *path)
 }
 
 const Evas_List *
-evas_object_font_path_list(Evas *e)
+evas_font_path_list(Evas *e)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return NULL;
@@ -571,7 +571,7 @@ evas_object_font_path_list(Evas *e)
 
 
 void
-evas_object_font_cache_flush(Evas *e)
+evas_font_cache_flush(Evas *e)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -581,7 +581,7 @@ evas_object_font_cache_flush(Evas *e)
 }
 
 void
-evas_object_font_cache_set(Evas *e, int size)
+evas_font_cache_set(Evas *e, int size)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return;
@@ -592,7 +592,7 @@ evas_object_font_cache_set(Evas *e, int size)
 }
 
 int
-evas_object_font_cache_get(Evas *e)
+evas_font_cache_get(Evas *e)
 {
    MAGIC_CHECK(e, Evas, MAGIC_EVAS);
    return 0;