diff --git a/legacy/emotion/src/bin/emotion_test_main.c b/legacy/emotion/src/bin/emotion_test_main.c
index e3fb103da6..b65f2f47a8 100644
--- a/legacy/emotion/src/bin/emotion_test_main.c
+++ b/legacy/emotion/src/bin/emotion_test_main.c
@@ -352,7 +352,7 @@ bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
 
 	EINA_LIST_FOREACH(video_objs, l, o)
 	  {
-	     Evas_Bool supported;
+	     Eina_Bool supported;
 
 	     supported = emotion_object_vis_supported(o, vis);
 	     if (supported)
diff --git a/legacy/emotion/src/lib/Emotion.h b/legacy/emotion/src/lib/Emotion.h
index aa231cc3c4..95e01e4a57 100644
--- a/legacy/emotion/src/lib/Emotion.h
+++ b/legacy/emotion/src/lib/Emotion.h
@@ -118,38 +118,38 @@ extern "C" {
 /* api calls available */
 EAPI Evas_Object *emotion_object_add                   (Evas *evas);
 EAPI void         emotion_object_module_option_set     (Evas_Object *obj, const char *opt, const char *val);
-EAPI Evas_Bool    emotion_object_init                  (Evas_Object *obj, const char *module_filename);
+EAPI Eina_Bool    emotion_object_init                  (Evas_Object *obj, const char *module_filename);
 EAPI void         emotion_object_file_set              (Evas_Object *obj, const char *filename);
 EAPI const char  *emotion_object_file_get              (Evas_Object *obj);
-EAPI void         emotion_object_play_set              (Evas_Object *obj, Evas_Bool play);
-EAPI Evas_Bool    emotion_object_play_get              (Evas_Object *obj);
+EAPI void         emotion_object_play_set              (Evas_Object *obj, Eina_Bool play);
+EAPI Eina_Bool    emotion_object_play_get              (Evas_Object *obj);
 EAPI void         emotion_object_position_set          (Evas_Object *obj, double sec);
 EAPI double       emotion_object_position_get          (Evas_Object *obj);
-EAPI Evas_Bool    emotion_object_video_handled_get     (Evas_Object *obj);
-EAPI Evas_Bool    emotion_object_audio_handled_get     (Evas_Object *obj);
-EAPI Evas_Bool    emotion_object_seekable_get          (Evas_Object *obj);
+EAPI Eina_Bool    emotion_object_video_handled_get     (Evas_Object *obj);
+EAPI Eina_Bool    emotion_object_audio_handled_get     (Evas_Object *obj);
+EAPI Eina_Bool    emotion_object_seekable_get          (Evas_Object *obj);
 EAPI double       emotion_object_play_length_get       (Evas_Object *obj);
 EAPI void         emotion_object_size_get              (Evas_Object *obj, int *iw, int *ih);
-EAPI void         emotion_object_smooth_scale_set      (Evas_Object *obj, Evas_Bool smooth);
-EAPI Evas_Bool    emotion_object_smooth_scale_get      (Evas_Object *obj);
+EAPI void         emotion_object_smooth_scale_set      (Evas_Object *obj, Eina_Bool smooth);
+EAPI Eina_Bool    emotion_object_smooth_scale_get      (Evas_Object *obj);
 EAPI double       emotion_object_ratio_get             (Evas_Object *obj);
 EAPI void         emotion_object_event_simple_send     (Evas_Object *obj, Emotion_Event ev);
 EAPI void         emotion_object_audio_volume_set      (Evas_Object *obj, double vol);
 EAPI double       emotion_object_audio_volume_get      (Evas_Object *obj);
-EAPI void         emotion_object_audio_mute_set        (Evas_Object *obj, Evas_Bool mute);
-EAPI Evas_Bool    emotion_object_audio_mute_get        (Evas_Object *obj);
+EAPI void         emotion_object_audio_mute_set        (Evas_Object *obj, Eina_Bool mute);
+EAPI Eina_Bool    emotion_object_audio_mute_get        (Evas_Object *obj);
 EAPI int          emotion_object_audio_channel_count   (Evas_Object *obj);
 EAPI const char  *emotion_object_audio_channel_name_get(Evas_Object *obj, int channel);
 EAPI void         emotion_object_audio_channel_set     (Evas_Object *obj, int channel);
 EAPI int          emotion_object_audio_channel_get     (Evas_Object *obj);
-EAPI void         emotion_object_video_mute_set        (Evas_Object *obj, Evas_Bool mute);
-EAPI Evas_Bool    emotion_object_video_mute_get        (Evas_Object *obj);
+EAPI void         emotion_object_video_mute_set        (Evas_Object *obj, Eina_Bool mute);
+EAPI Eina_Bool    emotion_object_video_mute_get        (Evas_Object *obj);
 EAPI int          emotion_object_video_channel_count   (Evas_Object *obj);
 EAPI const char  *emotion_object_video_channel_name_get(Evas_Object *obj, int channel);
 EAPI void         emotion_object_video_channel_set     (Evas_Object *obj, int channel);
 EAPI int          emotion_object_video_channel_get     (Evas_Object *obj);
-EAPI void         emotion_object_spu_mute_set          (Evas_Object *obj, Evas_Bool mute);
-EAPI Evas_Bool    emotion_object_spu_mute_get          (Evas_Object *obj);
+EAPI void         emotion_object_spu_mute_set          (Evas_Object *obj, Eina_Bool mute);
+EAPI Eina_Bool    emotion_object_spu_mute_get          (Evas_Object *obj);
 EAPI int          emotion_object_spu_channel_count     (Evas_Object *obj);
 EAPI const char  *emotion_object_spu_channel_name_get  (Evas_Object *obj, int channel);
 EAPI void         emotion_object_spu_channel_set       (Evas_Object *obj, int channel);
@@ -172,7 +172,7 @@ EAPI const char  *emotion_object_meta_info_get         (Evas_Object *obj, Emotio
 
 EAPI void         emotion_object_vis_set               (Evas_Object *obj, Emotion_Vis visualization);
 EAPI Emotion_Vis  emotion_object_vis_get               (Evas_Object *obj);
-EAPI Evas_Bool    emotion_object_vis_supported         (Evas_Object *obj, Emotion_Vis visualization);
+EAPI Eina_Bool    emotion_object_vis_supported         (Evas_Object *obj, Emotion_Vis visualization);
 
 #ifdef __cplusplus
 }
diff --git a/legacy/emotion/src/lib/emotion_private.h b/legacy/emotion/src/lib/emotion_private.h
index ede8c865c3..d24a0b73b2 100644
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/src/lib/emotion_private.h
@@ -59,7 +59,7 @@ struct _Emotion_Video_Module
    double         (*pos_get) (void *ef);
    void           (*vis_set) (void *ef, Emotion_Vis vis);
    Emotion_Vis    (*vis_get) (void *ef);
-   Evas_Bool      (*vis_supported) (void *ef, Emotion_Vis vis);
+   Eina_Bool      (*vis_supported) (void *ef, Emotion_Vis vis);
    double         (*ratio_get) (void *ef);
    int            (*video_handled) (void *ef);
    int            (*audio_handled) (void *ef);
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index c0a188aaa0..9266b8dbab 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -188,7 +188,7 @@ emotion_object_module_option_set(Evas_Object *obj, const char *opt, const char *
      }
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_init(Evas_Object *obj, const char *module_filename)
 {
    Smart_Data *sd;
@@ -218,10 +218,10 @@ emotion_object_init(Evas_Object *obj, const char *module_filename)
      {
 	if (!_emotion_module_open(module_filename, obj,
 				  &sd->module, &sd->video))
-	  return 0;
+	  return EINA_FALSE;
      }
 
-   return 1;
+   return EINA_TRUE;
 }
 
 EAPI void
@@ -272,7 +272,7 @@ emotion_object_file_get(Evas_Object *obj)
 }
 
 EAPI void
-emotion_object_play_set(Evas_Object *obj, Evas_Bool play)
+emotion_object_play_set(Evas_Object *obj, Eina_Bool play)
 {
    Smart_Data *sd;
 
@@ -285,13 +285,13 @@ emotion_object_play_set(Evas_Object *obj, Evas_Bool play)
    else sd->module->stop(sd->video);
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_play_get(Evas_Object *obj)
 {
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->video) return 0;
+   if (!sd->video) return EINA_FALSE;
 
    return sd->play;
 }
@@ -324,36 +324,36 @@ emotion_object_position_get(Evas_Object *obj)
    return sd->pos;
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_seekable_get(Evas_Object *obj)
 {
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->module) return 0;
-   if (!sd->video) return 0;
+   if (!sd->module) return EINA_FALSE;
+   if (!sd->video) return EINA_FALSE;
    return sd->module->seekable(sd->video);
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_video_handled_get(Evas_Object *obj)
 {
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->module) return 0;
-   if (!sd->video) return 0;
+   if (!sd->module) return EINA_FALSE;
+   if (!sd->video) return EINA_FALSE;
    return sd->module->video_handled(sd->video);
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_audio_handled_get(Evas_Object *obj)
 {
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->module) return 0;
-   if (!sd->video) return 0;
+   if (!sd->module) return EINA_FALSE;
+   if (!sd->video) return EINA_FALSE;
    return sd->module->audio_handled(sd->video);
 }
 
