diff --git a/src/lib/efl/interfaces/efl_gfx_image_orientable.eo b/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
index 2070feb737..ad6d05ae5f 100644
--- a/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
@@ -1,6 +1,6 @@
 parse efl_ui_layout_orientable;
 
-enum @beta Efl.Gfx.Image_Orientation
+enum Efl.Gfx.Image_Orientation
 {
    [[An orientation type, to rotate and flip images.
 
@@ -25,7 +25,7 @@ enum @beta Efl.Gfx.Image_Orientation
    flip_bitmask = 12     [[Bitmask that can be used to isolate flipping values, that is, $flip_vertical and $flip_horizontal.]]
 }
 
-interface @beta Efl.Gfx.Image_Orientable
+interface Efl.Gfx.Image_Orientable
 {
    [[Interface for objects which can be oriented.]]
    c_prefix: efl_gfx_image;
diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/efl/interfaces/efl_input_device.eo
index d296c5cafc..a015cf83f4 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/efl/interfaces/efl_input_device.eo
@@ -1,4 +1,4 @@
-enum @beta Efl.Input.Device_Type
+enum Efl.Input.Device_Type
 {
    [[General type of input device.
 
@@ -19,7 +19,7 @@ enum @beta Efl.Input.Device_Type
   @property canvas { values { canvas: Efl.Canvas; } }
 */
 
-class @beta Efl.Input.Device extends Efl.Object
+class Efl.Input.Device extends Efl.Object
 {
    [[Represents a pointing device such as a touch finger, pen or mouse.
    ]]
diff --git a/src/lib/efl/interfaces/efl_input_types.eot b/src/lib/efl/interfaces/efl_input_types.eot
index 61f3ee922d..a716686528 100644
--- a/src/lib/efl/interfaces/efl_input_types.eot
+++ b/src/lib/efl/interfaces/efl_input_types.eot
@@ -1,4 +1,4 @@
-enum @beta Efl.Pointer.Action
+enum Efl.Pointer.Action
 {
    [[Pointer event type. Represents which kind of event this is.
 
@@ -18,7 +18,7 @@ enum @beta Efl.Pointer.Action
    axis,   [[Axis event (pen, stick, ...).]]
 }
 
-enum @beta Efl.Pointer.Flags
+enum Efl.Pointer.Flags
 {
    [[Pointer flags indicating whether a double or triple click is under way.
 
@@ -29,7 +29,7 @@ enum @beta Efl.Pointer.Flags
    triple_click = (1 << 1), [[This mouse button press was the 3rd press of a triple click]]
 }
 
-enum @beta Efl.Input.Flags
+enum Efl.Input.Flags
 {
    [[Special flags set during an input event propagation.
 
@@ -74,7 +74,7 @@ enum @beta Efl.Input.Object_Pointer_Mode {
                             ]]
 }
 
-enum @beta Efl.Input.Value {
+enum @beta Efl.Input.Value  {
    [[Keys for the generic values of all events.
 
      @since 1.19
diff --git a/src/lib/efl/interfaces/efl_pack.eo b/src/lib/efl/interfaces/efl_pack.eo
index 39f686e20c..7c65928677 100644
--- a/src/lib/efl/interfaces/efl_pack.eo
+++ b/src/lib/efl/interfaces/efl_pack.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Pack extends Efl.Container
+interface Efl.Pack extends Efl.Container
 {
    [[Common interface for objects (containers) with multiple contents
      (sub-objects) which can be added and removed at runtime.
diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo
index 79ea27c5d9..2ba9446fdc 100644
--- a/src/lib/efl/interfaces/efl_pack_linear.eo
+++ b/src/lib/efl/interfaces/efl_pack_linear.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Pack_Linear extends Efl.Pack
+interface Efl.Pack_Linear extends Efl.Pack
 {
    [[Common interface for objects (containers) with multiple contents
      (sub-objects) which can be added and removed at runtime in a linear fashion.
diff --git a/src/lib/efl/interfaces/efl_ui_autorepeat.eo b/src/lib/efl/interfaces/efl_ui_autorepeat.eo
index 92dcc3a88a..e1651df093 100644
--- a/src/lib/efl/interfaces/efl_ui_autorepeat.eo
+++ b/src/lib/efl/interfaces/efl_ui_autorepeat.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Ui.Autorepeat {
+interface Efl.Ui.Autorepeat {
    [[Interface for autorepeating clicks.
 
      This interface abstracts functions for enabling / disabling this feature.
diff --git a/src/lib/efl/interfaces/efl_ui_layout_orientable.eo b/src/lib/efl/interfaces/efl_ui_layout_orientable.eo
index 98142646e9..34da902e56 100644
--- a/src/lib/efl/interfaces/efl_ui_layout_orientable.eo
+++ b/src/lib/efl/interfaces/efl_ui_layout_orientable.eo
@@ -1,6 +1,6 @@
 parse efl_gfx_image_orientable;
 
-enum @beta Efl.Ui.Layout_Orientation
+enum Efl.Ui.Layout_Orientation
 {
    [[Orientation for UI objects and layouts that can have multiple configurations.
 
@@ -24,10 +24,10 @@ enum @beta Efl.Ui.Layout_Orientation
                        along the selected axis.]]
 }
 
-interface @beta Efl.Ui.Layout_Orientable
+interface Efl.Ui.Layout_Orientable
 {
    [[Interface for UI objects which can have more than one orientation.
-   
+
      For example, sliders, which can be horizontal or vertical, or container
      boxes, which can arrange their elements in a horizontal or vertical fashion.
    ]]
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index 4b27389c52..008fb6d46c 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pack_Layout,
+class Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pack_Layout,
                   Efl.Ui.Layout_Orientable, Efl.Gfx.Arrangement
 {
    [[A container that arranges children widgets in a vertical or horizontal fashion.
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 7bf7f17f04..449d501276 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
+class Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
                      Efl.Text, Efl.Content,
                      Efl.Access.Widget.Action
 {
diff --git a/src/lib/elementary/efl_ui_clickable.eo b/src/lib/elementary/efl_ui_clickable.eo
index de3a3e4fb1..ace6f6d6e7 100644
--- a/src/lib/elementary/efl_ui_clickable.eo
+++ b/src/lib/elementary/efl_ui_clickable.eo
@@ -1,4 +1,4 @@
-struct Efl.Ui.Clickable_Clicked {
+struct @beta Efl.Ui.Clickable_Clicked {
    [[A struct that expresses a click in elementary.]]
    repeated : int; [[The amount of how often the clicked event was repeated in a certain amount of time]]
    button : int; [[The Button that is pressed]]
diff --git a/src/lib/elementary/efl_ui_table.eo b/src/lib/elementary/efl_ui_table.eo
index ec9a7552d9..6d66968250 100644
--- a/src/lib/elementary/efl_ui_table.eo
+++ b/src/lib/elementary/efl_ui_table.eo
@@ -1,8 +1,8 @@
-class @beta Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pack_Layout,
+class Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pack_Layout,
                    Efl.Ui.Layout_Orientable, Efl.Gfx.Arrangement
 {
    [[Widget container that arranges its elements in a grid.
-   
+
      The amount of rows and columns can be controlled with @Efl.Pack_Table.table_rows
      and @Efl.Pack_Table.table_columns, and elements can be manually positioned with
      @Efl.Pack_Table.pack_table.
diff --git a/src/lib/evas/canvas/efl_input_event.eo b/src/lib/evas/canvas/efl_input_event.eo
index 04bc589a86..9194b0bc9b 100644
--- a/src/lib/evas/canvas/efl_input_event.eo
+++ b/src/lib/evas/canvas/efl_input_event.eo
@@ -1,6 +1,6 @@
 import efl_input_types;
 
-mixin @beta Efl.Input.Event requires Efl.Object extends Efl.Duplicate
+mixin Efl.Input.Event requires Efl.Object extends Efl.Duplicate
 {
    [[Represents a generic event data.
 
diff --git a/src/lib/evas/canvas/efl_input_hold.eo b/src/lib/evas/canvas/efl_input_hold.eo
index d5f939f341..9649d75cb6 100644
--- a/src/lib/evas/canvas/efl_input_hold.eo
+++ b/src/lib/evas/canvas/efl_input_hold.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Input.Hold extends Efl.Object implements Efl.Input.Event
+class Efl.Input.Hold extends Efl.Object implements Efl.Input.Event
 {
    [[Event data sent when inputs are put on hold or resumed.]]
    methods {
diff --git a/src/lib/evas/canvas/efl_input_interface.eo b/src/lib/evas/canvas/efl_input_interface.eo
index e232ec169a..8ab2fa6f81 100644
--- a/src/lib/evas/canvas/efl_input_interface.eo
+++ b/src/lib/evas/canvas/efl_input_interface.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Input.Interface
+interface Efl.Input.Interface
 {
    [[An object implementing this interface can send pointer events.
 
diff --git a/src/lib/evas/canvas/efl_input_key.eo b/src/lib/evas/canvas/efl_input_key.eo
index a14e81c64a..062d02e91f 100644
--- a/src/lib/evas/canvas/efl_input_key.eo
+++ b/src/lib/evas/canvas/efl_input_key.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Input.Key extends Efl.Object implements Efl.Input.Event, Efl.Input.State
+class Efl.Input.Key extends Efl.Object implements Efl.Input.Event, Efl.Input.State
 {
    [[Represents a single key event from a keyboard or similar device.
    ]]
diff --git a/src/lib/evas/canvas/efl_input_pointer.eo b/src/lib/evas/canvas/efl_input_pointer.eo
index f50b511d20..dd31ad4453 100644
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -1,6 +1,6 @@
 import efl_input_types;
 
-class @beta Efl.Input.Pointer extends Efl.Object implements Efl.Input.Event, Efl.Input.State
+class Efl.Input.Pointer extends Efl.Object implements Efl.Input.Event, Efl.Input.State
 {
    [[Event data carried over with any pointer event (mouse, touch, pen, ...)
    ]]
@@ -11,7 +11,7 @@ class @beta Efl.Input.Pointer extends Efl.Object implements Efl.Input.Event, Efl
             act: Efl.Pointer.Action; [[Event action]]
          }
       }
-      @property value_has {
+      @property value_has @beta {
          [[$true if this event carries a valid value for the specified $key.]]
          get {}
          keys {
@@ -21,7 +21,7 @@ class @beta Efl.Input.Pointer extends Efl.Object implements Efl.Input.Event, Efl
             has: bool; [[$true if input value is valid, $false otherwise]]
          }
       }
-      @property value {
+      @property value @beta  {
          [[Represents a generic value for this event.
 
            Refer to the documentation of @Efl.Input.Value for each value's