Fix to replace elm legacy part namedevs/jaehyun/efl_part_legacy_remove_final

24 files changed, 294 insertions, 277 deletions

diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc
index d3ee5161b2..50013c5a1e 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -170,7 +170,7 @@ group { "efl/border";
       }
 
       /* modal window blocker */
-      rect { "rect.blocker";
+      rect { "efl.rect.blocker";
          required;
          desc { "default";
             rel1.to: "top_clip";
@@ -241,11 +241,11 @@ group { "efl/border";
          desc { "default";
             rel1.relative: 1.0 0.0;
             rel1.offset: 1 3;
-            rel1.to_x: "event.icon";
+            rel1.to_x: "efl.event.icon";
             rel1.to_y: "shadow_spacer";
             rel2.relative: 0.0 0.0;
             rel2.offset: -2 3;
-            rel2.to_x: "event.minimize";
+            rel2.to_x: "efl.event.minimize";
             rel2.to_y: "shadow_spacer";
             align: 0.5 0.0;
             color_class: "border_title";
@@ -269,11 +269,11 @@ group { "efl/border";
          desc { "default";
             rel1.relative: 1.0 0.0;
             rel1.offset: 1 2;
-            rel1.to_x: "event.icon";
+            rel1.to_x: "efl.event.icon";
             rel1.to_y: "shadow_spacer";
             rel2.relative: 0.0 0.0;
             rel2.offset: -1 2;
-            rel2.to_x: "event.minimize";
+            rel2.to_x: "efl.event.minimize";
             rel2.to_y: "shadow_spacer";
             align: 0.5 0.0;
             color_class: "border_title_active";
@@ -292,10 +292,10 @@ group { "efl/border";
             visible: 1;
          }
       }
-      spacer {  "spacer.icon";
+      spacer {  "icon";
          desc { "default";
-            rel1.to: "event.icon";
-            rel2.to: "event.icon";
+            rel1.to: "efl.event.icon";
+            rel2.to: "efl.event.icon";
          }
          desc { "bounce1";
             inherit: "default";
@@ -311,9 +311,9 @@ group { "efl/border";
       swallow {  "efl.icon"; nomouse;
          clip_to: "top_clip";
          desc { "default";
-            rel1.to: "spacer.icon";
+            rel1.to: "icon";
             rel1.relative: 0.15 0.15;
-            rel2.to: "spacer.icon";
+            rel2.to: "icon";
             rel2.relative: 0.85 0.85;
             rel2.offset: 0 0;
          }
@@ -338,10 +338,10 @@ group { "efl/border";
             max: 20 20;
             rel1.relative: 1.0 0.0;
             rel1.offset: 2 -0;
-            rel1.to: "event.icon";
+            rel1.to: "efl.event.icon";
             rel2.relative: 1.0 1.0;
             rel2.offset: 2 -1;
-            rel2.to: "event.icon";
+            rel2.to: "efl.event.icon";
             align: 0.0 0.5;
             fixed: 1 1;
          }
@@ -387,8 +387,8 @@ group { "efl/border";
          clip: "clip1";
          desc { "default";
             image.normal: "sym_close_dark_normal.png";
-            rel1.to: "event.close";
-            rel2.to: "event.close";
+            rel1.to: "efl.event.close";
+            rel2.to: "efl.event.close";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -402,8 +402,8 @@ group { "efl/border";
          clip: "clip1";
          desc { "default";
             image.normal: "sym_up_dark_normal.png";
-            rel1.to: "event.maximize";
-            rel2.to: "event.maximize";
+            rel1.to: "efl.event.maximize";
+            rel2.to: "efl.event.maximize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -417,8 +417,8 @@ group { "efl/border";
          clip: "clip1";
          desc { "default";
             image.normal: "sym_down_dark_normal.png";
-            rel1.to: "event.minimize";
-            rel2.to: "event.minimize";
+            rel1.to: "efl.event.minimize";
+            rel2.to: "efl.event.minimize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -432,8 +432,8 @@ group { "efl/border";
          clip: "clip2";
          desc { "default";
             image.normal: "sym_close_light_normal.png";
-            rel1.to: "event.close";
-            rel2.to: "event.close";
+            rel1.to: "efl.event.close";
+            rel2.to: "efl.event.close";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -447,8 +447,8 @@ group { "efl/border";
          clip: "clip2";
          desc { "default";
             image.normal: "sym_up_light_normal.png";
-            rel1.to: "event.maximize";
-            rel2.to: "event.maximize";
+            rel1.to: "efl.event.maximize";
+            rel2.to: "efl.event.maximize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -462,8 +462,8 @@ group { "efl/border";
          clip: "clip2";
          desc { "default";
             image.normal: "sym_down_light_normal.png";
-            rel1.to: "event.minimize";
-            rel2.to: "event.minimize";
+            rel1.to: "efl.event.minimize";
+            rel2.to: "efl.event.minimize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -473,7 +473,7 @@ group { "efl/border";
             image.normal: "sym_down_light_selected.png";
          }
       }
-      rect {  "event.icon";
+      rect {  "efl.event.icon";
          desc { "default";
             rel1.relative: 0.0 0.0;
             rel1.to: "top_clip";
@@ -484,19 +484,19 @@ group { "efl/border";
             color: 0 0 0 0;
          }
       }
-      rect {  "event.titlebar";
+      rect {  "efl.event.titlebar";
          desc { "default";
             rel1.relative: 1.0 0.0;
-            rel1.to_x: "event.icon";
+            rel1.to_x: "efl.event.icon";
             rel1.to_y: "top_clip";
             rel2.relative: 0.0 1.0;
             rel2.offset: 0 -1;
-            rel2.to_x: "event.minimize";
+            rel2.to_x: "efl.event.minimize";
             rel2.to_y: "top_clip";
             color: 0 0 0 0;
          }
       }
-      rect {  "event.close";
+      rect {  "efl.event.close";
          desc { "default";
             rel.to: "top_clip";
             rel1.relative: 1.0 0.0;
@@ -506,29 +506,29 @@ group { "efl/border";
             color: 0 0 0 0;
          }
       }
-      rect {  "event.maximize";
+      rect {  "efl.event.maximize";
          desc { "default";
             rel1.relative: -0.25 0.0;
             rel1.offset: -1 0;
-            rel1.to_x: "event.close";
+            rel1.to_x: "efl.event.close";
             rel1.to_y: "top_clip";
             rel2.relative: -0.25 1.0;
-            rel2.to_x: "event.close";
+            rel2.to_x: "efl.event.close";
             rel2.to_y: "top_clip";
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             color: 0 0 0 0;
          }
       }
-      rect {  "event.minimize";
+      rect {  "efl.event.minimize";
          desc { "default";
             rel1.relative: 0.0 0.0;
             rel1.offset: -1 0;
-            rel1.to_x: "event.maximize";
+            rel1.to_x: "efl.event.maximize";
             rel1.to_y: "top_clip";
             rel2.relative: 0.0 1.0;
             rel2.to_y: "top_clip";
-            rel2.to_x: "event.maximize";
+            rel2.to_x: "efl.event.maximize";
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             color: 0 0 0 0;
@@ -812,25 +812,25 @@ group { "efl/border";
       program {
          signal: "elm,state,urgent"; source: "elm";
          action: STATE_SET "bounce1";
-         target: "spacer.icon";
+         target: "icon";
          after: "urg1";
       }
       program { name: "urg1";
          action: STATE_SET "bounce2";
          transition: DECELERATE 0.4;
-         target: "spacer.icon";
+         target: "icon";
          after: "urg2";
       }
       program { name: "urg2";
          action: STATE_SET "bounce1";
          transition: ACCELERATE 0.3;
-         target: "spacer.icon";
+         target: "icon";
          after: "urg1";
       }
       program {
          signal: "elm,state,not_urgent"; source: "elm";
          action: STATE_SET "default";
-         target: "spacer.icon";
+         target: "icon";
       }
       program { name: "spin";
          signal: "elm,state,hung"; source: "elm";
@@ -976,71 +976,71 @@ group { "efl/border";
       program { name: "hide_blocker";
          signal: "elm,action,hide_blocker"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "rect.blocker";
+         target: "efl.rect.blocker";
          transition: DECELERATE 0.2;
       }
       program { name: "show_blocker";
          signal: "elm,action,show_blocker"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         target: "rect.blocker";
+         target: "efl.rect.blocker";
          transition: DECELERATE 0.2;
       }
 
       /* minimize, maximize & close buttons */
       program {
-         signal: "mouse,down,*"; source: "event.close";
+         signal: "mouse,down,*"; source: "efl.event.close";
          action: STATE_SET "selected";
          target: "close1";
          target: "close2";
       }
       program {
-         signal: "mouse,up,*"; source: "event.close";
+         signal: "mouse,up,*"; source: "efl.event.close";
          action: STATE_SET "default";
          target: "close1";
          target: "close2";
       }
       program {
-         signal: "mouse,down,*"; source: "event.maximize";
+         signal: "mouse,down,*"; source: "efl.event.maximize";
          action: STATE_SET "selected";
          target: "max1";
          target: "max2";
       }
       program {
-         signal: "mouse,up,*"; source: "event.maximize";
+         signal: "mouse,up,*"; source: "efl.event.maximize";
          action: STATE_SET "default";
          target: "max1";
          target: "max2";
       }
       program {
-         signal: "mouse,down,*"; source: "event.minimize";
+         signal: "mouse,down,*"; source: "efl.event.minimize";
          action: STATE_SET "selected";
          target: "min1";
          target: "min2";
       }
       program {
-         signal: "mouse,up,*"; source: "event.minimize";
+         signal: "mouse,up,*"; source: "efl.event.minimize";
          action: STATE_SET "default";
          target: "min1";
          target: "min2";
       }
       program {
-         signal: "mouse,down,1"; source: "event.titlebar";
+         signal: "mouse,down,1"; source: "efl.event.titlebar";
          action: SIGNAL_EMIT "elm,action,move,start" "elm";
       }
       program {
-         signal: "mouse,up,1"; source: "event.titlebar";
+         signal: "mouse,up,1"; source: "efl.event.titlebar";
          action: SIGNAL_EMIT "elm,action,move,stop" "elm";
       }
       program {
-         signal: "mouse,clicked,1"; source: "event.minimize";
+         signal: "mouse,clicked,1"; source: "efl.event.minimize";
          action: SIGNAL_EMIT "elm,action,minimize" "elm";
       }
       program {
-         signal: "mouse,clicked,1"; source: "event.maximize";
+         signal: "mouse,clicked,1"; source: "efl.event.maximize";
          action: SIGNAL_EMIT "elm,action,maximize" "elm";
       }
       program {
-         signal: "mouse,clicked,1"; source: "event.close";
+         signal: "mouse,clicked,1"; source: "efl.event.close";
          action: SIGNAL_EMIT "elm,action,close" "elm";
       }
       program {
@@ -1116,7 +1116,7 @@ group { "efl/border";
          action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.br";
       }
       program {
-         signal: "mouse,clicked,1"; source: "event.icon";
+         signal: "mouse,clicked,1"; source: "efl.event.icon";
          action: SIGNAL_EMIT "elm,action,menu" "elm";
       }
    }
@@ -1128,7 +1128,7 @@ group { "efl/border/dialog";
       text {  "efl.text.title";
          clip: "top_clip";
          desc { "default";
-            rel2.to_x: "event.close";
+            rel2.to_x: "efl.event.close";
          }
          desc { "focused";
             inherit: "default";
@@ -1137,7 +1137,7 @@ group { "efl/border/dialog";
       }
       text {  "title2";
          desc { "default";
-            rel2.to_x: "event.close";
+            rel2.to_x: "efl.event.close";
          }
          desc { "focused";
             inherit: "default";
@@ -1176,12 +1176,12 @@ group { "efl/border/dialog";
             visible: 0;
          }
       }
-      rect {  "event.maximize";
+      rect {  "efl.event.maximize";
          desc { "default";
             visible: 0;
          }
       }
-      rect {  "event.minimize";
+      rect {  "efl.event.minimize";
          desc { "default";
             visible: 0;
          }
diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc
index f0fa470313..32e958586a 100644
--- a/data/elementary/themes/edc/efl/datepicker.edc
+++ b/data/elementary/themes/edc/efl/datepicker.edc
@@ -97,7 +97,7 @@ group { "efl/datepicker";
             align: 1.0 1.0;
          }
       }
-      swallow { "field0";
+      swallow { "efl.field0";
          mouse;
          scale;
          desc { "default";
@@ -119,13 +119,13 @@ group { "efl/datepicker";
             max: 10 -1;
             rel1 {
                relative: 1.0 0.0;
-               to: "field0";
+               to: "efl.field0";
             }
-            rel2.to: "field0";
+            rel2.to: "efl.field0";
             align: 0.0 0.5;
          }
       }
-      swallow { "field1";
+      swallow { "efl.field1";
          mouse;
          scale;
          desc { "default";
@@ -148,15 +148,15 @@ group { "efl/datepicker";
             fixed: 1 0;
             min: 10 0;
             max: 10 -1;
-            rel1.to: "field2";
+            rel1.to: "efl.field2";
             rel2 {
                relative: 0.0 1.0;
-               to: "field2";
+               to: "efl.field2";
             }
             align: 1.0 0.5;
          }
       }
-      swallow { "field2";
+      swallow { "efl.field2";
          mouse;
          scale;
          desc { "default";
@@ -186,7 +186,7 @@ group { "efl/datepicker/spin_button";
    parts {
       rect { "clip";
          desc { "default";
-            rel.to: "elm.swallow.text_button";
+            rel.to: "efl.text_button";
          }
       }
       spacer { "base";
@@ -215,7 +215,7 @@ group { "efl/datepicker/spin_button";
             vis;
          }
       }
-      swallow { "elm.swallow.inc_button";
+      swallow { "efl.inc_button";
          scale;
          desc { "default";
             align: 0.5 0.0;
@@ -224,7 +224,7 @@ group { "efl/datepicker/spin_button";
             fixed: 1 1;
          }
       }
-      swallow { "elm.swallow.dec_button";
+      swallow { "efl.dec_button";
          scale;
          desc { "default";
             align: 0.5 1.0;
@@ -233,12 +233,12 @@ group { "efl/datepicker/spin_button";
             fixed: 1 1;
          }
       }
-      swallow { "elm.swallow.entry";
+      swallow { "efl.entry";
          clip: "clip";
          desc { "default";
             fixed: 1 1;
-            rel1.to: "elm.swallow.text_button";
-            rel2.to: "elm.swallow.text_button";
+            rel1.to: "efl.text_button";
+            rel2.to: "efl.text_button";
             hid;
          }
          desc { "active";
@@ -246,16 +246,16 @@ group { "efl/datepicker/spin_button";
             vis;
          }
       }
-      swallow { "elm.swallow.text_button";
+      swallow { "efl.text_button";
          scale;
          desc { "default";
             rel.to_x: "base";
             rel1 {
-               to_y: "elm.swallow.inc_button";
+               to_y: "efl.inc_button";
                relative: 0.0 1.0;
             }
             rel2 {
-               to_y: "elm.swallow.dec_button";
+               to_y: "efl.dec_button";
                relative: 1.0 0.0;
             }
             min: 0 70;
@@ -285,25 +285,25 @@ group { "efl/datepicker/spin_button";
          signal: "elm,state,entry,active";
          source: "elm";
          action: STATE_SET "active";
-         target: "elm.swallow.entry";
+         target: "efl.entry";
       }
       program { "entry_inactive";
          signal: "elm,state,entry,inactive";
          source: "elm";
          action: STATE_SET "default";
-         target: "elm.swallow.entry";
+         target: "efl.entry";
       }
       program { "text_button_active";
          signal: "elm,state,button,active";
          source: "elm";
          action: STATE_SET "default";
-         target: "elm.swallow.text_button";
+         target: "efl.text_button";
       }
       program { "text_button_inactive";
          signal: "elm,state,button,inactive";
          source: "elm";
          action: STATE_SET "inactive";
-         target: "elm.swallow.text_button";
+         target: "efl.text_button";
       }
       program { "access_activate";
          signal: "elm,state,access,active";
diff --git a/data/elementary/themes/edc/efl/pager.edc b/data/elementary/themes/edc/efl/pager.edc
index 397af0bc59..d02be54b82 100644
--- a/data/elementary/themes/edc/efl/pager.edc
+++ b/data/elementary/themes/edc/efl/pager.edc
@@ -5,19 +5,19 @@ group { "efl/pager";
          desc { "default";
          }
       }
-      swallow { "elm.swallow.background";
+      swallow { "efl.background";
          scale;
          desc { "default";
          }
       }
-      swallow { "page_root";
+      swallow { "efl.page_root";
          scale;
          desc { "default";
             rel1.relative: 0.0 1.0;
-            rel1.to: "indicator";
+            rel1.to: "efl.indicator";
          }
       }
-      swallow { "indicator";
+      swallow { "efl.indicator";
          scale;
          desc { "default";
             rel2.relative: 1.0 0.0;
@@ -25,7 +25,7 @@ group { "efl/pager";
             min: 0 50;
          }
       }
-      swallow { "event";
+      swallow { "efl.event";
          scale;
          repeat_events: 1;
          desc { "default";
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index 4983cd3d48..7db239bcd3 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -112,7 +112,7 @@ group { name: "efl/panes/vertical";
             rel2.to: "efl.bar";
          }
       }
-      part { name: "rect_bar"; type: RECT;
+      part { name: "bar"; type: RECT;
          dragable.events: "efl.bar";
          description { state: "default" 0.0;
             min: PANEMIN PANEWID;
@@ -129,27 +129,27 @@ group { name: "efl/panes/vertical";
       }
    }
    programs {
-      program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
+      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
-      program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
+      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
          action: SIGNAL_EMIT "elm,action,unpress" "elm";
       }
-      program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
+      program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
+      program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
          action: SIGNAL_EMIT "elm,action,click,double" "elm";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,fixed"; source: "elm";
          action: STATE_SET "disabled" 0.0;
-         target: "rect_bar";
+         target: "bar";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,unfixed"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "rect_bar";
+         target: "bar";
       }
    }
 }
@@ -251,7 +251,7 @@ group { name: "efl/panes/horizontal";
             rel2.to: "efl.bar";
          }
       }
-      part { name: "rect_bar"; type: RECT;
+      part { name: "bar"; type: RECT;
          dragable.events: "efl.bar";
          description { state: "default" 0.0;
             min: PANEWID PANEMIN;
@@ -268,27 +268,27 @@ group { name: "efl/panes/horizontal";
       }
    }
    programs {
-      program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
+      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
-      program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
+      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
          action: SIGNAL_EMIT "elm,action,unpress" "elm";
       }
-      program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
+      program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
+      program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
          action: SIGNAL_EMIT "elm,action,click,double" "elm";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,fixed"; source: "elm";
          action: STATE_SET "disabled" 0.0;
-         target: "rect_bar";
+         target: "bar";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,unfixed"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "rect_bar";
+         target: "bar";
       }
    }
 }
@@ -377,7 +377,7 @@ group { name: "efl/panes/vertical:flush";
             rel2.to: "efl.bar";
          }
       }
-      part { name: "rect_bar"; type: RECT;
+      part { name: "bar"; type: RECT;
          dragable.events: "efl.bar";
          description { state: "default" 0.0;
             min: PANEMIN PANEWID;
@@ -451,8 +451,8 @@ group { name: "efl/panes/vertical:flush";
       part { name: "bar1"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "rect_bar";
-            rel2.to: "rect_bar";
+            rel1.to: "bar";
+            rel2.to: "bar";
             rel2.relative: 0.5 1.0;
             color: 0 0 0 0;
          }
@@ -460,35 +460,35 @@ group { name: "efl/panes/vertical:flush";
       part { name: "bar2"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "rect_bar";
+            rel1.to: "bar";
             rel1.relative: 0.5 0.0;
-            rel2.to: "rect_bar";
+            rel2.to: "bar";
             color: 0 0 0 0;
          }
       }
    }
    programs {
-      program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
+      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
-      program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
+      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
          action: SIGNAL_EMIT "elm,action,unpress" "elm";
       }
-      program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
+      program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
+      program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
          action: SIGNAL_EMIT "elm,action,click,double" "elm";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,fixed"; source: "elm";
          action: STATE_SET "disabled" 0.0;
-         target: "rect_bar";
+         target: "bar";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,unfixed"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "rect_bar";
+         target: "bar";
       }
       program {
          signal: "mouse,in"; source: "bar1";
@@ -605,7 +605,7 @@ group { name: "efl/panes/horizontal:flush";
             rel2.to: "efl.bar";
          }
       }
-      part { name: "rect_bar"; type: RECT;
+      part { name: "bar"; type: RECT;
          dragable.events: "efl.bar";
          description { state: "default" 0.0;
             min: PANEWID PANEMIN;
@@ -679,8 +679,8 @@ group { name: "efl/panes/horizontal:flush";
       part { name: "bar1"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "rect_bar";
-            rel2.to: "rect_bar";
+            rel1.to: "bar";
+            rel2.to: "bar";
             rel2.relative: 1.0 0.5;
             color: 0 0 0 0;
          }
@@ -688,9 +688,9 @@ group { name: "efl/panes/horizontal:flush";
       part { name: "bar2"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "rect_bar";
+            rel1.to: "bar";
             rel1.relative: 0.0 0.5;
-            rel2.to: "rect_bar";
+            rel2.to: "bar";
             color: 0 0 0 0;
          }
       }
@@ -724,27 +724,27 @@ group { name: "efl/panes/horizontal:flush";
          target: "glow2a";
          target: "glow2b";
       }
-      program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
+      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
-      program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
+      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
          action: SIGNAL_EMIT "elm,action,unpress" "elm";
       }
-      program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
+      program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
+      program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
          action: SIGNAL_EMIT "elm,action,click,double" "elm";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,fixed"; source: "elm";
          action: STATE_SET "disabled" 0.0;
-         target: "rect_bar";
+         target: "bar";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,unfixed"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "rect_bar";
+         target: "bar";
       }
    }
 }
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index cfdd560c37..0fc312024a 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -104,7 +104,7 @@ group { "efl/popup_alert";
          target: "efl.text.title";
       }
       program {
-         signal: "elm,efl.buttons,show"; source: "elm";
+         signal: "elm,buttons,show"; source: "elm";
          action: STATE_SET "button_visible" 0.0;
          target: "efl.buttons";
       }
diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc
index d525ba5cd4..f5b6192dcc 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -259,7 +259,7 @@ group { "efl/progressbar/horizontal";
             align: 1.0 0.5;
          }
       }
-      part { name: "image_bar";
+      part { name: "bar";
          clip_to: "fract_clip";
          scale: 1;
          description { state: "default" 0.0;
@@ -315,10 +315,10 @@ group { "efl/progressbar/horizontal";
             min: 64 24;
             max: 64 24;
             rel1.to_x: "insidep0";
-            rel1.to_y: "image_bar";
+            rel1.to_y: "bar";
             rel1.relative: 0.0 0.0;
             rel2.to_x: "insidep1";
-            rel2.to_y: "image_bar";
+            rel2.to_y: "bar";
             rel2.relative: 1.0 1.0;
             image.normal: "inset_bar_horiz_glow_mid_base.png";
             align: 0.0 0.5;
@@ -372,11 +372,11 @@ group { "efl/progressbar/horizontal";
          scale: 1;
          description { state: "default" 0.0;
             max: 36 11;
-            rel1.to_x: "image_bar";
-            rel1.to_y: "image_bar";
+            rel1.to_x: "bar";
+            rel1.to_y: "bar";
             rel1.relative: 0.0 (26/96);
             rel2.to_x: "barend";
-            rel2.to_y: "image_bar";
+            rel2.to_y: "bar";
             rel2.relative: 0.2 ((26+44)/96);
             align: 1.0 0.0;
             image.normal: "inset_bar_horiz_glow_light.png";
@@ -387,10 +387,10 @@ group { "efl/progressbar/horizontal";
          description { state: "inv" 0.0;
             inherit: "default" 0.0;
             rel1.to_x: "barend";
-            rel1.to_y: "image_bar";
+            rel1.to_y: "bar";
             rel1.relative: 0.8 (26/96);
-            rel2.to_x: "image_bar";
-            rel2.to_y: "image_bar";
+            rel2.to_x: "bar";
+            rel2.to_y: "bar";
             rel2.relative: 1.0 ((26+44)/96);
             align: 0.0 0.0;
             image.normal: "inset_bar_horiz_glow_inv_light.png";
@@ -402,14 +402,14 @@ group { "efl/progressbar/horizontal";
       program { name: "inverted-on";
          signal: "elm,state,inverted,on"; source: "elm";
          action:  STATE_SET "inv" 0.0;
-         target: "image_bar";
+         target: "bar";
          target: "barend";
          target: "light";
       }
       program { name: "inverted-off";
          signal: "elm,state,inverted,off"; source: "elm";
          action:  STATE_SET "default" 0.0;
-         target: "image_bar";
+         target: "bar";
          target: "barend";
          target: "light";
       }
@@ -419,7 +419,7 @@ group { "efl/progressbar/horizontal";
             new a, Float:dx, Float:dy, Float:vl, st[20];
 
             get_drag(PART:"efl.cur.progressbar", dx, dy);
-            get_state(PART:"image_bar", st, 19, vl);
+            get_state(PART:"bar", st, 19, vl);
             if (!strcmp(st, "inv")) {
                a = round(((1.0 - dx) * 255) / 0.2);
                custom_state(PART:"light", "inv", 0.0);
@@ -819,7 +819,7 @@ group { "efl/progressbar/vertical";
             align: 0.5 1.0;
          }
       }
-      part { name: "image_bar";
+      part { name: "bar";
          clip_to: "fract_clip";
          scale: 1;
          description { state: "default" 0.0;
@@ -875,10 +875,10 @@ group { "efl/progressbar/vertical";
             min: 24 64;
             max: 24 64;
             rel1.to_y: "insidep0";
-            rel1.to_x: "image_bar";
+            rel1.to_x: "bar";
             rel1.relative: 0.0 0.0;
             rel2.to_y: "insidep1";
-            rel2.to_x: "image_bar";
+            rel2.to_x: "bar";
             rel2.relative: 1.0 1.0;
             image.normal: "inset_bar_vert_glow_mid_base.png";
             align: 0.5 0.0;
@@ -945,11 +945,11 @@ group { "efl/progressbar/vertical";
          scale: 1;
          description { state: "default" 0.0;
             max: 11 36;
-            rel1.to_y: "image_bar";
-            rel1.to_x: "image_bar";
+            rel1.to_y: "bar";
+            rel1.to_x: "bar";
             rel1.relative: (26/96) 0.0;
             rel2.to_y: "barend";
-            rel2.to_x: "image_bar";
+            rel2.to_x: "bar";
             rel2.relative: ((26+44)/96) 0.2;
             align: 0.0 1.0;
             image.normal: "inset_bar_vert_glow_light.png";
@@ -960,10 +960,10 @@ group { "efl/progressbar/vertical";
          description { state: "inv" 0.0;
             inherit: "default" 0.0;
             rel1.to_y: "barend";
-            rel1.to_x: "image_bar";
+            rel1.to_x: "bar";
             rel1.relative: (26/96) 0.8;
-            rel2.to_y: "image_bar";
-            rel2.to_x: "image_bar";
+            rel2.to_y: "bar";
+            rel2.to_x: "bar";
             rel2.relative: ((26+44)/96) 1.0;
             align: 0.0 0.0;
             image.normal: "inset_bar_vert_glow_inv_light.png";
@@ -975,14 +975,14 @@ group { "efl/progressbar/vertical";
       program { name: "inverted-on";
          signal: "elm,state,inverted,on"; source: "elm";
          action:  STATE_SET "inv" 0.0;
-         target: "image_bar";
+         target: "bar";
          target: "barend";
          target: "light";
       }
       program { name: "inverted-off";
          signal: "elm,state,inverted,off"; source: "elm";
          action:  STATE_SET "default" 0.0;
-         target: "image_bar";
+         target: "bar";
          target: "barend";
          target: "light";
       }
@@ -992,7 +992,7 @@ group { "efl/progressbar/vertical";
             new a, Float:dx, Float:dy, Float:vl, st[20];
 
             get_drag(PART:"efl.cur.progressbar", dx, dy);
-            get_state(PART:"image_bar", st, 19, vl);
+            get_state(PART:"bar", st, 19, vl);
             if (!strcmp(st, "inv")) {
                a = round(((1.0 - dy) * 255) / 0.2);
                custom_state(PART:"light", "inv", 0.0);
@@ -1231,7 +1231,7 @@ group { "efl/progressbar/horizontal:double";
       image: "inset_bar_horiz_glow_inv_base_double.png" COMP;
    }
    parts {
-      part { name: "cur.progressbar1"; mouse_events: 0; type: SPACER;
+      part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
          insert_after: "inside";
          scale: 1;
          dragable.confine: "inside";
@@ -1250,9 +1250,9 @@ group { "efl/progressbar/horizontal:double";
          description { state: "default" 0.0;
             fixed: 1 0;
             min: 14 16;
-            rel1.to_x: "cur.progressbar1";
+            rel1.to_x: "efl.cur.progressbar1";
             rel1.relative: 1.0 0.0;
-            rel2.to_x: "cur.progressbar1";
+            rel2.to_x: "efl.cur.progressbar1";
             rel2.relative: 1.0 1.0;
             align: 0.0 0.5;
          }
@@ -1294,7 +1294,7 @@ group { "efl/progressbar/horizontal:double";
       program { name: "inverted-on";
          signal: "elm,state,inverted,on"; source: "elm";
          action:  STATE_SET "inv" 0.0;
-         target: "image_bar";
+         target: "bar";
          target: "bar1";
          target: "barend";
          target: "barend1";
@@ -1304,7 +1304,7 @@ group { "efl/progressbar/horizontal:double";
        { name: "inverted-off";
          signal: "elm,state,inverted,off"; source: "elm";
          action:  STATE_SET "default" 0.0;
-         target: "image_bar";
+         target: "bar";
          target: "bar1";
          target: "barend";
          target: "barend1";
@@ -1320,7 +1320,7 @@ group { "efl/progressbar/vertical:double";
       image: "inset_bar_vert_glow_inv_base_double.png" COMP;
    }
    parts {
-      part { name: "cur.progressbar1"; mouse_events: 0; type: SPACER;
+      part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
          insert_after: "inside";
          scale: 1;
          dragable.confine: "inside";
@@ -1339,9 +1339,9 @@ group { "efl/progressbar/vertical:double";
          description { state: "default" 0.0;
             fixed: 0 1;
             min: 16 14;
-            rel1.to_y: "cur.progressbar1";
+            rel1.to_y: "efl.cur.progressbar1";
             rel1.relative: 0.0 1.0;
-            rel2.to_y: "cur.progressbar1";
+            rel2.to_y: "efl.cur.progressbar1";
             rel2.relative: 1.0 1.0;
             align: 0.5 0.0;
          }
@@ -1383,7 +1383,7 @@ group { "efl/progressbar/vertical:double";
       program { name: "inverted-on";
          signal: "elm,state,inverted,on"; source: "elm";
          action:  STATE_SET "inv" 0.0;
-         target: "image_bar";
+         target: "bar";
          target: "barend";
          target: "light";
          target: "bar1";
@@ -1392,7 +1392,7 @@ group { "efl/progressbar/vertical:double";
       program { name: "inverted-off";
          signal: "elm,state,inverted,off"; source: "elm";
          action:  STATE_SET "default" 0.0;
-         target: "image_bar";
+         target: "bar";
          target: "barend";
          target: "light";
          target: "bar1";
diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc
index 7822d8f14a..d6400584b4 100644
--- a/data/elementary/themes/edc/efl/radio.edc
+++ b/data/elementary/themes/edc/efl/radio.edc
@@ -13,14 +13,14 @@ group { "efl/radio";
          new d = m & DISABLE;
          if (m1 == (ICON | LABEL)) {
             if (!d) {
-               set_state(PART:"content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
                set_state(PART:"efl.text", "visible", 0.0);
                set_state(PART:"inset", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
                set_state(PART:"efl.text", "disabled_visible", 0.0);
                set_state(PART:"inset", "disabled", 0.0);
@@ -29,14 +29,14 @@ group { "efl/radio";
             }
          } else if (m1 == (ICON)) {
             if (!d) {
-               set_state(PART:"content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
                set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"inset", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
                set_state(PART:"efl.text", "disabled", 0.0);
                set_state(PART:"inset", "disabled", 0.0);
@@ -45,14 +45,14 @@ group { "efl/radio";
             }
          } else if (m1 == (LABEL)) {
             if (!d) {
-               set_state(PART:"content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"efl.text", "visible", 0.0);
                set_state(PART:"inset", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"efl.text", "disabled_visible", 0.0);
                set_state(PART:"inset", "disabled", 0.0);
@@ -61,14 +61,14 @@ group { "efl/radio";
             }
          } else {
             if (!d) {
-               set_state(PART:"content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"inset", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"inset", "disabled", 0.0);
@@ -120,7 +120,7 @@ group { "efl/radio";
             color: 255 255 255 64;
          }
       }
-      part { name: "content"; type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          required;
          scale: 1;
          clip_to: "clip";
@@ -155,8 +155,8 @@ group { "efl/radio";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            rel1.to: "content";
-            rel2.to: "content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -165,8 +165,8 @@ group { "efl/radio";
          }
          description { state: "icononly" 0.0;
             inherit: "default" 0.0;
-            rel1.to: "content";
-            rel2.to: "content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -180,7 +180,7 @@ group { "efl/radio";
          required;
          description { state: "default" 0.0;
             rel1.offset: 2 2;
-            rel1.to_x: "content";
+            rel1.to_x: "efl.content";
             rel1.relative: 1.0 0.0;
             rel2.offset: -3 -3;
             color: FN_COL_DEFAULT;
diff --git a/data/elementary/themes/edc/efl/scroller.edc b/data/elementary/themes/edc/efl/scroller.edc
index ce1c37256b..c10323e7eb 100644
--- a/data/elementary/themes/edc/efl/scroller.edc
+++ b/data/elementary/themes/edc/efl/scroller.edc
@@ -744,7 +744,7 @@ group { name: "efl/scroller";
             color: 255 255 255 128;
          }
       }
-      part { name: "overlay"; type: SWALLOW;
+      part { name: "efl.overlay"; type: SWALLOW;
          clip_to: "clipper";
          description { state: "default" 0.0;
             rel1.to: "efl.content";
@@ -1256,7 +1256,7 @@ group { name: "efl/scroller:noclip";
             rel2.offset: 999999 999999;
          }
       }
-      part { name: "background";
+      part { name: "efl.background";
          description { state: "default" 0.0;
             rel1.offset: 0 0;
             rel2.offset: -1 -1;
@@ -1288,7 +1288,7 @@ group { name: "efl/scroller/contents";
          description { state: "default" 0.0;
          }
       }
-      part { name: "content_r";
+      part { name: "efl.content_r";
          type: SWALLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -1302,7 +1302,7 @@ group { name: "efl/scroller/contents";
             }
          }
       }
-      part { name: "content_b";
+      part { name: "efl.content_b";
          type: SWALLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -1316,7 +1316,7 @@ group { name: "efl/scroller/contents";
             }
          }
       }
-      part { name: "content_rb";
+      part { name: "efl.content_rb";
          type: SWALLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc
index d210391569..3b9ce50f29 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -183,7 +183,7 @@ group { "efl/text/single/scroller";
             visible: 0;
          }
       }
-      part { name: "dragable.vbar"; type: RECT;
+      part { name: "efl.dragable.vbar"; type: RECT;
          dragable.x: 0 0 0;
          dragable.y: 1 1 0;
          dragable.confine: "sb_vbar_base";
@@ -203,7 +203,7 @@ group { "efl/text/single/scroller";
             visible: 0;
          }
       }
-      part { name: "dragable.hbar"; type: RECT;
+      part { name: "efl.dragable.hbar"; type: RECT;
          dragable.x: 1 1 0;
          dragable.y: 0 0 0;
          dragable.confine: "sb_hbar_base";
@@ -914,4 +914,4 @@ group { "efl/text/emoticon/worried"; images.image:
 group { "efl/text/emoticon/wtf"; images.image:
    "emo-wtf.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
             "emo-wtf.png"; } } } }
-//------------------------------------------------------------
\ No newline at end of file
+//------------------------------------------------------------
diff --git a/data/elementary/themes/edc/efl/timepicker.edc b/data/elementary/themes/edc/efl/timepicker.edc
index a33ada0d4a..3a0954a00a 100644
--- a/data/elementary/themes/edc/efl/timepicker.edc
+++ b/data/elementary/themes/edc/efl/timepicker.edc
@@ -105,7 +105,7 @@ group { "efl/timepicker";
             align: 1.0 1.0;
          }
       }
-      swallow { "field0";
+      swallow { "efl.field0";
          mouse;
          scale;
          desc { "default";
@@ -127,9 +127,9 @@ group { "efl/timepicker";
             max: 3 -1;
             rel1 {
                relative: 1.0 0.0;
-               to: "field0";
+               to: "efl.field0";
             }
-            rel2.to: "field0";
+            rel2.to: "efl.field0";
             align: 0.0 0.5;
          }
          desc { "invisible";
@@ -197,7 +197,7 @@ group { "efl/timepicker";
             max: 0 0;
          }
       }
-      swallow { "field1";
+      swallow { "efl.field1";
          mouse;
          scale;
          desc { "default";
@@ -219,9 +219,9 @@ group { "efl/timepicker";
             max: 3 -1;
             rel1 {
                relative: 1.0 0.0;
-               to: "field1";
+               to: "efl.field1";
             }
-            rel2.to: "field1";
+            rel2.to: "efl.field1";
             align: 0.0 0.5;
          }
          desc { "invisible";
@@ -289,7 +289,7 @@ group { "efl/timepicker";
             max: 0 0;
          }
       }
-      swallow { "field2";
+      swallow { "efl.field2";
          mouse;
          scale;
          desc { "default";
@@ -326,7 +326,7 @@ group { "efl/timepicker";
          script {
             set_state(PART:"base", "default", 0.0);
             set_state(PART:"bg", "default", 0.0);
-            set_state(PART:"field2", "default", 0.0);
+            set_state(PART:"efl.field2", "default", 0.0);
          }
       }
       program { "invisible_ampm";
@@ -335,7 +335,7 @@ group { "efl/timepicker";
          script {
             set_state(PART:"base", "24layout", 0.0);
             set_state(PART:"bg", "24layout", 0.0);
-            set_state(PART:"field2", "24layout", 0.0);
+            set_state(PART:"efl.field2", "24layout", 0.0);
          }
       }
       program { "visible_colon_field0";
diff --git a/data/elementary/themes/edc/efl/tooltip.edc b/data/elementary/themes/edc/efl/tooltip.edc
index cbe4ca222c..07a609325c 100644
--- a/data/elementary/themes/edc/efl/tooltip.edc
+++ b/data/elementary/themes/edc/efl/tooltip.edc
@@ -11,7 +11,7 @@ group { name: "efl/label/tooltip";
       }
    }
    parts {
-      part { name: "text"; type: TEXTBLOCK; mouse_events: 0;
+      part { name: "efl.text"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             text {
@@ -161,11 +161,11 @@ group { name: "efl/tooltip";
          description { state: "default" 0.0;
             min: 30 30;
             rel1 {
-               to: "content";
+               to: "efl.content";
                offset: -5 -4;
             }
             rel2 {
-               to: "content";
+               to: "efl.content";
                offset: 4 5;
             }
             image {
@@ -217,12 +217,12 @@ group { name: "efl/tooltip";
             rel1 {                                                 \
                relative: rx 0.0;                                   \
                offset: ox 0;                                       \
-               to: "content";                                      \
+               to: "efl.content";                                      \
             }                                                      \
             rel2 {                                                 \
                relative: rx 1.0;                                   \
                offset: ox 0;                                       \
-               to: "content";                                      \
+               to: "efl.content";                                      \
             }                                                      \
          }                                                         \
          description { state: "visible" 0.0;                       \
@@ -241,12 +241,12 @@ group { name: "efl/tooltip";
             rel1 {                                                 \
                relative: rx 0.0;                                   \
                offset: ox 0;                                       \
-               to: "content";                                      \
+               to: "efl.content";                                      \
             }                                                      \
             rel2 {                                                 \
                relative: rx 1.0;                                   \
                offset: ox 0;                                       \
-               to: "content";                                      \
+               to: "efl.content";                                      \
             }                                                      \
          }                                                         \
       }                                                            \
@@ -291,12 +291,12 @@ group { name: "efl/tooltip";
             rel1 {                                                 \
                relative: 0.0 ry;                                   \
                offset: 0 oy;                                       \
-               to: "content";                                      \
+               to: "efl.content";                                      \
             }                                                      \
             rel2 {                                                 \
                relative: 1.0 ry;                                   \
                offset: 0 oy;                                       \
-               to: "content";                                      \
+               to: "efl.content";                                      \
             }                                                      \
          }                                                         \
          description { state: "visible" 0.0;                       \
@@ -348,15 +348,15 @@ group { name: "efl/tooltip";
       part { name: "clipper_content"; type: RECT;
          description { state: "default" 0.0;
             color: 255 255 255 0;
-            rel1.to: "content";
-            rel2.to: "content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             color: 255 255 255 255;
          }
       }
-      part { name: "content"; type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          clip_to: "clipper_content";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
@@ -421,7 +421,7 @@ group { name: "efl/tooltip:transparent";
    data.item: "pad_y" "10";
    data.item: "transparent" "enabled";
    parts {
-      part { name: "content"; type: SWALLOW; mouse_events:   0;
+      part { name: "efl.content"; type: SWALLOW; mouse_events:   0;
          scale: 1;
          description { state: "default" 0.0; }
       }
diff --git a/data/elementary/themes/edc/efl/uiclock.edc b/data/elementary/themes/edc/efl/uiclock.edc
index 942b7f2a15..cb89ac6549 100644
--- a/data/elementary/themes/edc/efl/uiclock.edc
+++ b/data/elementary/themes/edc/efl/uiclock.edc
@@ -182,7 +182,7 @@ group { "efl/uiclock";
             vis;
          }
       }
-      rect { "access";
+      rect { "efl.access";
          repeat;
          desc { "default";
             color: 0 0 0 0;
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index fb6431880a..1e7dedd4de 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -40,12 +40,6 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
    {NULL, NULL}
 };
 
-static const Elm_Layout_Part_Alias_Description _text_aliases[] =
-{
-   {"default", "elm.text"},
-   {NULL, NULL}
-};
-
 static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
 
 static const Elm_Action key_actions[] = {
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index bad166ced6..1b80ab6678 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -895,7 +895,7 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
         Elm_Access_Info *ai;
 
         priv->access_obj = _elm_access_edje_object_part_object_register
-          (obj, elm_layout_edje_get(obj), "elm.access");
+          (obj, elm_layout_edje_get(obj), "efl.access");
         if (!priv->access_obj)
           priv->access_obj = _elm_access_edje_object_part_object_register
           (obj, elm_layout_edje_get(obj), "access");
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 2429d210b9..55f8b1d365 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -206,7 +206,7 @@ _fields_init(Eo *obj)
           {
              if (strchr(fmt_char[i], ch))
                {
-                  snprintf(buf, sizeof(buf), "field%d", field++);
+                  snprintf(buf, sizeof(buf), "efl.field%d", field++);
                   if (i == DATEPICKER_YEAR)
                     efl_content_set(efl_part(obj, buf), pd->year);
                   else if (i == DATEPICKER_MONTH)
diff --git a/src/lib/elementary/efl_ui_layout_object.c b/src/lib/elementary/efl_ui_layout_object.c
index b7f2052523..76bbd10422 100644
--- a/src/lib/elementary/efl_ui_layout_object.c
+++ b/src/lib/elementary/efl_ui_layout_object.c
@@ -186,7 +186,7 @@ _signals_emit(Eo *obj,
         snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
                  set ? "set" : "unset");
      }
-    efl_layout_signal_emit(obj, buf, "elm");
+   efl_layout_signal_emit(obj, buf, "elm");
 }
 
 static inline void
@@ -219,16 +219,22 @@ _icon_signal_emit(Efl_Ui_Layout_Object_Data *sd,
               if (!_efl_ui_layout_swallow_parts[i]) return;
               if (!strcmp(sub_d->part, _efl_ui_layout_swallow_parts[i])) break;
           }
-        
      }
 
-   if (elm_widget_is_legacy(sd->obj) &&
-       !strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
-     type = sub_d->part + strlen("elm.swallow.");
-   else if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
-     type = sub_d->part + strlen("efl.");
+   if (elm_widget_is_legacy(sd->obj))
+     {
+        if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
+          type = sub_d->part + strlen("elm.swallow.");
+        else
+          type = sub_d->part;
+     }
    else
-     type = sub_d->part;
+     {
+        if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
+          type = sub_d->part + strlen("efl.");
+        else
+          type = sub_d->part;
+     }
 
    _signals_emit(sd->obj, type, visible);
 
@@ -246,30 +252,37 @@ _text_signal_emit(Efl_Ui_Layout_Object_Data *sd,
 
    //FIXME: Don't limit to "elm.text" prefix.
    //Send signals for all text parts after elm 2.0
+   if (sub_d->type != TEXT) return;
 
-   if (sub_d->type != TEXT)
+   if (elm_widget_is_legacy(sd->obj))
      {
-        if (elm_widget_is_legacy(sd->obj) &&
-            !((!strcmp("elm.text", sub_d->part)) ||
+        if (!((!strcmp("elm.text", sub_d->part)) ||
               (!strncmp("elm.text.", sub_d->part, 9))))
-          {
-             return;
-          }
-        else if (!((!strcmp("efl.text", sub_d->part)) ||
-                  (!strncmp("efl.text.", sub_d->part, 9))))
-          {
-             return;
-          }  
+          return;
+     }
+   else
+     {
+        if (!((!strcmp("efl.text", sub_d->part)) ||
+              (!strncmp("efl.text.", sub_d->part, 9))))
+          return;
      }
 
    ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
 
-   if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text.")))
-     type = sub_d->part + strlen("elm.text.");
-   else if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
-     type = sub_d->part + strlen("efl.");
+   if (elm_widget_is_legacy(sd->obj))
+     {
+        if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text.")))
+          type = sub_d->part + strlen("elm.text.");
+        else
+          type = sub_d->part;
+     }
    else
-     type = sub_d->part;
+     {
+        if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
+          type = sub_d->part + strlen("efl.");
+        else
+          type = sub_d->part;
+     }
 
    _signals_emit(sd->obj, type, visible);
 
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 2f607b180d..2a1720d13c 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -59,7 +59,7 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
 
 /* Standard widget overrides */
 ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data)
-ELM_PART_TEXT_DEFAULT_GET(efl_ui_navigation_bar, "text")
+ELM_PART_TEXT_DEFAULT_GET(efl_ui_navigation_bar, "efl.text")
 ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data)
 
 #define EFL_UI_NAVIGATION_BAR_EXTRA_OPS \
@@ -106,7 +106,7 @@ _efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EI
     }
   else if (eina_streq(part, "right_content"))
     return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"));
-   
+
   return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
 }
 
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index 0017e766d4..921d7676f9 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -251,7 +251,7 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *pd)
    evas_object_color_set(pd->event, 0, 0, 0, 0);
    evas_object_repeat_events_set(pd->event, EINA_TRUE);
 
-   efl_content_set(efl_part(obj, "event"), pd->event);
+   efl_content_set(efl_part(obj, "efl.event"), pd->event);
 
    efl_event_callback_add(pd->event, EFL_EVENT_POINTER_DOWN,
                           _mouse_down_cb, obj);
@@ -264,7 +264,7 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *pd)
 static void
 _event_handler_del(Eo *obj, Efl_Ui_Pager_Data *pd)
 {
-   efl_content_unset(efl_part(obj, "event"));
+   efl_content_unset(efl_part(obj, "efl.event"));
    efl_del(pd->event);
    pd->event = NULL;
 }
@@ -352,7 +352,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
    pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj));
-   efl_content_set(efl_part(obj, "page_root"), pd->page_root);
+   efl_content_set(efl_part(obj, "efl.page_root"), pd->page_root);
 
    efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, pd);
    efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, pd);
@@ -671,7 +671,7 @@ _efl_ui_pager_indicator_set(Eo *obj EINA_UNUSED,
    if (!pd->idbox)
      {
         pd->idbox = efl_add(EFL_UI_BOX_CLASS, obj);
-        efl_content_set(efl_part(obj, "indicator"), pd->idbox);
+        efl_content_set(efl_part(obj, "efl.indicator"), pd->idbox);
      }
 
    efl_page_indicator_bind(pd->indicator, obj, pd->idbox);
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 7699889454..57b4ecfe03 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -450,7 +450,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
    if (elm_widget_is_legacy(obj))
      {
         if (edje_object_part_exists
-          (wd->resize_obj, "elm.swallow.event"))
+            (wd->resize_obj, "elm.swallow.event"))
           {
              Evas_Coord minw = 0, minh = 0;
 
@@ -462,7 +462,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
    else
      {
         if (edje_object_part_exists
-          (wd->resize_obj, "efl.event"))
+            (wd->resize_obj, "efl.event"))
           {
              Evas_Coord minw = 0, minh = 0;
 
@@ -470,7 +470,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
              evas_object_size_hint_min_set(sd->event, minw, minh);
              elm_layout_content_set(obj, "efl.event", sd->event);
           }
-      }
+     }
    elm_widget_sub_object_add(obj, sd->event);
 
    elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c
index 08097fc8d1..0799635a1a 100644
--- a/src/lib/elementary/efl_ui_popup_alert.c
+++ b/src/lib/elementary/efl_ui_popup_alert.c
@@ -168,7 +168,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu
                                  pd->button[EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE]);
      }
 
-   elm_layout_signal_emit(obj, "elm,efl.buttons,show", "elm");
+   elm_layout_signal_emit(obj, "elm,buttons,show", "elm");
    edje_object_message_signal_process(wd->resize_obj);
    elm_layout_sizing_eval(obj);
 }
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 47a932ad4d..c0869578be 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -72,9 +72,9 @@ _efl_ui_scroller_bar_read_and_update(Eo *obj)
    double vx, vy;
 
    edje_object_part_drag_value_get
-      (wd->resize_obj, "dragable.vbar", NULL, &vy);
+      (wd->resize_obj, "efl.dragable.vbar", NULL, &vy);
    edje_object_part_drag_value_get
-      (wd->resize_obj, "dragable.hbar", &vx, NULL);
+      (wd->resize_obj, "efl.dragable.hbar", &vx, NULL);
 
    efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
 }
@@ -206,8 +206,8 @@ _efl_ui_scroller_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UNU
 
    edje_object_calc_force(wd->resize_obj);
    efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
-   edje_object_part_drag_size_set(wd->resize_obj, "dragable.hbar", width, 1.0);
-   edje_object_part_drag_size_set(wd->resize_obj, "dragable.vbar", 1.0, height);
+   edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar", width, 1.0);
+   edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar", 1.0, height);
 }
 
 static void
@@ -220,8 +220,8 @@ _efl_ui_scroller_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNUS
    double posx = 0.0, posy = 0.0;
 
    efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
-   edje_object_part_drag_value_set(wd->resize_obj, "dragable.hbar", posx, 0.0);
-   edje_object_part_drag_value_set(wd->resize_obj, "dragable.vbar", 0.0, posy);
+   edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar", posx, 0.0);
+   edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar", 0.0, posy);
 }
 
 static void
@@ -260,22 +260,22 @@ _scroll_edje_object_attach(Eo *obj)
    efl_layout_signal_callback_add
      (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
+     (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
      obj);
    efl_layout_signal_callback_add
-     (obj, "drag,set", "dragable.vbar",
+     (obj, "drag,set", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,start", "dragable.vbar",
+     (obj, "drag,start", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_start_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,stop", "dragable.vbar",
+     (obj, "drag,stop", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_stop_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,step", "dragable.vbar",
+     (obj, "drag,step", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,page", "dragable.vbar",
+     (obj, "drag,page", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_add
      (obj, "elm,vbar,press", "elm",
@@ -284,22 +284,22 @@ _scroll_edje_object_attach(Eo *obj)
      (obj, "elm,vbar,unpress", "elm",
      _efl_ui_scroller_vbar_unpress_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
+     (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
      obj);
    efl_layout_signal_callback_add
-     (obj, "drag,set", "dragable.hbar",
+     (obj, "drag,set", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,start", "dragable.hbar",
+     (obj, "drag,start", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_start_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,stop", "dragable.hbar",
+     (obj, "drag,stop", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_stop_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,step", "dragable.hbar",
+     (obj, "drag,step", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,page", "dragable.hbar",
+     (obj, "drag,page", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_add
      (obj, "elm,hbar,press", "elm",
@@ -317,22 +317,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
    efl_layout_signal_callback_del
      (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
+     (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
      obj);
    efl_layout_signal_callback_del
-     (obj, "drag,set", "dragable.vbar",
+     (obj, "drag,set", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag,start", "dragable.vbar",
+     (obj, "drag,start", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_start_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag,stop", "dragable.vbar",
+     (obj, "drag,stop", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_stop_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag,step", "dragable.vbar",
+     (obj, "drag,step", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag,page", "dragable.vbar",
+     (obj, "drag,page", "efl.dragable.vbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_del
      (obj, "elm,vbar,press", "elm",
@@ -341,22 +341,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
      (obj, "elm,vbar,unpress", "elm",
      _efl_ui_scroller_vbar_unpress_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
+     (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
      obj);
    efl_layout_signal_callback_del
-     (obj, "drag,set", "dragable.hbar",
+     (obj, "drag,set", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag,start", "dragable.hbar",
+     (obj, "drag,start", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_start_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag,stop", "dragable.hbar",
+     (obj, "drag,stop", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_stop_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag,step", "dragable.hbar",
+     (obj, "drag,step", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "drag,page", "dragable.hbar",
+     (obj, "drag,page", "efl.dragable.hbar",
      _efl_ui_scroller_edje_drag_cb, obj);
    efl_layout_signal_callback_del
      (obj, "elm,hbar,press", "elm",
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index f4e0692ade..2a37bce479 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -883,7 +883,7 @@ _efl_ui_spin_button_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Spin_B
    const char *name;
    name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS));
    if (name) return name;
-   const char *ret = elm_layout_text_get(obj, "text");
+   const char *ret = elm_layout_text_get(obj, "efl.text");
    return ret;
 }
 
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 49a4e38974..9d005547e3 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -163,7 +163,7 @@ _fields_init(Eo *obj)
           {
              if (strchr(fmt_char[i], ch))
                {
-                  snprintf(buf, sizeof(buf), "field%d", field);
+                  snprintf(buf, sizeof(buf), "efl.field%d", field);
                   if (i == TIMEPICKER_HOUR)
                     efl_content_set(efl_part(obj, buf), pd->hour);
                   else if (i == TIMEPICKER_MIN)
diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index e4e53523ba..2defddeaa4 100644
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -491,8 +491,14 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
 
         tt->changed_style = EINA_FALSE;
         if (tt->tooltip)
-          edje_object_part_swallow(tt->tooltip, "elm.swallow.content",
-                                   tt->content);
+          {
+             if (elm_widget_is_legacy(tt->owner))
+               edje_object_part_swallow(tt->tooltip, "elm.swallow.content",
+                                        tt->content);
+             else
+               edje_object_part_swallow(tt->tooltip, "efl.content",
+                                        tt->content);
+          }
 
         edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
      }
@@ -519,11 +525,15 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
              tt->tooltip = NULL;
              return;
           }
-        edje_object_part_swallow
-          (tt->tooltip, "elm.swallow.content", tt->content);
+        if (elm_widget_is_legacy(tt->owner))
+          edje_object_part_swallow
+             (tt->tooltip, "elm.swallow.content", tt->content);
+        else
+          edje_object_part_swallow
+             (tt->tooltip, "efl.content", tt->content);
         new_content = EINA_TRUE;
         evas_object_event_callback_add(tt->content, EVAS_CALLBACK_DEL,
-           _elm_tooltip_content_del_cb, tt);
+                                       _elm_tooltip_content_del_cb, tt);
 
         /* tooltip has to use layer tooltip */
         evas_object_layer_set(tt->tooltip, ELM_OBJECT_LAYER_TOOLTIP);