@@ -381,7 +381,7 @@ emotion_object_size_get(Evas_Object *obj, int *iw, int *ih)
 }
 
 EAPI void
-emotion_object_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth)
+emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth)
 {
    Smart_Data *sd;
 
@@ -389,7 +389,7 @@ emotion_object_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth)
    evas_object_image_smooth_scale_set(sd->obj, smooth);
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_smooth_scale_get(Evas_Object *obj)
 {
    Smart_Data *sd;
@@ -443,7 +443,7 @@ emotion_object_audio_volume_get(Evas_Object *obj)
 }
 
 EAPI void
-emotion_object_audio_mute_set(Evas_Object *obj, Evas_Bool mute)
+emotion_object_audio_mute_set(Evas_Object *obj, Eina_Bool mute)
 {
    Smart_Data *sd;
 
@@ -453,14 +453,14 @@ emotion_object_audio_mute_set(Evas_Object *obj, Evas_Bool mute)
    sd->module->audio_channel_mute_set(sd->video, mute);
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_audio_mute_get(Evas_Object *obj)
 {
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->module) return 0;
-   if (!sd->video) return 0;
+   if (!sd->module) return EINA_FALSE;
+   if (!sd->video) return EINA_FALSE;
    return sd->module->audio_channel_mute_get(sd->video);
 }
 
