efl_part: remove the elm legacy name of efl ui theme

Summary: efl_part: remove the elm legacy name of efl ui theme

Test Plan: run elementary_test

Reviewers: Jaehyun_Cho, woohyun, cedric, raster, jpeg

Differential Revision: https://phab.enlightenment.org/D5934

45 files changed, 1858 insertions, 1422 deletions

diff --git a/data/elementary/themes/edc/efl/bg.edc b/data/elementary/themes/edc/efl/bg.edc
index 3c57ac8..98c449d 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -1,12 +1,12 @@
 /* bg widget style information
 
    [SWALLOW]
-      elm.swallow.rectangle: Used for elm_bg_color_set()
-      elm.swallow.background: Used for elm_bg_file_set()
-      elm.swallow.content: Used for elm_layout_part_content_set(bg, "overlay", content).
+      efl.rectangle: Used for elm_bg_color_set()
+      efl.background: Used for elm_bg_file_set()
+      efl.content: Used for elm_layout_part_content_set(bg, "overlay", content).
 */
 
-group { name: "efl/bg";
+group { "efl/bg";
    data.item: "version" "119";
    images.image: "bevel_dark_out.png" COMP;
    parts {
@@ -20,11 +20,11 @@ group { name: "efl/bg";
             color: 64 64 64 255;
          }
       }
-      part { name: "elm.swallow.rectangle"; type: SWALLOW;
+      part { name: "efl.rectangle"; type: SWALLOW;
          description { state: "default" 0.0;
          }
       }
-      part { name: "elm.swallow.background"; type: SWALLOW;
+      part { name: "efl.background"; type: SWALLOW;
          clip_to: "clipper";
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -38,7 +38,7 @@ group { name: "efl/bg";
             fill.smooth: 0;
          }
       }
-      part { name: "elm.swallow.content"; type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
          }
       }
diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc
index f6e8b89..d3ee516 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -7,7 +7,7 @@
  *  - virtual keyboard
  */
 
-group { name: "efl/border";
+group { "efl/border";
    images.image: "vgrad_med_lighter.png" COMP;
    images.image: "vgrad_med_dark.png" COMP;
    images.image: "bevel_out.png" COMP;
@@ -33,7 +33,7 @@ group { name: "efl/border";
    data.item: "version" "119";
    parts {
       /* opaque region of the window, to inform the compositor */
-      spacer { "elm.spacer.opaque";
+      spacer { "efl.spacer.opaque";
          desc {
             rel1.to: "top_clip";
             rel2.to: "bottom_clip";
@@ -41,12 +41,12 @@ group { name: "efl/border";
          desc { "max"; inherit: "default"; }
       }
       /* covers the entire client contents, excluding the main menu */
-      spacer { "elm.spacer.content";
+      spacer { "efl.spacer.content";
          required; // since 1.19
          desc {
-            rel1.to: "elm.swallow.menu";
+            rel1.to: "efl.menu";
             rel1.relative: 0.0 1.0;
-            rel2.to: "elm.swallow.keyboard";
+            rel2.to: "efl.keyboard";
             rel2.relative: 1.0 0.0;
          }
       }
@@ -76,7 +76,7 @@ group { name: "efl/border";
             rel2.to: "bottom_clip";
          }
       }
-      rect { "elm.rect.background";
+      rect { "efl.rect.background";
          required; // @since 1.19
          clip: "bg_clip";
          desc { "default";
@@ -90,7 +90,7 @@ group { name: "efl/border";
          }
       }
       /* window background: image */
-      swallow { "elm.swallow.background";
+      swallow { "efl.background";
          required; // @since 1.19
          clip: "client_clip";
       }
@@ -102,7 +102,7 @@ group { name: "efl/border";
                middle: 0;
             }
             fill.smooth: 0;
-            rel.to: "elm.spacer.content";
+            rel.to: "efl.spacer.content";
             visible: 0;
          }
          desc { "visible";
@@ -112,7 +112,7 @@ group { name: "efl/border";
       }
       spacer { "indicator_spacer";
          desc { "default";
-            rel.to: "elm.swallow.indicator";
+            rel.to: "efl.indicator";
          }
          desc { "hidden";
             rel.to: "top_clip";
@@ -127,10 +127,10 @@ group { name: "efl/border";
          desc { "default";
             color: 64 64 64 255; // FIXME: color_class
             align: 0.5 0.0;
-            rel.to: "elm.swallow.menu";
+            rel.to: "efl.menu";
          }
       }
-      swallow { "elm.swallow.menu";
+      swallow { "efl.menu";
          required: 1; // since 1.19
          desc { "default";
             rel.to: "indicator_spacer";
@@ -148,9 +148,9 @@ group { name: "efl/border";
       /* application contents - spacer and clipper (without main menu) */
       spacer { "client_spacer";
          desc { "default";
-            rel1.to: "elm.swallow.menu";
+            rel1.to: "efl.menu";
             rel1.relative: 0.0 1.0;
-            rel2.to: "elm.swallow.keyboard";
+            rel2.to: "efl.keyboard";
             rel2.relative: 1.0 0.0;
          }
       }
@@ -162,7 +162,7 @@ group { name: "efl/border";
       }
 
       /* application contents */
-      swallow { "elm.swallow.client";
+      swallow { "efl.client";
          clip: "client_clip";
          desc { "default";
             rel.to: "client_spacer";
@@ -170,7 +170,7 @@ group { name: "efl/border";
       }
 
       /* modal window blocker */
-      rect { "elm.rect.blocker";
+      rect { "rect.blocker";
          required;
          desc { "default";
             rel1.to: "top_clip";
@@ -234,18 +234,18 @@ group { name: "efl/border";
             fill.smooth: 0;
          }
       }
-      text {  "elm.text.title"; nomouse;
+      text {  "efl.text.title"; nomouse;
          scale: 1;
          effect: SHADOW BOTTOM;
          clip: "top_clip";
          desc { "default";
             rel1.relative: 1.0 0.0;
             rel1.offset: 1 3;
-            rel1.to_x: "elm.event.icon";
+            rel1.to_x: "event.icon";
             rel1.to_y: "shadow_spacer";
             rel2.relative: 0.0 0.0;
             rel2.offset: -2 3;
-            rel2.to_x: "elm.event.minimize";
+            rel2.to_x: "event.minimize";
             rel2.to_y: "shadow_spacer";
             align: 0.5 0.0;
             color_class: "border_title";
@@ -269,17 +269,17 @@ group { name: "efl/border";
          desc { "default";
             rel1.relative: 1.0 0.0;
             rel1.offset: 1 2;
-            rel1.to_x: "elm.event.icon";
+            rel1.to_x: "event.icon";
             rel1.to_y: "shadow_spacer";
             rel2.relative: 0.0 0.0;
             rel2.offset: -1 2;
-            rel2.to_x: "elm.event.minimize";
+            rel2.to_x: "event.minimize";
             rel2.to_y: "shadow_spacer";
             align: 0.5 0.0;
             color_class: "border_title_active";
             color3: 255 255 255 255;
             text { font: FNBD; size: 10;
-               text_source: "elm.text.title";
+               text_source: "efl.text.title";
                text_class: "title_bar";
                align: 0.5 0.0;
                min: 0 1;
@@ -292,10 +292,10 @@ group { name: "efl/border";
             visible: 1;
          }
       }
-      spacer {  "icon";
+      spacer {  "spacer.icon";
          desc { "default";
-            rel1.to: "elm.event.icon";
-            rel2.to: "elm.event.icon";
+            rel1.to: "event.icon";
+            rel2.to: "event.icon";
          }
          desc { "bounce1";
             inherit: "default";
@@ -308,12 +308,12 @@ group { name: "efl/border";
             rel2.relative: 1.2 1.2;
          }
       }
-      swallow {  "elm.swallow.icon"; nomouse;
+      swallow {  "efl.icon"; nomouse;
          clip_to: "top_clip";
          desc { "default";
-            rel1.to: "icon";
+            rel1.to: "spacer.icon";
             rel1.relative: 0.15 0.15;
-            rel2.to: "icon";
+            rel2.to: "spacer.icon";
             rel2.relative: 0.85 0.85;
             rel2.offset: 0 0;
          }
@@ -338,10 +338,10 @@ group { name: "efl/border";
             max: 20 20;
             rel1.relative: 1.0 0.0;
             rel1.offset: 2 -0;
-            rel1.to: "elm.event.icon";
+            rel1.to: "event.icon";
             rel2.relative: 1.0 1.0;
             rel2.offset: 2 -1;
-            rel2.to: "elm.event.icon";
+            rel2.to: "event.icon";
             align: 0.0 0.5;
             fixed: 1 1;
          }
@@ -387,8 +387,8 @@ group { name: "efl/border";
          clip: "clip1";
          desc { "default";
             image.normal: "sym_close_dark_normal.png";
-            rel1.to: "elm.event.close";
-            rel2.to: "elm.event.close";
+            rel1.to: "event.close";
+            rel2.to: "event.close";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -402,8 +402,8 @@ group { name: "efl/border";
          clip: "clip1";
          desc { "default";
             image.normal: "sym_up_dark_normal.png";
-            rel1.to: "elm.event.maximize";
-            rel2.to: "elm.event.maximize";
+            rel1.to: "event.maximize";
+            rel2.to: "event.maximize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -417,8 +417,8 @@ group { name: "efl/border";
          clip: "clip1";
          desc { "default";
             image.normal: "sym_down_dark_normal.png";
-            rel1.to: "elm.event.minimize";
-            rel2.to: "elm.event.minimize";
+            rel1.to: "event.minimize";
+            rel2.to: "event.minimize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -432,8 +432,8 @@ group { name: "efl/border";
          clip: "clip2";
          desc { "default";
             image.normal: "sym_close_light_normal.png";
-            rel1.to: "elm.event.close";
-            rel2.to: "elm.event.close";
+            rel1.to: "event.close";
+            rel2.to: "event.close";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -447,8 +447,8 @@ group { name: "efl/border";
          clip: "clip2";
          desc { "default";
             image.normal: "sym_up_light_normal.png";
-            rel1.to: "elm.event.maximize";
-            rel2.to: "elm.event.maximize";
+            rel1.to: "event.maximize";
+            rel2.to: "event.maximize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -462,8 +462,8 @@ group { name: "efl/border";
          clip: "clip2";
          desc { "default";
             image.normal: "sym_down_light_normal.png";
-            rel1.to: "elm.event.minimize";
-            rel2.to: "elm.event.minimize";
+            rel1.to: "event.minimize";
+            rel2.to: "event.minimize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
@@ -473,7 +473,7 @@ group { name: "efl/border";
             image.normal: "sym_down_light_selected.png";
          }
       }
-      rect {  "elm.event.icon";
+      rect {  "event.icon";
          desc { "default";
             rel1.relative: 0.0 0.0;
             rel1.to: "top_clip";
@@ -484,19 +484,19 @@ group { name: "efl/border";
             color: 0 0 0 0;
          }
       }
-      rect {  "elm.event.titlebar";
+      rect {  "event.titlebar";
          desc { "default";
             rel1.relative: 1.0 0.0;
-            rel1.to_x: "elm.event.icon";
+            rel1.to_x: "event.icon";
             rel1.to_y: "top_clip";
             rel2.relative: 0.0 1.0;
             rel2.offset: 0 -1;
-            rel2.to_x: "elm.event.minimize";
+            rel2.to_x: "event.minimize";
             rel2.to_y: "top_clip";
             color: 0 0 0 0;
          }
       }
-      rect {  "elm.event.close";
+      rect {  "event.close";
          desc { "default";
             rel.to: "top_clip";
             rel1.relative: 1.0 0.0;
@@ -506,29 +506,29 @@ group { name: "efl/border";
             color: 0 0 0 0;
          }
       }
-      rect {  "elm.event.maximize";
+      rect {  "event.maximize";
          desc { "default";
             rel1.relative: -0.25 0.0;
             rel1.offset: -1 0;
-            rel1.to_x: "elm.event.close";
+            rel1.to_x: "event.close";
             rel1.to_y: "top_clip";
             rel2.relative: -0.25 1.0;
-            rel2.to_x: "elm.event.close";
+            rel2.to_x: "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 {  "elm.event.minimize";
+      rect {  "event.minimize";
          desc { "default";
             rel1.relative: 0.0 0.0;
             rel1.offset: -1 0;
-            rel1.to_x: "elm.event.maximize";
+            rel1.to_x: "event.maximize";
             rel1.to_y: "top_clip";
             rel2.relative: 0.0 1.0;
             rel2.to_y: "top_clip";
-            rel2.to_x: "elm.event.maximize";
+            rel2.to_x: "event.maximize";
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             color: 0 0 0 0;
@@ -544,7 +544,7 @@ group { name: "efl/border";
             hid;
          }
       }
-      rect {  "elm.event.resize.tl";
+      rect {  "efl.event.resize.tl";
          clip: "top_resize_clip";
          desc { "default";
             rel.to: "top_clip";
@@ -556,14 +556,14 @@ group { name: "efl/border";
          }
          desc { "hidden"; inherit: "default"; hid; }
       }
-      rect {  "elm.event.resize.t";
+      rect {  "efl.event.resize.t";
          clip: "top_resize_clip";
          desc { "default";
             rel1.relative: 1.0 0.0;
             rel1.to_y: "top_clip";
-            rel1.to_x: "elm.event.resize.tl";
+            rel1.to_x: "efl.event.resize.tl";
             rel2.relative: 0.0 0.0;
-            rel2.to_x: "elm.event.resize.tr";
+            rel2.to_x: "efl.event.resize.tr";
             rel2.to_y: "top_clip";
             min: 0 4;
             align: 0.5 0.0;
@@ -572,7 +572,7 @@ group { name: "efl/border";
          }
          desc { "hidden"; inherit: "default"; hid; }
       }
-      rect {  "elm.event.resize.tr";
+      rect {  "efl.event.resize.tr";
          clip: "top_resize_clip";
          desc { "default";
             rel.to: "top_clip";
@@ -586,7 +586,7 @@ group { name: "efl/border";
          desc { "hidden"; inherit: "default"; hid; }
       }
       /* bottom border - spacer and clipper */
-      swallow { "elm.swallow.keyboard";
+      swallow { "efl.keyboard";
          desc { "default";
            rel.to: "bottom_clip";
            rel2.relative: 1.0 0.0;
@@ -626,7 +626,7 @@ group { name: "efl/border";
             fill.smooth: 0;
          }
       }
-      rect {  "elm.event.resize.bl";
+      rect {  "efl.event.resize.bl";
          clip: "bottom_clip";
          desc { "default";
             rel1.relative: 0.0 1.0;
@@ -640,15 +640,15 @@ group { name: "efl/border";
          }
          desc { "hidden"; inherit: "default"; hid; }
       }
-      rect {  "elm.event.resize.b";
+      rect {  "efl.event.resize.b";
          clip: "bottom_clip";
          desc { "default";
             rel1.relative: 1.0 1.0;
-            rel1.to_x: "elm.event.resize.tl";
+            rel1.to_x: "efl.event.resize.tl";
             rel1.to_y: "bottom_clip";
             rel1.offset: 0 -1;
             rel2.relative: 0.0 1.0;
-            rel2.to_x: "elm.event.resize.tr";
+            rel2.to_x: "efl.event.resize.tr";
             rel2.to_y: "bottom_clip";
             min: 0 5;
             align: 0.5 1.0;
@@ -657,7 +657,7 @@ group { name: "efl/border";
          }
          desc { "hidden"; inherit: "default"; hid; }
       }
-      rect {  "elm.event.resize.br";
+      rect {  "efl.event.resize.br";
          clip: "bottom_clip";
          desc { "default";
             rel1.relative: 1.0 1.0;
@@ -687,14 +687,14 @@ group { name: "efl/border";
          clip: "bg_clip";
          desc { "default";
             color: 148 23 45 255;
-            rel.to: "elm.swallow.indicator";
+            rel.to: "efl.indicator";
          }
          desc { "bg_transparent";
             inherit: "default";
             color: 0 0 0 0;
          }
       }
-      swallow { "elm.swallow.indicator";
+      swallow { "efl.indicator";
          clip: "bg_clip";
          desc { "default";
             rel.to: "top_clip";
@@ -774,12 +774,12 @@ group { name: "efl/border";
       program {
          signal: "elm,state,background,solid,on"; source: "elm";
          action: STATE_SET "visible";
-         target: "elm.rect.background";
+         target: "efl.rect.background";
       }
       program {
          signal: "elm,state,background,solid,off"; source: "elm";
          action: STATE_SET "default";
-         target: "elm.rect.background";
+         target: "efl.rect.background";
       }
       program {
          signal: "elm,state,background,standard,on"; source: "elm";
@@ -795,7 +795,7 @@ group { name: "efl/border";
          signal: "elm,action,focus"; source: "elm";
          action: STATE_SET "focused";
          target: "top";
-         target: "elm.text.title";
+         target: "efl.text.title";
          target: "title2";
          target: "clip1";
          target: "clip2";
@@ -804,7 +804,7 @@ group { name: "efl/border";
          signal: "elm,action,unfocus"; source: "elm";
          action: STATE_SET "default";
          target: "top";
-         target: "elm.text.title";
+         target: "efl.text.title";
          target: "title2";
          target: "clip1";
          target: "clip2";
@@ -812,25 +812,25 @@ group { name: "efl/border";
       program {
          signal: "elm,state,urgent"; source: "elm";
          action: STATE_SET "bounce1";
-         target: "icon";
+         target: "spacer.icon";
          after: "urg1";
       }
       program { name: "urg1";
          action: STATE_SET "bounce2";
          transition: DECELERATE 0.4;
-         target: "icon";
+         target: "spacer.icon";
          after: "urg2";
       }
       program { name: "urg2";
          action: STATE_SET "bounce1";
          transition: ACCELERATE 0.3;
-         target: "icon";
+         target: "spacer.icon";
          after: "urg1";
       }
       program {
          signal: "elm,state,not_urgent"; source: "elm";
          action: STATE_SET "default";
-         target: "icon";
+         target: "spacer.icon";
       }
       program { name: "spin";
          signal: "elm,state,hung"; source: "elm";
@@ -872,7 +872,7 @@ group { name: "efl/border";
       program {
          signal: "elm,state,maximize*"; source: "elm";
          action: STATE_SET "max";
-         target: "elm.spacer.opaque";
+         target: "efl.spacer.opaque";
       }
       program {
          signal: "elm,state,maximize*"; source: "elm";
@@ -881,7 +881,7 @@ group { name: "efl/border";
       program {
          signal: "elm,state,unmaximize*"; source: "elm";
          action: STATE_SET "default";
-         target: "elm.spacer.opaque";
+         target: "efl.spacer.opaque";
       }
       program {
          signal: "elm,state,unmaximize*"; source: "elm";
@@ -928,33 +928,33 @@ group { name: "efl/border";
          signal: "elm,action,indicator,show_effect"; source: "elm";
          action: STATE_SET "visible";
          transition: DECELERATE 0.2;
-         target: "elm.swallow.indicator";
+         target: "efl.indicator";
       }
       program {
          signal: "elm,action,indicator,hide_effect"; source: "elm";
          action: STATE_SET "hidden";
          transition: DECELERATE 0.2;
-         target: "elm.swallow.indicator";
+         target: "efl.indicator";
       }
       program { name: "update_indicator";
          script {
             if (get_int(indicator_enabled)) {
               if ((get_int(indicator_type) == INDICATOR_TYPE_BG_OPAQUE) ||
                   (get_int(indicator_type) == INDICATOR_TYPE_UNKNOWN)) {
-                set_state(PART:"elm.swallow.indicator", "visible", 0.0);
+                set_state(PART:"efl.indicator", "visible", 0.0);
                 set_state(PART:"indicator_spacer", "default", 0.0);
                 set_state(PART:"indicator_bg", "default", 0.0);
               } else if (get_int(indicator_type) == INDICATOR_TYPE_BG_TRANSPARENT) {
-                set_state(PART:"elm.swallow.indicator", "visible", 0.0);
+                set_state(PART:"efl.indicator", "visible", 0.0);
                 set_state(PART:"indicator_spacer", "default", 0.0);
                 set_state(PART:"indicator_bg", "bg_transparent", 0.0);
               } else if (get_int(indicator_type) == INDICATOR_TYPE_HIDDEN) {
-                set_state(PART:"elm.swallow.indicator", "hidden", 0.0);
+                set_state(PART:"efl.indicator", "hidden", 0.0);
                 set_state(PART:"indicator_spacer", "hidden", 0.0);
                 set_state(PART:"indicator_bg", "default", 0.0);
               }
             } else {
-             set_state(PART:"elm.swallow.indicator", "default", 0.0);
+             set_state(PART:"efl.indicator", "default", 0.0);
              set_state(PART:"indicator_spacer", "default", 0.0);
             }
          }
@@ -964,171 +964,171 @@ group { name: "efl/border";
       program { name: "show_menu";
          signal: "elm,action,show_menu"; source: "elm";
          action: STATE_SET "visible";
-         target: "elm.swallow.menu";
+         target: "efl.menu";
       }
       program { name: "hide_menu";
          signal: "elm,action,hide"; source: "elm";
          action: STATE_SET "default";
-         target: "elm.swallow.menu";
+         target: "efl.menu";
       }
 
       /* modal windows */
       program { name: "hide_blocker";
          signal: "elm,action,hide_blocker"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "elm.rect.blocker";
+         target: "rect.blocker";
          transition: DECELERATE 0.2;
       }
       program { name: "show_blocker";
          signal: "elm,action,show_blocker"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         target: "elm.rect.blocker";
+         target: "rect.blocker";
          transition: DECELERATE 0.2;
       }
 
       /* minimize, maximize & close buttons */
       program {
-         signal: "mouse,down,*"; source: "elm.event.close";
+         signal: "mouse,down,*"; source: "event.close";
          action: STATE_SET "selected";
          target: "close1";
          target: "close2";
       }
       program {
-         signal: "mouse,up,*"; source: "elm.event.close";
+         signal: "mouse,up,*"; source: "event.close";
          action: STATE_SET "default";
          target: "close1";
          target: "close2";
       }
       program {
-         signal: "mouse,down,*"; source: "elm.event.maximize";
+         signal: "mouse,down,*"; source: "event.maximize";
          action: STATE_SET "selected";
          target: "max1";
          target: "max2";
       }
       program {
-         signal: "mouse,up,*"; source: "elm.event.maximize";
+         signal: "mouse,up,*"; source: "event.maximize";
          action: STATE_SET "default";
          target: "max1";
          target: "max2";
       }
       program {
-         signal: "mouse,down,*"; source: "elm.event.minimize";
+         signal: "mouse,down,*"; source: "event.minimize";
          action: STATE_SET "selected";
          target: "min1";
          target: "min2";
       }
       program {
-         signal: "mouse,up,*"; source: "elm.event.minimize";
+         signal: "mouse,up,*"; source: "event.minimize";
          action: STATE_SET "default";
          target: "min1";
          target: "min2";
       }
       program {
-         signal: "mouse,down,1"; source: "elm.event.titlebar";
+         signal: "mouse,down,1"; source: "event.titlebar";
          action: SIGNAL_EMIT "elm,action,move,start" "elm";
       }
       program {
-         signal: "mouse,up,1"; source: "elm.event.titlebar";
+         signal: "mouse,up,1"; source: "event.titlebar";
          action: SIGNAL_EMIT "elm,action,move,stop" "elm";
       }
       program {
-         signal: "mouse,clicked,1"; source: "elm.event.minimize";
+         signal: "mouse,clicked,1"; source: "event.minimize";
          action: SIGNAL_EMIT "elm,action,minimize" "elm";
       }
       program {
-         signal: "mouse,clicked,1"; source: "elm.event.maximize";
+         signal: "mouse,clicked,1"; source: "event.maximize";
          action: SIGNAL_EMIT "elm,action,maximize" "elm";
       }
       program {
-         signal: "mouse,clicked,1"; source: "elm.event.close";
+         signal: "mouse,clicked,1"; source: "event.close";
          action: SIGNAL_EMIT "elm,action,close" "elm";
       }
       program {
-         signal: "mouse,in"; source: "elm.event.resize.t";
-         action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.t";
+         signal: "mouse,in"; source: "efl.event.resize.t";
+         action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.t";
       }
       program {
-         signal: "mouse,out"; source: "elm.event.resize.t";
-         action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.t";
+         signal: "mouse,out"; source: "efl.event.resize.t";
+         action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.t";
       }
       program {
-         signal: "mouse,down,1"; source: "elm.event.resize.t";
-         action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.t";
+         signal: "mouse,down,1"; source: "efl.event.resize.t";
+         action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.t";
       }
       program {
-         signal: "mouse,in"; source: "elm.event.resize.b";
-         action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.b";
+         signal: "mouse,in"; source: "efl.event.resize.b";
+         action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.b";
       }
       program {
-         signal: "mouse,out"; source: "elm.event.resize.b";
-         action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.b";
+         signal: "mouse,out"; source: "efl.event.resize.b";
+         action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.b";
       }
       program {
-         signal: "mouse,down,1"; source: "elm.event.resize.b";
-         action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.b";
+         signal: "mouse,down,1"; source: "efl.event.resize.b";
+         action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.b";
       }
       program {
-         signal: "mouse,in"; source: "elm.event.resize.tl";
-         action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tl";
+         signal: "mouse,in"; source: "efl.event.resize.tl";
+         action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.tl";
       }
       program {
-         signal: "mouse,out"; source: "elm.event.resize.tl";
-         action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tl";
+         signal: "mouse,out"; source: "efl.event.resize.tl";
+         action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.tl";
       }
       program {
-         signal: "mouse,down,1"; source: "elm.event.resize.tl";
-         action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.tl";
+         signal: "mouse,down,1"; source: "efl.event.resize.tl";
+         action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.tl";
       }
       program {
-         signal: "mouse,in"; source: "elm.event.resize.tr";
-         action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tr";
+         signal: "mouse,in"; source: "efl.event.resize.tr";
+         action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.tr";
       }
       program {
-         signal: "mouse,out"; source: "elm.event.resize.tr";
-         action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tr";
+         signal: "mouse,out"; source: "efl.event.resize.tr";
+         action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.tr";
       }
       program {
-         signal: "mouse,down,1"; source: "elm.event.resize.tr";
-         action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.tr";
+         signal: "mouse,down,1"; source: "efl.event.resize.tr";
+         action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.tr";
       }
       program {
-         signal: "mouse,in"; source: "elm.event.resize.bl";
-         action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.bl";
+         signal: "mouse,in"; source: "efl.event.resize.bl";
+         action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.bl";
       }
       program {
-         signal: "mouse,out"; source: "elm.event.resize.bl";
-         action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.bl";
+         signal: "mouse,out"; source: "efl.event.resize.bl";
+         action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.bl";
       }
       program {
-         signal: "mouse,down,1"; source: "elm.event.resize.bl";
-         action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.bl";
+         signal: "mouse,down,1"; source: "efl.event.resize.bl";
+         action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.bl";
       }
       program {
-         signal: "mouse,in"; source: "elm.event.resize.br";
-         action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.br";
+         signal: "mouse,in"; source: "efl.event.resize.br";
+         action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.br";
       }
       program {
-         signal: "mouse,out"; source: "elm.event.resize.br";
-         action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.br";
+         signal: "mouse,out"; source: "efl.event.resize.br";
+         action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.br";
       }
       program {
-         signal: "mouse,down,1"; source: "elm.event.resize.br";
-         action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.br";
+         signal: "mouse,down,1"; source: "efl.event.resize.br";
+         action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.br";
       }
       program {
-         signal: "mouse,clicked,1"; source: "elm.event.icon";
+         signal: "mouse,clicked,1"; source: "event.icon";
          action: SIGNAL_EMIT "elm,action,menu" "elm";
       }
    }
 }
 
-group { name: "efl/border/dialog";
+group { "efl/border/dialog";
    inherit:   "efl/border";
    parts {
-      text {  "elm.text.title";
+      text {  "efl.text.title";
          clip: "top_clip";
          desc { "default";
-            rel2.to_x: "elm.event.close";
+            rel2.to_x: "event.close";
          }
          desc { "focused";
             inherit: "default";
@@ -1137,7 +1137,7 @@ group { name: "efl/border/dialog";
       }
       text {  "title2";
          desc { "default";
-            rel2.to_x: "elm.event.close";
+            rel2.to_x: "event.close";
          }
          desc { "focused";
             inherit: "default";
@@ -1176,12 +1176,12 @@ group { name: "efl/border/dialog";
             visible: 0;
          }
       }
-      rect {  "elm.event.maximize";
+      rect {  "event.maximize";
          desc { "default";
             visible: 0;
          }
       }
-      rect {  "elm.event.minimize";
+      rect {  "event.minimize";
          desc { "default";
             visible: 0;
          }
@@ -1189,8 +1189,8 @@ group { name: "efl/border/dialog";
    }
 }
 
-group { name: "efl/border/naviframe";
-   inherit:   "efl/border/dialog";
+group { "efl/border/naviframe";
+   inherit:   "efl/border";
    images.image: "sym_left_dark_normal.png" COMP;
    images.image: "sym_left_glow_normal.png" COMP;
    images.image: "sym_left_light_normal.png" COMP;
@@ -1220,4 +1220,3 @@ group { name: "efl/border/naviframe";
 #undef MAXIMIZED
 #undef SET_MODE
 #undef UNSET_MODE
-
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index 9853358..752c197 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -18,9 +18,9 @@ group { name: "efl/button";
          new bg = m & BACKGROUND;
          if (bg) {
             set_state(PART:"base", "hidden", 0.0);
-            set_state(PART:"elm.swallow.background", "visible", 0.0);
+            set_state(PART:"efl.background", "visible", 0.0);
          } else {
-            set_state(PART:"elm.swallow.background", "default", 0.0);
+            set_state(PART:"efl.background", "default", 0.0);
             if (!d) {
                if (!p)
                  {
@@ -36,65 +36,65 @@ group { name: "efl/button";
          }
          if (m1 == (ICON | LABEL)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
                set_state(PART:"event", "default", 0.0);
                if (!p) {
-                  set_state(PART:"elm.text", "visible", 0.0);
+                  set_state(PART:"efl.text", "visible", 0.0);
                   set_state(PART:"icon_clip", "default", 0.0);
                } else {
-                  set_state(PART:"elm.text", "pressed_visible", 0.0);
+                  set_state(PART:"efl.text", "pressed_visible", 0.0);
                   set_state(PART:"icon_clip", "pressed", 0.0);
                }
             } else {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
-               set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"efl.text", "disabled_visible", 0.0);
                set_state(PART:"icon_clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
          } else if (m1 == (ICON)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"efl.content", "icononly", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
                set_state(PART:"event", "default", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                if (!p)
                   set_state(PART:"icon_clip", "default", 0.0);
                else
                   set_state(PART:"icon_clip", "pressed", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"efl.content", "icononly", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"icon_clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
          } else if (m1 == (LABEL)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"icon_clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
                if (!p)
-                  set_state(PART:"elm.text", "textonly", 0.0);
+                  set_state(PART:"efl.text", "textonly", 0.0);
                else
-                  set_state(PART:"elm.text", "pressed_textonly", 0.0);
+                  set_state(PART:"efl.text", "pressed_textonly", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "disabled_textonly", 0.0);
+               set_state(PART:"efl.text", "disabled_textonly", 0.0);
                set_state(PART:"icon_clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
          } else {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"icon_clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"icon_clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
@@ -128,7 +128,7 @@ group { name: "efl/button";
             visible: 0;
          }
       }
-      swallow { "elm.swallow.background"; nomouse;
+      swallow { "efl.background"; nomouse;
          required;
          desc { "default";
             rel1.to: "base";
@@ -153,7 +153,7 @@ group { name: "efl/button";
             color_class: "button_icon_disabled";
          }
       }
-      swallow { "elm.swallow.content"; nomouse;
+      swallow { "efl.content"; nomouse;
          clip_to: "icon_clip";
          required;
          desc { "default";
@@ -193,8 +193,8 @@ group { name: "efl/button";
          }
          desc { "visible";
             inherit: "default";
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -203,8 +203,8 @@ group { name: "efl/button";
          }
          desc { "icononly";
             inherit: "default";
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -212,14 +212,14 @@ group { name: "efl/button";
             }
          }
       }
-      text { "elm.text"; nomouse;
+      text { "efl.text"; nomouse;
          effect: SHADOW BOTTOM;
          scale;
          required;
          desc { "default";
             rel1.offset: 0 5;
             rel1.relative: 1.0 0.0;
-            rel1.to_x: "elm.swallow.content";
+            rel1.to_x: "efl.content";
             rel1.to_y: "base";
             rel2.offset: -8 -8;
             rel2.to: "base";
@@ -336,7 +336,7 @@ group { name: "efl/button";
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
       program { name: "button_text_visible";
-         signal: "elm,state,elm.text,set"; source: "elm";
+         signal: "elm,state,text,set"; source: "elm";
          script {
             new m = get_int(btmode);
             m |= LABEL; set_int(btmode, m);
@@ -344,7 +344,7 @@ group { name: "efl/button";
          }
       }
       program { name: "button_text_hidden";
-         signal: "elm,state,elm.text,unset"; source: "elm";
+         signal: "elm,state,text,unset"; source: "elm";
          script {
             new m = get_int(btmode);
             m &= ~LABEL; set_int(btmode, m);
@@ -421,61 +421,61 @@ group { name: "efl/button:anchor";
          new d = m & DISABLE;
          if (m1 == (ICON | LABEL)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
-               set_state(PART:"elm.text", "visible", 0.0);
+               set_state(PART:"efl.text", "visible", 0.0);
                set_state(PART:"icon_clip", "default", 0.0);
                set_state(PART:"bar", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
-               set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"efl.text", "disabled_visible", 0.0);
                set_state(PART:"icon_clip", "disabled", 0.0);
                set_state(PART:"bar", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
          } else if (m1 == (ICON)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"efl.content", "icononly", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"icon_clip", "default", 0.0);
                set_state(PART:"bar", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "icononly", 0.0);
+               set_state(PART:"efl.content", "icononly", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"icon_clip", "disabled", 0.0);
                set_state(PART:"bar", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
          } else if (m1 == (LABEL)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "textonly", 0.0);
+               set_state(PART:"efl.text", "textonly", 0.0);
                set_state(PART:"icon_clip", "default", 0.0);
                set_state(PART:"bar", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "disabled_textonly", 0.0);
+               set_state(PART:"efl.text", "disabled_textonly", 0.0);
                set_state(PART:"icon_clip", "disabled", 0.0);
                set_state(PART:"bar", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
          } else {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"icon_clip", "default", 0.0);
                set_state(PART:"bar", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"icon_clip", "disabled", 0.0);
                set_state(PART:"bar", "disabled", 0.0);
@@ -498,7 +498,7 @@ group { name: "efl/button:anchor";
             color: 255 255 255 64;
          }
       }
-      swallow { "elm.swallow.background"; nomouse;
+      swallow { "efl.background"; nomouse;
          desc { "default";
             rel1.to: "base";
             rel2.to: "base";
@@ -509,7 +509,7 @@ group { name: "efl/button:anchor";
             visible: 1;
          }
       }
-      swallow { "elm.swallow.content"; nomouse;
+      swallow { "efl.content"; nomouse;
          clip_to: "icon_clip";
          desc { "default";
             fixed: 1 0;
@@ -547,8 +547,8 @@ group { name: "efl/button:anchor";
          }
          desc { "visible";
             inherit: "default";
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -557,8 +557,8 @@ group { name: "efl/button:anchor";
          }
          desc { "icononly";
             inherit: "default";
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -566,13 +566,13 @@ group { name: "efl/button:anchor";
             }
          }
       }
-      text { "elm.text"; nomouse;
+      text { "efl.text"; nomouse;
          effect: GLOW;
          scale: 1;
          desc { "default";
             rel1.offset: -2 0;
             rel1.relative: 1.0 0.0;
-            rel1.to_x: "elm.swallow.content";
+            rel1.to_x: "efl.content";
             rel1.to_y: "base";
             rel2.offset: -1 -1;
             rel2.to: "base";
@@ -620,13 +620,13 @@ group { name: "efl/button:anchor";
          scale: 1;
          desc { "default";
             fixed: 1 1;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
+            rel1.to: "efl.text";
+            rel2.to: "efl.text";
             color_class: "button_text_anchor";
             color2: 255 255 255 255;
             color3: 255 255 255 255;
             text { font: FN; size: 10;
-               text_source: "elm.text";
+               text_source: "efl.text";
                min: 1 1;
                ellipsis: -1;
                text_class: "button_anchor";
@@ -718,7 +718,7 @@ group { name: "efl/button:anchor";
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
       program { name: "button_text_visible";
-         signal: "elm,state,elm.text,set"; source: "elm";
+         signal: "elm,state,text,set"; source: "elm";
          script {
             new m = get_int(btmode);
             m |= LABEL; set_int(btmode, m);
@@ -726,7 +726,7 @@ group { name: "efl/button:anchor";
          }
       }
       program { name: "button_text_hidden";
-         signal: "elm,state,elm.text,unset"; source: "elm";
+         signal: "elm,state,text,unset"; source: "elm";
          script {
             new m = get_int(btmode);
             m &= ~LABEL; set_int(btmode, m);
@@ -752,12 +752,12 @@ group { name: "efl/button:anchor";
       program { name: "button_background_visible";
          signal: "elm,state,background,set"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         target: "elm.swallow.background";
+         target: "efl.background";
       }
       program { name: "button_background_hidden";
          signal: "elm,state,background,unset"; source: "elm";
          action:  STATE_SET "default" 0.0;
-         target: "elm.swallow.background";
+         target: "efl.background";
       }
       program { name: "button_state_disabled";
          signal: "elm,state,disabled"; source: "elm";
diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc
index 2fd7e95..e627d28 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -41,7 +41,7 @@
             color: 0 0 0 0;\
          }\
       }\
-      part { name: "elm,calendar,button"#_sufix",left";\
+      part { name: "efl.calendar.button"#_sufix".left";\
          type: SWALLOW;\
          scale: 1;\
          description { state: "default" 0.0;\
@@ -55,7 +55,7 @@
             rel2.to: "right_bt"#_sufix;\
          }\
       }\
-      part { name: "elm,calendar,button"#_sufix",right";\
+      part { name: "efl.calendar.button"#_sufix".right";\
          type: SWALLOW;\
          scale: 1;\
          description { state: "default" 0.0;\
@@ -446,7 +446,7 @@ group { "efl/calendar";
             rel2.offset: -2 -2;
          }
       }
-      part { name: "background"; type: SWALLOW;
+      part { name: "efl.background"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.to: "bg";
             rel2.to: "bg";
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index 6bcc5cf..2984587 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -13,17 +13,17 @@ group { "efl/check";
          new d = m & DISABLE;
          if (m1 == (ICON | LABEL)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
-               set_state(PART:"elm.text", "visible", 0.0);
+               set_state(PART:"efl.text", "visible", 0.0);
                set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"base", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
-               set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"efl.text", "disabled_visible", 0.0);
                set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
@@ -31,17 +31,17 @@ group { "efl/check";
             }
          } else if (m1 == (ICON)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"base", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
-               set_state(PART:"elm.text", "disabled", 0.0);
+               set_state(PART:"efl.text", "disabled", 0.0);
                set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
@@ -49,17 +49,17 @@ group { "efl/check";
             }
          } else if (m1 == (LABEL)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "visible", 0.0);
+               set_state(PART:"efl.text", "visible", 0.0);
                set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"base", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"efl.text", "disabled_visible", 0.0);
                set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
@@ -67,17 +67,17 @@ group { "efl/check";
             }
          } else {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"base", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
@@ -153,7 +153,7 @@ group { "efl/check";
             color: 255 255 255 64;
          }
       }
-      part { name: "elm.swallow.content"; type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          scale: 1;
          clip_to: "clip";
          required;
@@ -188,8 +188,8 @@ group { "efl/check";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -198,8 +198,8 @@ group { "efl/check";
          }
          description { state: "icononly" 0.0;
             inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -207,13 +207,13 @@ group { "efl/check";
             }
          }
       }
-      part { name: "elm.text"; type: TEXT; mouse_events: 0;
+      part { name: "efl.text"; type: TEXT; mouse_events: 0;
          effect: SHADOW BOTTOM;
          scale: 1;
          required;
          description { state: "default" 0.0;
             rel1.offset: 2 2;
-            rel1.to_x: "elm.swallow.content";
+            rel1.to_x: "efl.content";
             rel1.relative: 1.0 0.0;
             rel2.offset: -3 -3;
             color: FN_COL_DEFAULT;
@@ -271,7 +271,7 @@ group { "efl/check";
          target: "indicator";
       }
       program {
-         signal: "elm,state,elm.text,set"; source: "elm";
+         signal: "elm,state,text,set"; source: "elm";
          script {
             new m = get_int(btmode);
             m |= LABEL; set_int(btmode, m);
@@ -279,7 +279,7 @@ group { "efl/check";
          }
       }
       program {
-         signal: "elm,state,elm.text,unset"; source: "elm";
+         signal: "elm,state,text,unset"; source: "elm";
          script {
             new m = get_int(btmode);
             m &= ~LABEL; set_int(btmode, m);
@@ -347,105 +347,105 @@ group { "efl/check:toggle";
          new d = m & DISABLE;
          if (m1 == (ICON | LABEL)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
-               set_state(PART:"elm.text", "visible", 0.0);
+               set_state(PART:"efl.text", "visible", 0.0);
                set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
                set_state(PART:"event2", "default", 0.0);
-               set_state(PART:"elm.ontext", "default", 0.0);
-               set_state(PART:"elm.offtext", "default", 0.0);
+               set_state(PART:"on", "default", 0.0);
+               set_state(PART:"off", "default", 0.0);
                set_state(PART:"onrect", "default", 0.0);
                set_state(PART:"offrect", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
-               set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"efl.text", "disabled_visible", 0.0);
                set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
                set_state(PART:"event2", "disabled", 0.0);
-               set_state(PART:"elm.ontext", "disabled", 0.0);
-               set_state(PART:"elm.offtext", "disabled", 0.0);
+               set_state(PART:"on", "disabled", 0.0);
+               set_state(PART:"off", "disabled", 0.0);
                set_state(PART:"onrect", "disabled", 0.0);
                set_state(PART:"offrect", "disabled", 0.0);
             }
          } else if (m1 == (ICON)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
                set_state(PART:"event2", "default", 0.0);
-               set_state(PART:"elm.ontext", "default", 0.0);
-               set_state(PART:"elm.offtext", "default", 0.0);
+               set_state(PART:"on", "default", 0.0);
+               set_state(PART:"off", "default", 0.0);
                set_state(PART:"onrect", "default", 0.0);
                set_state(PART:"offrect", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "visible", 0.0);
+               set_state(PART:"efl.content", "visible", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
-               set_state(PART:"elm.text", "disabled", 0.0);
+               set_state(PART:"efl.text", "disabled", 0.0);
                set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
                set_state(PART:"event2", "disabled", 0.0);
-               set_state(PART:"elm.ontext", "disabled", 0.0);
-               set_state(PART:"elm.offtext", "disabled", 0.0);
+               set_state(PART:"on", "disabled", 0.0);
+               set_state(PART:"off", "disabled", 0.0);
                set_state(PART:"onrect", "disabled", 0.0);
                set_state(PART:"offrect", "disabled", 0.0);
             }
          } else if (m1 == (LABEL)) {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "visible", 0.0);
+               set_state(PART:"efl.text", "visible", 0.0);
                set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
                set_state(PART:"event2", "default", 0.0);
-               set_state(PART:"elm.ontext", "default", 0.0);
-               set_state(PART:"elm.offtext", "default", 0.0);
+               set_state(PART:"on", "default", 0.0);
+               set_state(PART:"off", "default", 0.0);
                set_state(PART:"onrect", "default", 0.0);
                set_state(PART:"offrect", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "disabled_visible", 0.0);
+               set_state(PART:"efl.text", "disabled_visible", 0.0);
                set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
                set_state(PART:"event2", "disabled", 0.0);
-               set_state(PART:"elm.ontext", "disabled", 0.0);
-               set_state(PART:"elm.offtext", "disabled", 0.0);
+               set_state(PART:"on", "disabled", 0.0);
+               set_state(PART:"off", "disabled", 0.0);
                set_state(PART:"onrect", "disabled", 0.0);
                set_state(PART:"offrect", "disabled", 0.0);
             }
          } else {
             if (!d) {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
                set_state(PART:"event2", "default", 0.0);
-               set_state(PART:"elm.ontext", "default", 0.0);
-               set_state(PART:"elm.offtext", "default", 0.0);
+               set_state(PART:"on", "default", 0.0);
+               set_state(PART:"off", "default", 0.0);
                set_state(PART:"onrect", "default", 0.0);
                set_state(PART:"offrect", "default", 0.0);
             } else {
-               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"efl.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
-               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"efl.text", "default", 0.0);
                set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
                set_state(PART:"event2", "disabled", 0.0);
-               set_state(PART:"elm.ontext", "disabled", 0.0);
-               set_state(PART:"elm.offtext", "disabled", 0.0);
+               set_state(PART:"on", "disabled", 0.0);
+               set_state(PART:"off", "disabled", 0.0);
                set_state(PART:"onrect", "disabled", 0.0);
                set_state(PART:"offrect", "disabled", 0.0);
             }
@@ -495,7 +495,7 @@ group { "efl/check:toggle";
             color: 64 64 64 255;
          }
       }
-      part { name: "elm.offtext"; type: TEXT; mouse_events:  0;
+      part { name: "off"; type: TEXT; mouse_events:  0;
          effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "tog_clip";
@@ -519,7 +519,7 @@ group { "efl/check:toggle";
             color3: 255 255 255 255;
          }
       }
-      part { name: "elm.ontext"; type: TEXT; mouse_events:  0;
+      part { name: "on"; type: TEXT; mouse_events:  0;
          effect: GLOW;
          scale: 1;
          clip_to: "tog_clip";
@@ -661,7 +661,7 @@ group { "efl/check:toggle";
             color: 255 255 255 64;
          }
       }
-      part { name: "elm.swallow.content"; type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          scale: 1;
          clip_to: "clip";
          description { state: "default" 0.0;
@@ -692,8 +692,8 @@ group { "efl/check:toggle";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -702,8 +702,8 @@ group { "efl/check:toggle";
          }
          description { state: "icononly" 0.0;
             inherit: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel1.to: "efl.content";
+            rel2.to: "efl.content";
             text {
                min: 1 1;
                ellipsis: -1;
@@ -711,11 +711,11 @@ group { "efl/check:toggle";
             }
          }
       }
-      part { name: "elm.text"; type: TEXT; mouse_events: 0;
+      part { name: "efl.text"; type: TEXT; mouse_events: 0;
          effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to_x: "elm.swallow.content";
+            rel1.to_x: "efl.content";
             rel1.relative: 1.0 0.0;
             rel1.offset: 2 2;
             rel2.to_x: "tog";
@@ -753,8 +753,8 @@ group { "efl/check:toggle";
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
             color: 0 0 0 0;
-            rel1.to_x: "elm.swallow.content";
-            rel2.to_x: "elm.text";
+            rel1.to_x: "efl.content";
+            rel2.to_x: "efl.text";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
@@ -870,7 +870,7 @@ group { "efl/check:toggle";
          target: "glow_but";
       }
       program {
-         signal: "elm,state,elm.text,set"; source: "elm";
+         signal: "elm,state,text,set"; source: "elm";
          script {
             new m = get_int(btmode);
             m |= LABEL; set_int(btmode, m);
@@ -878,7 +878,7 @@ group { "efl/check:toggle";
          }
       }
       program {
-         signal: "elm,state,elm.text,unset"; source: "elm";
+         signal: "elm,state,text,unset"; source: "elm";
          script {
             new m = get_int(btmode);
             m &= ~LABEL; set_int(btmode, m);
diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc
index 78b8590..a628177 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -87,7 +87,7 @@ group { name: "efl/cursor/hand1";
             image.normal: "pointer_hand1.png";
          }
       }
-      part { name: "elm.swallow.hotspot"; type: SWALLOW;
+      part { name: "efl.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
@@ -98,21 +98,21 @@ group { name: "efl/cursor/hand1";
             rel2.offset: 0 0;
          }
       }
-      /* elm.content.hotspot is the old name for the above part */
-      alias: "elm.content.hotspot" "elm.swallow.hotspot";
+      /* efl.content.hotspot is the old name for the above part */
+      alias: "efl.content.hotspot" "efl.hotspot";
    }
 }
 
 group { name: "efl/cursor/blank";
    parts {
-      part { name: "elm.swallow.hotspot"; type: SWALLOW;
+      part { name: "efl.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             max: 1 1;
          }
       }
-      /* elm.content.hotspot is the old name for the above part */
-      alias: "elm.content.hotspot" "elm.swallow.hotspot";
+      /* efl.content.hotspot is the old name for the above part */
+      alias: "efl.content.hotspot" "efl.hotspot";
    }
 }
 
@@ -130,7 +130,7 @@ group { name: "efl/cursor/xterm";
             rel2.offset: -1 -3;
          }
       }
-      part { name: "elm.swallow.hotspot"; type: SWALLOW;
+      part { name: "efl.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
@@ -141,8 +141,8 @@ group { name: "efl/cursor/xterm";
             rel2.offset: 0 0;
          }
       }
-      /* elm.content.hotspot is the old name for the above part */
-      alias: "elm.content.hotspot" "elm.swallow.hotspot";
+      /* efl.content.hotspot is the old name for the above part */
+      alias: "efl.content.hotspot" "efl.hotspot";
       part { name: "shine";
          description { state: "default" 0.0;
             rel1.to: "base";
diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc
index 729177a..434026d 100644
--- a/data/elementary/themes/edc/efl/frame.edc
+++ b/data/elementary/themes/edc/efl/frame.edc
@@ -26,7 +26,7 @@ group { name: "efl/frame";
          description { state: "default" 0.0;
             image.normal: "vgrad_med_curved.png";
             rel1.offset: 2 2;
-            rel2.to_y: "elm.text";
+            rel2.to_y: "efl.text";
             rel2.offset: -3 -1;
             fill.smooth: 0;
             TILED_HORIZ(120)
@@ -36,10 +36,10 @@ group { name: "efl/frame";
          description { state: "default" 0.0;
             image.normal: "holes_tiny_vert.png";
             rel1.offset: 4 0;
-            rel1.to_y: "elm.text";
+            rel1.to_y: "efl.text";
             rel2.offset: 4 -1;
             rel2.relative: 0.0 1.0;
-            rel2.to_y: "elm.text";
+            rel2.to_y: "efl.text";
             align: 0.0 0.5;
             FIXED_SIZE(3, 11)
          }
@@ -48,16 +48,16 @@ group { name: "efl/frame";
          description { state: "default" 0.0;
             image.normal: "holes_tiny_vert.png";
             rel1.offset: -5 0;
-            rel1.to_y: "elm.text";
+            rel1.to_y: "efl.text";
             rel1.relative: 1.0 0.0;
             rel2.offset: -5 -1;
             rel2.relative: 1.0 1.0;
-            rel2.to_y: "elm.text";
+            rel2.to_y: "efl.text";
             align: 1.0 0.5;
             FIXED_SIZE(3, 11)
          }
       }
-      part { name: "elm.text"; type: TEXT;
+      part { name: "efl.text"; type: TEXT;
          scale: 1;
          effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
@@ -82,17 +82,17 @@ group { name: "efl/frame";
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel1.offset: 5 0;
-            rel1.to_y: "elm.text";
+            rel1.to_y: "efl.text";
             rel2.offset: -7 -7;
          }
       }
-      part { name: "elm.swallow.content"; type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
             align: 0.0 1.0;
             rel1.relative: 0.0 1.0;
             rel1.offset: 5 0;
-            rel1.to_y: "elm.text";
+            rel1.to_y: "efl.text";
             rel2.offset: -7 -7;
          }
          description { state: "collapsed" 0.0;
@@ -113,21 +113,21 @@ group { name: "efl/frame";
       part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
             color: 0 0 0 0;
-            rel1.to_y: "elm.text";
-            rel2.to_y: "elm.text";
+            rel1.to_y: "efl.text";
+            rel2.to_y: "efl.text";
          }
       }
    }
    programs {
       program { name: "collapse";
          action:  STATE_SET "collapsed" 0.0;
-         target: "elm.swallow.content";
+         target: "efl.content";
          transition: ACCELERATE 0.3;
          after: "signal";
       }
       program { name: "expand";
          action:  STATE_SET "default" 0.0;
-         target: "elm.swallow.content";
+         target: "efl.content";
          transition: DECELERATE 0.3;
          after: "signal";
       }
@@ -140,7 +140,7 @@ group { name: "efl/frame";
          script {
             new st[31];
             new Float:vl;
-            get_state(PART:"elm.swallow.content", st, 30, vl);
+            get_state(PART:"efl.content", st, 30, vl);
             if (!strcmp(st, "default"))
               run_program(PROGRAM:"collapse");
             else
@@ -152,15 +152,15 @@ group { name: "efl/frame";
          script {
             new st[31];
             new Float:vl;
-            get_state(PART:"elm.swallow.content", st, 30, vl);
+            get_state(PART:"efl.content", st, 30, vl);
             if (!strcmp(st, "default"))
-              set_state(PART:"elm.swallow.content", "collapsed", 0.0);
+              set_state(PART:"efl.content", "collapsed", 0.0);
             else
-              set_state(PART:"elm.swallow.content", "default", 0.0);
+              set_state(PART:"efl.content", "default", 0.0);
          }
       }
       program { name: "signal";
          action: SIGNAL_EMIT "elm,anim,done" "elm";
       }
    }
-}
\ No newline at end of file
+}
diff --git a/data/elementary/themes/edc/efl/navigation_bar.edc b/data/elementary/themes/edc/efl/navigation_bar.edc
index 212ddd8..d289481 100644
--- a/data/elementary/themes/edc/efl/navigation_bar.edc
+++ b/data/elementary/themes/edc/efl/navigation_bar.edc
@@ -15,7 +15,7 @@ group { "efl/navigation_bar";
          desc { "default";
          }
       }
-      swallow { "back_button";
+      swallow { "efl.back_button";
          desc { "default";
             fixed: 1 0;
             min: 0 0;
@@ -32,14 +32,14 @@ group { "efl/navigation_bar";
             vis;
          }
       }
-      swallow { "left_content";
+      swallow { "efl.left_content";
          desc { "default";
             rel.to: "base";
             rel2.relative: 0.0 1.0;
             align: 0.0 0.5;
          }
       }
-      swallow { "right_content";
+      swallow { "efl.right_content";
          desc { "default";
             rel.to: "base";
             rel1.relative: 1.0 0.0;
@@ -49,23 +49,23 @@ group { "efl/navigation_bar";
       spacer { "text_base";
          desc { "default";
             rel1 {
-               to: "back_button";
+               to: "efl.back_button";
                relative: 1.0 0.0;
             }
             rel2 {
-               to: "right_content";
+               to: "efl.right_content";
                relative: 0.0 1.0;
             }
          }
          desc { "left_content";
             inherit: "default";
             rel1 {
-               to: "left_content";
+               to: "efl.left_content";
                relative: 1.0 0.0;
             }
          }
       }
-      textblock { "text";
+      textblock { "efl.text";
          scale;
          desc { "default";
             text {
@@ -78,12 +78,12 @@ group { "efl/navigation_bar";
          program {
             signal: "elm,state,back_button,visible"; source: "elm";
             action: STATE_SET "visible" 0.0;
-            target: "back_button";
+            target: "efl.back_button";
          }
          program {
             signal: "elm,state,back_button,hidden"; source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "back_button";
+            target: "efl.back_button";
          }
          program {
             signal: "elm,state,left_content,visible"; source: "elm";
@@ -104,7 +104,7 @@ group { name: "efl/navigation_bar/back_button";
    images.image: "icon_arrow_left.png" COMP;
    parts {
       image { name: "icon_arrow_left";
-         insert_before: "elm.swallow.content";
+         insert_before: "efl.content";
          desc { "default";
             image.normal: "icon_arrow_left.png";
             fill.smooth: 0;
diff --git a/data/elementary/themes/edc/efl/navigation_layout.edc b/data/elementary/themes/edc/efl/navigation_layout.edc
index c3765cc..4319453 100644
--- a/data/elementary/themes/edc/efl/navigation_layout.edc
+++ b/data/elementary/themes/edc/efl/navigation_layout.edc
@@ -5,7 +5,7 @@ group { "efl/navigation_layout";
          desc { "default";
          }
       }
-      swallow { "bar";
+      swallow { "efl.bar";
          desc { "default";
             fixed: 0 1;
             min: 0 40;
@@ -13,11 +13,11 @@ group { "efl/navigation_layout";
             align: 0.5 0.0;
          }
       }
-      swallow { "content";
+      swallow { "efl.content";
          desc { "default";
             rel1 {
                to_x: "base";
-               to_y: "bar";
+               to_y: "efl.bar";
                relative: 0.0 1.0;
             }
             rel2.to_x: "base";
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index 0ce7738..4983cd3 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -18,9 +18,9 @@
 group { name: "efl/panes/vertical";
    images.image: "holes_vert.png" COMP;
    parts {
-      //TODO: remove elm.swallow.left/right 
-      alias: "first" "elm.swallow.left";
-      alias: "second" "elm.swallow.right";
+      //TODO: remove left/right
+      alias: "first" "left";
+      alias: "second" "right";
 
       part { name: "whole"; type: SPACER;
          description { state: "default" 0.0;
@@ -54,35 +54,35 @@ group { name: "efl/panes/vertical";
       }
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
-            rel2.to_x: "elm.bar";
+            rel2.to_x: "efl.bar";
             rel2.relative: 1.0 1.0;
             rel2.offset: -4 -1;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to_x: "elm.bar";
+            rel1.to_x: "efl.bar";
             rel1.relative: 0.0 0.0;
             rel1.offset: 3 0;
          }
       }
-      part { name: "elm.swallow.left"; type: SWALLOW;
+      part { name: "left"; type: SWALLOW;
          clip_to: "whole_left";
          description { state: "default" 0.0;
-            rel2.to_x: "elm.bar";
+            rel2.to_x: "efl.bar";
             rel2.relative: 1.0 1.0;
             rel2.offset: -4 -1;
          }
       }
-      part { name: "elm.swallow.right"; type: SWALLOW;
+      part { name: "right"; type: SWALLOW;
          clip_to: "whole_right";
          description { state: "default" 0.0;
-            rel1.to_x: "elm.bar";
+            rel1.to_x: "efl.bar";
             rel1.relative: 0.0 0.0;
             rel1.offset: 3 0;
          }
       }
-      part { name: "elm.bar"; type: SPACER;
+      part { name: "efl.bar"; type: SPACER;
          dragable { confine: "sub_whole";
             x: 1 1 1;
             y: 0 0 0;
@@ -98,28 +98,28 @@ group { name: "efl/panes/vertical";
       part { name: "dots"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "holes_vert.png";
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
             FIXED_SIZE(4, 14)
          }
       }
-      part { name: "elm.swallow.event"; type: SWALLOW;
+      part { name: "efl.event"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             min: PANEMIN PANEMIN2;
             fixed: 1 1;
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
          }
       }
-      part { name: "bar"; type: RECT;
-         dragable.events: "elm.bar";
+      part { name: "rect_bar"; type: RECT;
+         dragable.events: "efl.bar";
          description { state: "default" 0.0;
             min: PANEMIN PANEWID;
             max: 99999 99999;
             fixed: 1 1;
-            rel1.to_x: "elm.swallow.event";
-            rel2.to_x: "elm.swallow.event";
+            rel1.to_x: "efl.event";
+            rel2.to_x: "efl.event";
             color: 0 0 0 0;
          }
          description { state: "disabled" 0.0;
@@ -129,27 +129,27 @@ group { name: "efl/panes/vertical";
       }
    }
    programs {
-      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
+      program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
-      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
+      program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
          action: SIGNAL_EMIT "elm,action,unpress" "elm";
       }
-      program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
+      program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
+      program { signal: "mouse,down,1,double"; source: "rect_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: "bar";
+         target: "rect_bar";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,unfixed"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "bar";
+         target: "rect_bar";
       }
    }
 }
@@ -157,9 +157,9 @@ group { name: "efl/panes/vertical";
 group { name: "efl/panes/horizontal";
    images.image: "holes_horiz.png" COMP;
    parts {
-      //TODO: remove elm.swallow.left/right 
-      alias: "first" "elm.swallow.left";
-      alias: "second" "elm.swallow.right";
+      //TODO: remove left/right
+      alias: "first" "left";
+      alias: "second" "right";
 
       part { name: "whole"; type: SPACER;
          description { state: "default" 0.0;
@@ -193,35 +193,35 @@ group { name: "efl/panes/horizontal";
       }
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
-            rel2.to_y: "elm.bar";
+            rel2.to_y: "efl.bar";
             rel2.relative: 1.0 1.0;
             rel2.offset: -1 -4;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to_y: "elm.bar";
+            rel1.to_y: "efl.bar";
             rel1.relative: 0.0 0.0;
             rel1.offset: 0 3;
          }
       }
-      part { name: "elm.swallow.left"; type: SWALLOW;
+      part { name: "left"; type: SWALLOW;
          clip_to: "whole_left";
          description { state: "default" 0.0;
-            rel2.to_y: "elm.bar";
+            rel2.to_y: "efl.bar";
             rel2.relative: 1.0 1.0;
             rel2.offset: -1 -4;
          }
       }
-      part { name: "elm.swallow.right"; type: SWALLOW;
+      part { name: "right"; type: SWALLOW;
          clip_to: "whole_right";
          description { state: "default" 0.0;
-            rel1.to_y: "elm.bar";
+            rel1.to_y: "efl.bar";
             rel1.relative: 0.0 0.0;
             rel1.offset: 0 3;
          }
       }
-      part { name: "elm.bar"; type: SPACER;
+      part { name: "efl.bar"; type: SPACER;
          dragable { confine: "sub_whole";
             x: 0 0 0;
             y: 1 1 1;
@@ -237,28 +237,28 @@ group { name: "efl/panes/horizontal";
       part { name: "dots"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "holes_horiz.png";
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
             FIXED_SIZE(14, 4)
          }
       }
-      part { name: "elm.swallow.event"; type: SWALLOW;
+      part { name: "efl.event"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             min: PANEMIN2 PANEMIN;
             fixed: 1 1;
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
          }
       }
-      part { name: "bar"; type: RECT;
-         dragable.events: "elm.bar";
+      part { name: "rect_bar"; type: RECT;
+         dragable.events: "efl.bar";
          description { state: "default" 0.0;
             min: PANEWID PANEMIN;
             max: 99999 99999;
             fixed: 1 1;
-            rel1.to_y: "elm.swallow.event";
-            rel2.to_y: "elm.swallow.event";
+            rel1.to_y: "efl.event";
+            rel2.to_y: "efl.event";
             color: 0 0 0 0;
          }
          description { state: "disabled" 0.0;
@@ -268,27 +268,27 @@ group { name: "efl/panes/horizontal";
       }
    }
    programs {
-      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
+      program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
-      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
+      program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
          action: SIGNAL_EMIT "elm,action,unpress" "elm";
       }
-      program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
+      program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
+      program { signal: "mouse,down,1,double"; source: "rect_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: "bar";
+         target: "rect_bar";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,unfixed"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "bar";
+         target: "rect_bar";
       }
    }
 }
@@ -329,33 +329,33 @@ group { name: "efl/panes/vertical:flush";
       }
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
-            rel2.to_x: "elm.bar";
+            rel2.to_x: "efl.bar";
             rel2.relative: 1.0 1.0;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to_x: "elm.bar";
+            rel1.to_x: "efl.bar";
             rel1.relative: 0.0 0.0;
          }
       }
-      part { name: "elm.swallow.left"; type: SWALLOW;
+      part { name: "left"; type: SWALLOW;
          clip_to: "whole_left";
          description { state: "default" 0.0;
-            rel2.to_x: "elm.bar";
+            rel2.to_x: "efl.bar";
             rel2.relative: 1.0 1.0;
             fixed: 1 0;
          }
       }
-      part { name: "elm.swallow.right"; type: SWALLOW;
+      part { name: "right"; type: SWALLOW;
          clip_to: "whole_right";
          description { state: "default" 0.0;
-            rel1.to_x: "elm.bar";
+            rel1.to_x: "efl.bar";
             rel1.relative: 0.0 0.0;
             fixed: 1 0;
          }
       }
-      part { name: "elm.bar"; type: SPACER;
+      part { name: "efl.bar"; type: SPACER;
          dragable { confine: "sub_whole";
             x: 1 1 1;
             y: 0 0 0;
@@ -368,24 +368,24 @@ group { name: "efl/panes/vertical:flush";
             rel2.relative: 1.0 0.5;
          }
       }
-      part { name: "elm.swallow.event"; type: SWALLOW;
+      part { name: "efl.event"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             min: PANEMIN PANEMIN2;
             fixed: 1 1;
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
          }
       }
-      part { name: "bar"; type: RECT;
-         dragable.events: "elm.bar";
+      part { name: "rect_bar"; type: RECT;
+         dragable.events: "efl.bar";
          description { state: "default" 0.0;
             min: PANEMIN PANEWID;
             max: 99999 99999;
             fixed: 1 1;
-            rel1.to_x: "elm.swallow.event";
+            rel1.to_x: "efl.event";
             rel1.relative: 0.0 0.25;
-            rel2.to_x: "elm.swallow.event";
+            rel2.to_x: "efl.event";
             rel2.relative: 1.0 0.75;
             color: 0 0 0 0;
          }
@@ -399,7 +399,7 @@ group { name: "efl/panes/vertical:flush";
             image.normal: "downlight_glow_left.png";
             image.border: 0 3 0 0;
             max: 32 99999;
-            rel2.to_x: "elm.bar";
+            rel2.to_x: "efl.bar";
             color: 255 255 255 0;
             align: 1.0 0.5;
          }
@@ -412,7 +412,7 @@ group { name: "efl/panes/vertical:flush";
          description { state: "default" 0.0;
             image.normal: "downlight_glow_right.png";
             max: 4 99999;
-            rel1.to_x: "elm.bar";
+            rel1.to_x: "efl.bar";
             color: 255 255 255 0;
             align: 0.0 0.5;
          }
@@ -425,7 +425,7 @@ group { name: "efl/panes/vertical:flush";
          description { state: "default" 0.0;
             image.normal: "downlight_glow_left.png";
             max: 4 99999;
-            rel2.to_x: "elm.bar";
+            rel2.to_x: "efl.bar";
             color: 255 255 255 0;
             align: 1.0 0.5;
          }
@@ -439,7 +439,7 @@ group { name: "efl/panes/vertical:flush";
             image.normal: "downlight_glow_right.png";
             image.border: 3 0 0 0;
             max: 32 99999;
-            rel1.to_x: "elm.bar";
+            rel1.to_x: "efl.bar";
             color: 255 255 255 0;
             align: 0.0 0.5;
          }
@@ -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: "bar";
-            rel2.to: "bar";
+            rel1.to: "rect_bar";
+            rel2.to: "rect_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: "bar";
+            rel1.to: "rect_bar";
             rel1.relative: 0.5 0.0;
-            rel2.to: "bar";
+            rel2.to: "rect_bar";
             color: 0 0 0 0;
          }
       }
    }
    programs {
-      program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
+      program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
-      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
+      program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
          action: SIGNAL_EMIT "elm,action,unpress" "elm";
       }
-      program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
+      program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
+      program { signal: "mouse,down,1,double"; source: "rect_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: "bar";
+         target: "rect_bar";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,unfixed"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "bar";
+         target: "rect_bar";
       }
       program {
          signal: "mouse,in"; source: "bar1";
@@ -557,33 +557,33 @@ group { name: "efl/panes/horizontal:flush";
       }
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
-            rel2.to_y: "elm.bar";
+            rel2.to_y: "efl.bar";
             rel2.relative: 1.0 1.0;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to_y: "elm.bar";
+            rel1.to_y: "efl.bar";
             rel1.relative: 0.0 0.0;
          }
       }
-      part { name: "elm.swallow.left"; type: SWALLOW;
+      part { name: "left"; type: SWALLOW;
          clip_to: "whole_left";
          description { state: "default" 0.0;
-            rel2.to_y: "elm.bar";
+            rel2.to_y: "efl.bar";
             rel2.relative: 1.0 1.0;
             fixed: 0 1;
          }
       }
-      part { name: "elm.swallow.right"; type: SWALLOW;
+      part { name: "right"; type: SWALLOW;
          clip_to: "whole_right";
          description { state: "default" 0.0;
-            rel1.to_y: "elm.bar";
+            rel1.to_y: "efl.bar";
             rel1.relative: 0.0 0.0;
             fixed: 0 1;
          }
       }
-      part { name: "elm.bar"; type: SPACER;
+      part { name: "efl.bar"; type: SPACER;
          dragable { confine: "sub_whole";
             x: 0 0 0;
             y: 1 1 1;
@@ -596,24 +596,24 @@ group { name: "efl/panes/horizontal:flush";
             rel2.relative: 0.5 1.0;
          }
       }
-      part { name: "elm.swallow.event"; type: SWALLOW;
+      part { name: "efl.event"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             min: PANEMIN2 PANEMIN;
             fixed: 1 1;
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
+            rel1.to: "efl.bar";
+            rel2.to: "efl.bar";
          }
       }
-      part { name: "bar"; type: RECT;
-         dragable.events: "elm.bar";
+      part { name: "rect_bar"; type: RECT;
+         dragable.events: "efl.bar";
          description { state: "default" 0.0;
             min: PANEWID PANEMIN;
             max: 99999 99999;
             fixed: 1 1;
-            rel1.to_y: "elm.swallow.event";
+            rel1.to_y: "efl.event";
             rel1.relative: 0.25 0.0;
-            rel2.to_y: "elm.swallow.event";
+            rel2.to_y: "efl.event";
             rel2.relative: 0.75 1.0;
             color: 0 0 0 0;
          }
@@ -627,7 +627,7 @@ group { name: "efl/panes/horizontal:flush";
             image.normal: "downlight_glow_up.png";
             image.border: 0 0 0 3;
             max: 99999 32;
-            rel2.to_y: "elm.bar";
+            rel2.to_y: "efl.bar";
             color: 255 255 255 0;
             align: 0.5 1.0;
          }
@@ -640,7 +640,7 @@ group { name: "efl/panes/horizontal:flush";
          description { state: "default" 0.0;
             image.normal: "downlight_glow.png";
             max: 99999 4;
-            rel1.to_y: "elm.bar";
+            rel1.to_y: "efl.bar";
             color: 255 255 255 0;
             align: 0.5 0.0;
          }
@@ -653,7 +653,7 @@ group { name: "efl/panes/horizontal:flush";
          description { state: "default" 0.0;
             image.normal: "downlight_glow_up.png";
             max: 99999 4;
-            rel2.to_y: "elm.bar";
+            rel2.to_y: "efl.bar";
             color: 255 255 255 0;
             align: 0.5 1.0;
          }
@@ -667,7 +667,7 @@ group { name: "efl/panes/horizontal:flush";
             image.normal: "downlight_glow.png";
             image.border: 0 0 3 0;
             max: 99999 32;
-            rel1.to_y: "elm.bar";
+            rel1.to_y: "efl.bar";
             color: 255 255 255 0;
             align: 0.5 0.0;
          }
@@ -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: "bar";
-            rel2.to: "bar";
+            rel1.to: "rect_bar";
+            rel2.to: "rect_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: "bar";
+            rel1.to: "rect_bar";
             rel1.relative: 0.0 0.5;
-            rel2.to: "bar";
+            rel2.to: "rect_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: "bar"; // for "press" smart callback
+      program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
-      program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
+      program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
          action: SIGNAL_EMIT "elm,action,unpress" "elm";
       }
-      program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
+      program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
+      program { signal: "mouse,down,1,double"; source: "rect_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: "bar";
+         target: "rect_bar";
       }
       program { // for elm_panes_fixed_set()
          signal: "elm,panes,unfixed"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "bar";
+         target: "rect_bar";
       }
    }
 }
@@ -796,15 +796,15 @@ group { name: "efl/panes/vertical:left-fold";
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
-               get_drag(PART:"elm.bar", dx, dy);
+               get_drag(PART:"efl.bar", dx, dy);
                set_float(drag_x, dx);
-               set_drag(PART:"elm.bar", 0.0, 0.5);
+               set_drag(PART:"efl.bar", 0.0, 0.5);
                set_state(PART:"dots", "closed", 0.0);
             }
             else if (get_int(open) == 0)
             {
                set_int(open, 1);
-               set_drag(PART:"elm.bar", get_float(drag_x), 0.5);
+               set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
                set_state(PART:"dots", "default", 0.0);
             }
          }
@@ -859,15 +859,15 @@ group { name: "efl/panes/vertical:right-fold";
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
-               get_drag(PART:"elm.bar", dx, dy);
+               get_drag(PART:"efl.bar", dx, dy);
                set_float(drag_x, dx);
-               set_drag(PART:"elm.bar", 1.0, 0.5);
+               set_drag(PART:"efl.bar", 1.0, 0.5);
                set_state(PART:"dots", "closed", 0.0);
             }
             else if (get_int(open) == 0)
             {
                set_int(open, 1);
-               set_drag(PART:"elm.bar", get_float(drag_x), 0.5);
+               set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
                set_state(PART:"dots", "default", 0.0);
             }
          }
@@ -922,15 +922,15 @@ group { name: "efl/panes/horizontal:up-fold";
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
-               get_drag(PART:"elm.bar", dx, dy);
+               get_drag(PART:"efl.bar", dx, dy);
                set_float(drag_y, dy);
-               set_drag(PART:"elm.bar", 0.5, 0.0);
+               set_drag(PART:"efl.bar", 0.5, 0.0);
                set_state(PART:"dots", "closed", 0.0);
             }
             else if (get_int(open) == 0)
             {
                set_int(open, 1);
-               set_drag(PART:"elm.bar", 0.5, get_float(drag_y));
+               set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
                set_state(PART:"dots", "default", 0.0);
             }
          }
@@ -985,15 +985,15 @@ group { name: "efl/panes/horizontal:down-fold";
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
-               get_drag(PART:"elm.bar", dx, dy);
+               get_drag(PART:"efl.bar", dx, dy);
                set_float(drag_y, dy);
-               set_drag(PART:"elm.bar", 0.5, 1.0);
+               set_drag(PART:"efl.bar", 0.5, 1.0);
                set_state(PART:"dots", "closed", 0.0);
             }
             else if (get_int(open) == 0)
             {
                set_int(open, 1);
-               set_drag(PART:"elm.bar", 0.5, get_float(drag_y));
+               set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
                set_state(PART:"dots", "default", 0.0);
             }
          }
diff --git a/data/elementary/themes/edc/efl/pointer.edc b/data/elementary/themes/edc/efl/pointer.edc
index a101aa7..a8836b4 100644
--- a/data/elementary/themes/edc/efl/pointer.edc
+++ b/data/elementary/themes/edc/efl/pointer.edc
@@ -38,7 +38,7 @@ group { name: "efl/pointer";
          }
       }
       part {
-         name: "elm.swallow.hotspot";
+         name: "efl.hotspot";
          /* this is a "fake" swallow part
           * that is used by e to determine
           * the pointer hotspot - or where
@@ -218,4 +218,4 @@ group { name: "efl/pointer:top_side";
          }
       }
    }
-}
\ No newline at end of file
+}
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index 50fb460..cfdd560 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -15,7 +15,7 @@ group { "efl/popup";
             image.normal: "rounded_square.png";
          }
       }
-      swallow { "elm.swallow.content";
+      swallow { "efl.content";
          desc { "default";
             rel.to: "base";
          }
@@ -28,7 +28,7 @@ group { "efl/popup_alert";
    alias: "efl/popup_alert_text";
    images.image: "rounded_square.png" COMP;
    parts {
-      alias: "title" "elm.text.title";
+      alias: "title" "efl.text.title";
       image { "bg";
          desc { "default";
             min: 100 100;
@@ -57,7 +57,7 @@ group { "efl/popup_alert";
             min: 0 20;
          }
       }
-      textblock { "elm.text.title";
+      textblock { "efl.text.title";
          scale;
          desc { "default";
             fixed: 1 1;
@@ -72,7 +72,7 @@ group { "efl/popup_alert";
             vis;
          }
       }
-      swallow { "buttons";
+      swallow { "efl.buttons";
          desc { "default";
             fixed: 0 1;
             rel.to: "base";
@@ -85,12 +85,12 @@ group { "efl/popup_alert";
             min: 0 30;
          }
       }
-      swallow { "elm.swallow.content";
+      swallow { "efl.content";
          desc { "default";
             rel1.to_x: "base";
             rel1.to_y: "title_bg";
             rel2.to_x: "base";
-            rel2.to_y: "buttons";
+            rel2.to_y: "efl.buttons";
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 0.0;
          }
@@ -101,12 +101,12 @@ group { "efl/popup_alert";
          signal: "elm,title,show"; source: "elm";
          action: STATE_SET "title_visible" 0.0;
          target: "title_bg";
-         target: "elm.text.title";
+         target: "efl.text.title";
       }
       program {
-         signal: "elm,buttons,show"; source: "elm";
+         signal: "elm,efl.buttons,show"; source: "elm";
          action: STATE_SET "button_visible" 0.0;
-         target: "buttons";
+         target: "efl.buttons";
       }
    }
 }
@@ -125,17 +125,17 @@ group { "efl/popup/backwall";
          desc { "default";
             color: 0 0 0 64;
          }
-         desc { "show_image";
+         desc { "content_visible";
             inherit: "default";
             hid;
          }
       }
-      swallow { "elm.swallow.image";
+      swallow { "efl.content";
          desc { "default";
             rel.to: "base";
             hid;
          }
-         desc { "show_image";
+         desc { "content_visible";
             inherit: "default";
             vis;
          }
@@ -150,16 +150,16 @@ group { "efl/popup/backwall";
 
    programs {
       program {
-         signal: "elm,state,image,visible"; source: "elm";
-         action: STATE_SET "show_image" 0.0;
+         signal: "elm,state,content,set"; source: "elm";
+         action: STATE_SET "content_visible" 0.0;
          target: "base";
-         target: "elm.swallow.image";
+         target: "efl.content";
       }
       program {
-         signal: "elm,state,image,hidden"; source: "elm";
+         signal: "elm,state,content,unset"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "base";
-         target: "elm.swallow.image";
+         target: "efl.content";
       }
       program {
          signal: "mouse,clicked,1"; source: "block";
@@ -172,7 +172,7 @@ group { "efl/popup_alert/button_layout1";
    alias: "efl/popup_alert_scroll/button_layout1";
    alias: "efl/popup_alert_text/button_layout1";
    parts {
-      swallow { "elm.swallow.button1";
+      swallow { "efl.button1";
       }
    }
 }
@@ -188,13 +188,13 @@ group { "efl/popup_alert/button_layout2";
             min: 5 5;
          }
       }
-      swallow { "elm.swallow.button1";
+      swallow { "efl.button1";
          desc { "default";
             rel2.to_x: "div1";
             rel2.relative: 0.0 1.0;
          }
       }
-      swallow { "elm.swallow.button2";
+      swallow { "efl.button2";
          desc { "default";
             rel1.to_x: "div1";
             rel1.relative: 1.0 0.0;
@@ -221,13 +221,13 @@ group { "efl/popup_alert/button_layout3";
             min: 5 5;
          }
       }
-      swallow { "elm.swallow.button1";
+      swallow { "efl.button1";
          desc { "default";
             rel2.to_x: "div1";
             rel2.relative: 0.0 1.0;
          }
       }
-      swallow { "elm.swallow.button2";
+      swallow { "efl.button2";
          desc { "default";
             rel1.to_x: "div1";
             rel2.to_x: "div2";
@@ -235,7 +235,7 @@ group { "efl/popup_alert/button_layout3";
             rel2.relative: 0.0 1.0;
          }
       }
-      swallow { "elm.swallow.button3";
+      swallow { "efl.button3";
          desc { "default";
             rel1.to_x: "div2";
             rel1.relative: 1.0 0.0;
@@ -250,24 +250,24 @@ group { "efl/popup_alert/button";
    alias: "efl/popup_alert_text/button";
 }
 
-group { name: "efl/popup_alert_scroll/scroller";
+group { "efl/popup_alert_scroll/scroller";
    inherit: "efl/scroller";
    alias: "efl/popup_alert_text/scroller";
    parts {
-      part { name: "elm.swallow.content"; type: SWALLOW;
-         description { state: "default" 0.0;
+       swallow { "efl.content";
+         desc { "default";
             rel1.offset: 0 0;
             rel2.offset: 0 0;
          }
       }
-      part { name: "inset";
-         description { state: "default" 0.0;
-            visible: 0;
+      spacer { "inset";
+         desc { "default";
+            hid;
          }
       }
-      part { name: "shadow";
-         description { state: "default" 0.0;
+      spacer { "shadow";
+         desc { "default";