diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 4b19988..ee83d08 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -29,7 +29,8 @@ static void _setup(void)
      {
 	o = evas_object_text_add(evas);
 	o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 20);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 20);
         efl_text_set(o, "This is a test string");
         evas_object_text_style_set(o, st);
         efl_gfx_color_set(o, 255, 255, 255, 255);
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index c052f5b..b2a0795 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -38,7 +38,8 @@ static void _setup(void)
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))]);
 
-   efl_text_font_set(o, "Vera-Bold", 20);
+   efl_text_font_family_set(o, "Vera-Bold");
+   efl_text_font_size_set(o, 20);
    efl_text_set(o, buf);
    efl_gfx_color_set(o, 0, 0, 0, 255);
    exp_size_get(o, &w, &h);
diff --git a/src/bin/proxy_textblock.c b/src/bin/proxy_textblock.c
index cf72e65..479fde2 100644
--- a/src/bin/proxy_textblock.c
+++ b/src/bin/proxy_textblock.c
@@ -33,7 +33,8 @@ static void _setup(void)
      {
         o = efl_add(EFL_CANVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 12);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 12);
         efl_text_wrap_set(o, EFL_TEXT_FORMAT_WRAP_WORD);
         efl_text_multiline_set(o, 1);
         efl_text_set(o,
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index 8eeabd2..f9b9833 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -64,7 +64,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
         evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
         efl_gfx_color_set(o, 255, 255, 255, 255);
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index 6b0a42b..2c8838b 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -27,7 +27,8 @@ static void _setup(void)
      {
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 20);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 20);
         efl_text_set(o, "This is a test string");
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index e7f8ef0..c5eca96 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -34,7 +34,8 @@ static void _setup(void)
      {
 	o = evas_object_text_add(evas);
 	o_texts[i] = o;
-	efl_text_font_set(o, "Vera-Bold", 20);
+	efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 20);
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index a3f4df2..beb6a52 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -29,7 +29,8 @@ static void _setup(void)
      {
 	o = evas_object_text_add(evas);
 	o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 20);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 20);
         efl_text_set(o, "This is a test string");
         evas_object_text_style_set(o, st);
         efl_gfx_color_set(o, 255, 255, 255, 255);
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 807abc1..189769d 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -36,7 +36,8 @@ static void _setup(void)
      {
 	o = evas_object_text_add(evas);
 	o_texts[i] = o;
-	efl_text_font_set(o, "Vera-Bold", 20);
+	efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 20);
 	snprintf(buf, sizeof(buf), "%s %s %s %s.",
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
diff --git a/src/bin/ui.c b/src/bin/ui.c
index f7292d1..9192856 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -409,7 +409,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_wallpaper = o;
 
    o = evas_object_text_add(evas);
-   efl_text_font_set(o, "Vera-Bold", 10);
+   efl_text_font_family_set(o, "Vera-Bold");
+   efl_text_font_size_set(o, 10);
    efl_text_set(o, "EXPEDITE");
    efl_gfx_stack_layer_set(o, 100);
    efl_gfx_color_set(o, 0, 0, 0, 100);
@@ -422,7 +423,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_title = o;
 
    o = evas_object_text_add(evas);
-   efl_text_font_set(o, "Vera", 9);
+   efl_text_font_family_set(o, "Vera");
+   efl_text_font_size_set(o, 9);
    efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
    efl_gfx_stack_layer_set(o, 100);
    efl_gfx_color_set(o, 0, 0, 0, 60);
@@ -467,7 +469,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_menu_text_sel = o;
 
    o = evas_object_text_add(evas);
-   efl_text_font_set(o, "Vera", 10);
+   efl_text_font_family_set(o, "Vera");
+   efl_text_font_size_set(o, 10);
    efl_text_set(o, "");
    efl_gfx_color_set(o, 0, 0, 0, 100);
    evas_object_pass_events_set(o, 1);
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 53fc593..75bd58e 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -55,7 +55,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
         evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
         efl_gfx_color_set(o, 255, 255, 255, 255);
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index d913078..5db6cd9 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -55,7 +55,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 61112d6..3d89de0 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -55,7 +55,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 05571b5..ca709f6 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -40,7 +40,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 1]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 9caefc5..5a58671 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -40,7 +40,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 1]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index 8040eca..cf18ed4 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -55,7 +55,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index 4e295fd..5242599 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -55,7 +55,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, icons[i % 13]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index c30847e..7c7dd70 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -71,7 +71,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 34bf7cb..d0512ce 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -71,7 +71,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index c052d3c..b8962a3 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -71,7 +71,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index 6b23ce0..86dd275 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -71,7 +71,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index 64fc4e3..523faaf 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -99,7 +99,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index cc46a4a..2a06e4b 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -99,7 +99,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index b75e982..96c1e11 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -99,7 +99,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 36675a2..bb8febe 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -99,7 +99,8 @@ static void _setup(void)
 
         o = evas_object_text_add(evas);
         o_texts[i] = o;
-        efl_text_font_set(o, "Vera-Bold", 10);
+        efl_text_font_family_set(o, "Vera-Bold");
+        efl_text_font_size_set(o, 10);
         efl_text_set(o, labels[i % 26]);
         efl_gfx_color_set(o, 0, 0, 0, 255);
         efl_gfx_entity_visible_set(o, EINA_TRUE);