@@ -509,7 +509,7 @@ emotion_object_audio_channel_get(Evas_Object *obj)
 }
 
 EAPI void
-emotion_object_video_mute_set(Evas_Object *obj, Evas_Bool mute)
+emotion_object_video_mute_set(Evas_Object *obj, Eina_Bool mute)
 {
    Smart_Data *sd;
 
@@ -519,14 +519,14 @@ emotion_object_video_mute_set(Evas_Object *obj, Evas_Bool mute)
    sd->module->video_channel_mute_set(sd->video, mute);
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_video_mute_get(Evas_Object *obj)
 {
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->module) return 0;
-   if (!sd->video) return 0;
+   if (!sd->module) return EINA_FALSE;
+   if (!sd->video) return EINA_FALSE;
    return sd->module->video_channel_mute_get(sd->video);
 }
 
@@ -536,8 +536,8 @@ emotion_object_video_channel_count(Evas_Object *obj)
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->module) return 0;
-   if (!sd->video) return 0;
+   if (!sd->module) return EINA_FALSE;
+   if (!sd->video) return EINA_FALSE;
    return sd->module->video_channel_count(sd->video);
 }
 
@@ -575,7 +575,7 @@ emotion_object_video_channel_get(Evas_Object *obj)
 }
 
 EAPI void
-emotion_object_spu_mute_set(Evas_Object *obj, Evas_Bool mute)
+emotion_object_spu_mute_set(Evas_Object *obj, Eina_Bool mute)
 {
    Smart_Data *sd;
 
@@ -585,14 +585,14 @@ emotion_object_spu_mute_set(Evas_Object *obj, Evas_Bool mute)
    sd->module->spu_channel_mute_set(sd->video, mute);
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_spu_mute_get(Evas_Object *obj)
 {
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->module) return 0;
-   if (!sd->video) return 0;
+   if (!sd->module) return EINA_FALSE;
+   if (!sd->video) return EINA_FALSE;
    return sd->module->spu_channel_mute_get(sd->video);
 }
 
@@ -841,15 +841,15 @@ emotion_object_vis_get(Evas_Object *obj)
    return sd->module->vis_get(sd->video);
 }
 
