diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo b/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo
index f7e3a2b491..1bd61ba9fd 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo
@@ -4,7 +4,7 @@ mixin Elm_Interface_Atspi_Accessible ()
    eo_prefix: elm_interface_atspi_accessible;
    data: null;
    properties {
-      protected localized_role_name {
+      localized_role_name @protected {
          get {
             /*@ Gets an localized string describing ATSPI widget role name. */
          }
@@ -12,7 +12,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             const(char)* localized_name;
          }
       }
-      protected name {
+      name @protected {
          get {
             /*@ Gets an string describing ATSPI widget role name. */
          }
@@ -22,7 +22,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             const(char)* name; /*@ obj name */
          }
       }
-      protected relation_set {
+      relation_set @protected {
          get {
             /*@ Gets an string describing ATSPI widget role name. Lists and
             elements Should be free by a user. */
@@ -31,7 +31,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             Eina_List *relations;
          }
       }
-      protected role {
+      role @protected {
          get {
             /*@ Gets the role of the widget in ATSPI Accessibility domain. */
          }
@@ -41,7 +41,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             Elm_Atspi_Role role;
          }
       }
-      protected children {
+      children @protected {
          get {
             /*@ Gets widget's accessible children. */
          }
@@ -49,7 +49,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             Eina_List *children;
          }
       }
-      protected role_name {
+      role_name @protected {
          get {
             /*@ Gets human-readable string indentifying widget accessibility
             role. */
@@ -58,7 +58,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             const(char)* role_name;
          }
       }
-      protected attributes {
+      attributes @protected {
          get {
             /*@ Gets key-value pairs indentifying widget extra 
             attributes. Must be free by a user. */
@@ -67,7 +67,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             Eina_List *attributes;
          }
       }
-      protected index_in_parent {
+      index_in_parent @protected {
          get {
             /*@ Gets index of the child in parent's children list. */
          }
@@ -86,7 +86,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             const(char)* description;
          }
       }
-      protected parent {
+      parent @protected {
          get {
             /*@ Gets widget accessible parent. */
          }
@@ -97,7 +97,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             Eo *parent;
          }
       }
-      protected state_set {
+      state_set @protected {
          get {
             /*@ Gets set describing widget accessible states. */
          }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_action.eo b/legacy/elementary/src/lib/elm_interface_atspi_action.eo
index b1b43544ef..0f876e7298 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_action.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_action.eo
@@ -4,7 +4,7 @@ mixin Elm_Interface_Atspi_Action ()
    eo_prefix: elm_interface_atspi_action;
    data: null;
    properties {
-      protected name {
+      name @protected {
          get {
             /*@ Gets action name for given id */
          }
@@ -15,7 +15,7 @@ mixin Elm_Interface_Atspi_Action ()
             int id;
          }
       }
-      protected localized_name {
+      localized_name @protected {
          get {
             /*@ Gets localized action name for given id */
          }
@@ -26,7 +26,7 @@ mixin Elm_Interface_Atspi_Action ()
             int id;
          }
       }
-      protected description {
+      description @protected {
          get {
             /*@ Gets action description for given id */
          }
@@ -41,7 +41,7 @@ mixin Elm_Interface_Atspi_Action ()
             int id;
          }
       }
-      protected actions {
+      actions @protected {
          get {
             /*@ Get list of available widget actions */
          }
@@ -51,14 +51,14 @@ mixin Elm_Interface_Atspi_Action ()
       }
    }
    methods {
-      protected action_do {
+      action_do @protected {
          /*@ Performs action on given widget. */
          params {
             @in int id;
          }
          return bool;
       }
-      protected keybinding_get {
+      keybinding_get @protected {
          /*@ Gets configured keybinding for specific action and widget. */
          params {
             @in  int id;
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_component.eo b/legacy/elementary/src/lib/elm_interface_atspi_component.eo
index 525463453b..6ec1b8a75d 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_component.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_component.eo
@@ -4,7 +4,7 @@ mixin Elm_Interface_Atspi_Component ()
    eo_prefix: elm_interface_atspi_component;
    data: null;
    properties {
-      protected size {
+      size @protected {
          set {
             /*@ Sets size of accessible widget. */
             return bool;
@@ -17,7 +17,7 @@ mixin Elm_Interface_Atspi_Component ()
             int h;
          }
       }
-      protected layer {
+      layer @protected {
          get {
             /*@ Sets evas layer of accessible widget. */
          }
@@ -25,7 +25,7 @@ mixin Elm_Interface_Atspi_Component ()
             int layer;
          }
       }
-      protected alpha {
+      alpha @protected {
          get {
             /*@ Gets alpha of accessible widget. */
          }
@@ -33,7 +33,7 @@ mixin Elm_Interface_Atspi_Component ()
             double alpha; /*@ alpha value in [0, 1] range. */
          }
       }
-      protected z_order {
+      z_order @protected {
          get {
             /*@ Gets the depth at which the component is shown in relation to
             other components in the same container. */
@@ -42,7 +42,7 @@ mixin Elm_Interface_Atspi_Component ()
             int z_order;
          }
       }
-      protected extents {
+      extents @protected {
          get {
             /*@ Gets geometry of accessible widget. */
          }
@@ -62,7 +62,7 @@ mixin Elm_Interface_Atspi_Component ()
             int h;
          }
       }
-      protected position {
+      position @protected {
          set {
             /*@ Sets position of accessible widget. */
             return bool;
@@ -82,7 +82,7 @@ mixin Elm_Interface_Atspi_Component ()
       }
    }
    methods {
-      protected contains {
+      contains @protected {
          params {
             bool screen_coords; /*@ If true x and y values will be relative
                                        to screen origin, otherwise relative to
@@ -99,7 +99,7 @@ mixin Elm_Interface_Atspi_Component ()
 
          return bool;
       }
-      protected accessible_at_point_get {
+      accessible_at_point_get @protected {
          /*@ Gets top component object occupying space at given coordinates. */
          params {
             bool screen_coords; /*@ If true x and y values will be relative
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo b/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo
index 2f431e2cd0..35eac3c886 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo
@@ -3,7 +3,7 @@ interface Elm_Interface_Atspi_Editable_Text ()
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_editable_text;
    properties {
-      protected content {
+      content @protected {
          set {
             return bool;
          }
@@ -13,35 +13,35 @@ interface Elm_Interface_Atspi_Editable_Text ()
       }
    }
    methods {
-      protected insert {
+      insert @protected {
          params {
             @in const(char)* string;
             @in int position;
          }
          return bool;
       }
-      protected copy {
-         params {
-            @in int start;
-            @in int end;
-         }
-		 return bool;
-      }
-      protected cut {
+      copy @protected {
          params {
             @in int start;
             @in int end;
          }
          return bool;
       }
-      protected delete {
+      cut @protected {
          params {
             @in int start;
             @in int end;
          }
          return bool;
       }
-      protected paste {
+      delete @protected {
+         params {
+            @in int start;
+            @in int end;
+         }
+         return bool;
+      }
+      paste @protected {
          params {
             @in int position;
          }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_image.eo b/legacy/elementary/src/lib/elm_interface_atspi_image.eo
index 16ab1678c3..1bc4066236 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_image.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_image.eo
@@ -4,7 +4,7 @@ mixin Elm_Interface_Atspi_Image ()
    eo_prefix: elm_interface_atspi_image;
    data: null;
    properties {
-      protected extents {
+      extents @protected {
          get {
             /*@ Gets an image extents. */
          }
@@ -28,7 +28,7 @@ mixin Elm_Interface_Atspi_Image ()
             const(char)* description;
          }
       }
-      protected locale {
+      locale @protected {
          get {
             /* Gets locale of the image description. */
          }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_selection.eo b/legacy/elementary/src/lib/elm_interface_atspi_selection.eo
index 0269cac810..91b0c5a65d 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_selection.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_selection.eo
@@ -3,13 +3,13 @@ interface Elm_Interface_Atspi_Selection ()
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_selection;
    properties {
-      protected selected_children_count {
+      selected_children_count @protected {
          get {
             /* Gets the number of currently selected children */
             return int;
          }
       }
-      protected selected_child {
+      selected_child @protected {
          /* Gets child for given child index */
          get {
             return Eo*;
@@ -20,36 +20,36 @@ interface Elm_Interface_Atspi_Selection ()
      }
    }
    methods {
-      protected child_select {
+      child_select @protected {
          /* Adds selection for given child index */
          params {
             @in int child_index;
          }
          return bool;
       }
-      protected selected_child_deselect {
+      selected_child_deselect @protected {
          /* Removes selection for given child index */
          params {
             @in int child_index;
          }
          return bool;
       }
-      protected is_child_selected {
+      is_child_selected @protected {
          /* Determines if child specified by index is selected */
          params {
             @in int child_index;
          }
          return bool;
       }
-      protected all_children_select {
+      all_children_select @protected {
          /* Adds selection for all children */
          return bool;
       }
-      protected clear {
+      clear @protected {
          /* Clears the current selection */
          return bool;
       }
-      protected child_deselect {
+      child_deselect @protected {
          /* Removes selection for given child index */
          params {
             @in int child_index;
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_text.eo b/legacy/elementary/src/lib/elm_interface_atspi_text.eo
index 44e79dbe4e..83df4f6a7d 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_text.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_text.eo
@@ -3,7 +3,7 @@ interface Elm_Interface_Atspi_Text ()
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_text;
    properties {
-      protected character {
+      character @protected {
          get {
             /*@ Gets single character present in accessible widget's text
                 at given offset. */
@@ -18,7 +18,7 @@ interface Elm_Interface_Atspi_Text ()
                                       that string includes invalid UTF8 chars. */
          }
       }
-      protected string {
+      string @protected {
          get {
             /*@ Gets string, start and end offset in text according to
               given initial offset and granulatity. */
@@ -36,7 +36,7 @@ interface Elm_Interface_Atspi_Text ()
                             Must be free by a user. */
          }
       }
-      protected text {
+      text @protected {
          get {
             /*@ Gets text of accessible widget. */
          }
@@ -48,7 +48,7 @@ interface Elm_Interface_Atspi_Text ()
             char *text; /*@ UTF-8 encoded text. */
          }
       }
-      protected caret_offset {
+      caret_offset @protected {
          get {
             /*@ Gets offset position of caret (cursor) */
          }
@@ -60,7 +60,7 @@ interface Elm_Interface_Atspi_Text ()
             int offset;
          }
       }
-      protected attribute {
+      attribute @protected {
          get {
             /*@ Indicate if a text attribute with a given name is set */
             return bool;
@@ -76,7 +76,7 @@ interface Elm_Interface_Atspi_Text ()
             char *value; /* Value of text attribute. Should be free() */
          }
       }
-      protected attributes {
+      attributes @protected {
          get {
             /* Gets list of all text attributes. */
          }
@@ -88,14 +88,14 @@ interface Elm_Interface_Atspi_Text ()
             own(Eina_List*) attributes;
          }
       }
-      protected default_attributes {
+      default_attributes @protected {
          get {
          }
          values {
             own(Eina_List*) attributes;
          }
       }
-      protected character_extents {
+      character_extents @protected {
          get {
             return bool;
          }
@@ -107,14 +107,14 @@ interface Elm_Interface_Atspi_Text ()
             Eina_Rectangle rect;
          }
       }
-      protected character_count {
+      character_count @protected {
          get {
          }
          values {
             int count;
          }
       }
-      protected offset_at_point {
+      offset_at_point @protected {
          get {
          }
          keys {
@@ -126,7 +126,7 @@ interface Elm_Interface_Atspi_Text ()
             int offset;
          }
       }
-      protected bounded_ranges {
+      bounded_ranges @protected {
          get {
          }
          keys {
@@ -139,7 +139,7 @@ interface Elm_Interface_Atspi_Text ()
             Eina_List *ranges;
          }
       }
-      protected range_extents {
+      range_extents @protected {
          get {
             return bool;
          }
@@ -154,14 +154,14 @@ interface Elm_Interface_Atspi_Text ()
             Eina_Rectangle rect;
          }
       }
-      protected selections_count {
+      selections_count @protected {
          get {
          }
          values {
             int count;
          }
       }
-      protected selection {
+      selection @protected {
          get {
          }
          set {
@@ -177,14 +177,14 @@ interface Elm_Interface_Atspi_Text ()
       }
    }
    methods {
-      protected selection_add {
+      selection_add @protected {
          params {
             @in int start_offset;
             @in int end_offset;
          }
          return bool;
       }
-      protected selection_remove  {
+      selection_remove @protected {
          params {
             @in int selection_number;
          }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_value.eo b/legacy/elementary/src/lib/elm_interface_atspi_value.eo
index ded5a7b3c5..91a12eacc8 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_value.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_value.eo
@@ -3,7 +3,7 @@ interface Elm_Interface_Atspi_Value ()
    legacy_prefix: null;
    eo_prefix: elm_interface_atspi_value;
    properties {
-      protected value_and_text {
+      value_and_text @protected {
          get {
             /*@ Gets value displayed by a accessible widget. */
          }
@@ -17,7 +17,7 @@ interface Elm_Interface_Atspi_Value ()
                                eg. small, enough */
          }
       }
-      protected range {
+      range @protected {
          get {
             /* Gets a range of all possible values and its description */
          }
@@ -27,7 +27,7 @@ interface Elm_Interface_Atspi_Value ()
             const(char)* description;
          }
       }
-      protected increment {
+      increment @protected {
          get {
             /* Gets an minimal incrementation value */
          }
diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo
index b7dd850f4f..7d5d1a798e 100644
--- a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo
+++ b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo
@@ -4,7 +4,7 @@ mixin Elm_Interface_Atspi_Widget_Action (Elm_Interface_Atspi_Action)
    eo_prefix: elm_interface_atspi_widget_action;
    data: null;
    properties {
-      protected elm_actions {
+      elm_actions @protected {
          get {
          }
          values {