-EAPI Evas_Bool
+EAPI Eina_Bool
 emotion_object_vis_supported(Evas_Object *obj, Emotion_Vis visualization)
 {
    Smart_Data *sd;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
-   if (!sd->module) return 0;
-   if (!sd->video) return 0;
-   if (!sd->module->vis_supported) return 0;
+   if (!sd->module) return EINA_FALSE;
+   if (!sd->video) return EINA_FALSE;
+   if (!sd->module->vis_supported) return EINA_FALSE;
    return sd->module->vis_supported(sd->video, visualization);
 }
 
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index de43d1a9d2..6fbcb82f14 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -59,7 +59,7 @@ static void           em_vis_set                  (void            *video,
 
 static Emotion_Vis    em_vis_get                  (void            *video);
 
-static Evas_Bool      em_vis_supported            (void            *video,
+static Eina_Bool      em_vis_supported            (void            *video,
                                                    Emotion_Vis      vis);
 
 static double         em_ratio_get                (void            *video);
@@ -714,25 +714,25 @@ em_vis_get(void *video)
    return ev->vis;
 }
 
-static Evas_Bool
+static Eina_Bool
 em_vis_supported(void *ef, Emotion_Vis vis)
 {
    const char *name;
    GstElementFactory *factory;
 
    if (vis == EMOTION_VIS_NONE)
-     return 1;
+     return EINA_TRUE;
 
    name = emotion_visualization_element_name_get(vis);
    if (!name)
-     return 0;
+     return EINA_FALSE;
 
    factory = gst_element_factory_find(name);
    if (!factory)
-     return 0;
+     return EINA_FALSE;
 
    gst_object_unref(factory);
-   return 1;
+   return EINA_TRUE;
 }
 
 static double
diff --git a/legacy/emotion/src/modules/vlc/emotion_vlc.c b/legacy/emotion/src/modules/vlc/emotion_vlc.c
index 58cfb5af2e..0741c0b869 100644
--- a/legacy/emotion/src/modules/vlc/emotion_vlc.c
+++ b/legacy/emotion/src/modules/vlc/emotion_vlc.c
@@ -364,12 +364,12 @@ static Emotion_Vis em_vis_get(void *ef)
 	return ev->vis;
 }
 
-static Evas_Bool em_vis_supported(void *ef, Emotion_Vis vis)
+static Eina_Bool em_vis_supported(void *ef, Emotion_Vis vis)
 {
 	Emotion_Vlc_Video *ev;
 
 	ev = (Emotion_Vlc_Video *)ef;
-	return 0;
+	return EINA_FALSE;
 }
 
 static double em_ratio_get(void *ef)
diff --git a/legacy/emotion/src/modules/vlc/emotion_vlc.h b/legacy/emotion/src/modules/vlc/emotion_vlc.h
index fa1d54a4e5..c2c073f552 100644
--- a/legacy/emotion/src/modules/vlc/emotion_vlc.h
+++ b/legacy/emotion/src/modules/vlc/emotion_vlc.h
@@ -59,7 +59,7 @@ static double         em_fps_get                 (void *ef);
 static double         em_pos_get                 (void *ef);
 static void           em_vis_set                 (void *ef, Emotion_Vis vis);
 static Emotion_Vis    em_vis_get                 (void *ef);
-static Evas_Bool      em_vis_supported(void *ef, Emotion_Vis vis);
+static Eina_Bool      em_vis_supported(void *ef, Emotion_Vis vis);
 static double         em_ratio_get               (void *ef);
 static int            em_seekable                (void *ef);
 static void           em_frame_done              (void *ef);
diff --git a/legacy/emotion/src/modules/xine/emotion_xine.c b/legacy/emotion/src/modules/xine/emotion_xine.c
index 920728a68e..13e1614a79 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine.c
@@ -18,7 +18,7 @@ static double         em_fps_get                 (void *ef);
 static double         em_pos_get                 (void *ef);
 static void           em_vis_set                 (void *ef, Emotion_Vis vis);
 static Emotion_Vis    em_vis_get                 (void *ef);
-static Evas_Bool      em_vis_supported           (void *ef, Emotion_Vis vis);
+static Eina_Bool      em_vis_supported           (void *ef, Emotion_Vis vis);
 static double         em_ratio_get               (void *ef);
 static int            em_seekable                (void *ef);
 static void           em_frame_done              (void *ef);
@@ -572,10 +572,10 @@ em_vis_get(void *ef)
    return ev->vis;
 }
 
-static Evas_Bool
+static Eina_Bool
 em_vis_supported(void *ef, Emotion_Vis vis)
 {
-   return 0;
+   return EINA_FALSE;
 }
 
 static double