diff --git a/src/lib/edje/efl_layout_calc.eo b/src/lib/edje/efl_layout_calc.eo
index cf4f45ebde..b5b45c540d 100644
--- a/src/lib/edje/efl_layout_calc.eo
+++ b/src/lib/edje/efl_layout_calc.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-interface @beta Efl.Layout.Calc
+interface Efl.Layout.Calc
 {
    [[This interface defines a common set of APIs used to trigger calculations
      with layout objects.
diff --git a/src/lib/edje/efl_layout_group.eo b/src/lib/edje/efl_layout_group.eo
index 2f9aa95f04..8c75204671 100644
--- a/src/lib/edje/efl_layout_group.eo
+++ b/src/lib/edje/efl_layout_group.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-interface @beta Efl.Layout.Group
+interface Efl.Layout.Group
 {
    [[APIs representing static data from a group in an edje file.
 
diff --git a/src/lib/edje/efl_layout_signal.eo b/src/lib/edje/efl_layout_signal.eo
index 90709fb8d0..3b4562e596 100644
--- a/src/lib/edje/efl_layout_signal.eo
+++ b/src/lib/edje/efl_layout_signal.eo
@@ -17,7 +17,7 @@ function EflLayoutSignalCb {
   }
 };
 
-interface @beta Efl.Layout.Signal
+interface Efl.Layout.Signal
 {
    [[Layouts asynchronous messaging and signaling interface.
 
diff --git a/src/lib/efl/interfaces/efl_canvas_pointer.eo b/src/lib/efl/interfaces/efl_canvas_pointer.eo
index 3ea8cddfc7..9dbaef00fd 100644
--- a/src/lib/efl/interfaces/efl_canvas_pointer.eo
+++ b/src/lib/efl/interfaces/efl_canvas_pointer.eo
@@ -1,10 +1,11 @@
 import efl_input_device;
 
-interface @beta Efl.Canvas.Pointer
+interface Efl.Canvas.Pointer
 {
    [[Efl Canvas Pointer interface]]
    methods {
-      @property pointer_inside {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      @property pointer_inside @beta {
          get {
             [[Returns whether the mouse pointer is logically inside the
               canvas.
diff --git a/src/lib/efl/interfaces/efl_canvas_scene.eo b/src/lib/efl/interfaces/efl_canvas_scene.eo
index c5b4f16a26..469f63aac2 100644
--- a/src/lib/efl/interfaces/efl_canvas_scene.eo
+++ b/src/lib/efl/interfaces/efl_canvas_scene.eo
@@ -1,7 +1,7 @@
 import efl_input_device;
 import efl_gfx_types;
 
-interface @beta Efl.Canvas.Scene
+interface Efl.Canvas.Scene
 {
    [[Interface containing basic canvas-related methods and events.]]
    methods {
@@ -142,7 +142,8 @@ interface @beta Efl.Canvas.Scene
             ]]
          }
       }
-      seats {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      seats @beta {
          [[Iterate over the available input device seats for the canvas.
 
            A "seat" is the term used for a group of input devices, typically including
@@ -154,7 +155,8 @@ interface @beta Efl.Canvas.Scene
          return: iterator<Efl.Input.Device> @owned;
             [[An iterator over the attached seats.]]
       }
-      @property device {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      @property device @beta{
          [[An input device attached to this canvas, found by name.
 
            Note: This function is meant to find seats and not individual
@@ -172,7 +174,8 @@ interface @beta Efl.Canvas.Scene
             seat: Efl.Input.Device; [[The device or seat, $null if not found.]]
          }
       }
-      @property seat {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      @property seat @beta {
          [[Get a seat attached to this canvas using the seat's id property.
 
            Seats are associated with an arbitrary integer id. The id is not a
@@ -191,7 +194,8 @@ interface @beta Efl.Canvas.Scene
             seat: Efl.Input.Device; [[The seat or $null if not found.]]
          }
       }
-      @property seat_default {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      @property seat_default @beta {
          [[Get the default seat attached to this canvas.
 
            A canvas may have exactly one default seat.
@@ -206,7 +210,8 @@ interface @beta Efl.Canvas.Scene
             seat: Efl.Input.Device; [[The default seat or $null if one does not exist.]]
          }
       }
-      @property pointer_position {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      @property pointer_position @beta {
          get {
             [[This function returns the current known pointer coordinates
 
@@ -231,8 +236,8 @@ interface @beta Efl.Canvas.Scene
       render,pre: void; [[Called when pre render happens]]
       /* FIXME: event_info can be NULL, but @nullable tag does not work on events yet */
       render,post: Efl.Gfx.Event.Render_Post; [[Called when post render happens]]
-      device,changed: Efl.Input.Device; [[Called when input device changed]]
-      device,added: Efl.Input.Device; [[Called when input device was added]]
-      device,removed: Efl.Input.Device; [[Called when input device was removed]]
+      device,changed @beta : Efl.Input.Device; [[Called when input device changed]]
+      device,added @beta: Efl.Input.Device; [[Called when input device was added]]
+      device,removed @beta : Efl.Input.Device; [[Called when input device was removed]]
    }
 }
diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index 42e4d6a2f1..88664432a0 100644
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Container
+interface Efl.Container
 {
    [[Common interface for objects that have multiple contents (sub objects).
 
diff --git a/src/lib/efl/interfaces/efl_content.eo b/src/lib/efl/interfaces/efl_content.eo
index 961bce9fb8..4f84abac4b 100644
--- a/src/lib/efl/interfaces/efl_content.eo
+++ b/src/lib/efl/interfaces/efl_content.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Content
+interface Efl.Content
 {
    [[Common interface for objects that have a (single) content.
 
diff --git a/src/lib/efl/interfaces/efl_file.eo b/src/lib/efl/interfaces/efl_file.eo
index 985b3fd687..ef45ce37c4 100644
--- a/src/lib/efl/interfaces/efl_file.eo
+++ b/src/lib/efl/interfaces/efl_file.eo
@@ -1,7 +1,7 @@
 import eina_types;
 import efl_gfx_types;
 
-mixin @beta Efl.File requires Efl.Object {
+mixin Efl.File requires Efl.Object {
    [[Efl file interface]]
    methods {
       @property mmap {
@@ -62,7 +62,7 @@ mixin @beta Efl.File requires Efl.Object {
               You must not modify the strings on the returned pointers.]]
          }
          values {
-            key: string; [[The group that the image belongs to, in case 
+            key: string; [[The group that the image belongs to, in case
                                             it's an EET(including Edje case) file. This can be used
                                             as a key inside evas image cache if this is a normal image
                                             file not eet file.]]
diff --git a/src/lib/efl/interfaces/efl_file_save.eo b/src/lib/efl/interfaces/efl_file_save.eo
index 43c8d4c8f6..715f3a215b 100644
--- a/src/lib/efl/interfaces/efl_file_save.eo
+++ b/src/lib/efl/interfaces/efl_file_save.eo
@@ -9,7 +9,7 @@ struct Efl.File_Save_Info
    encoding: string; [[The encoding to use when saving the file.]]
 }
 
-interface @beta Efl.File_Save {
+interface Efl.File_Save {
    [[Efl file saving interface]]
    methods {
       save @const {
diff --git a/src/lib/efl/interfaces/efl_gfx_color.eo b/src/lib/efl/interfaces/efl_gfx_color.eo
index a72cae23db..d3c41e1e31 100644
--- a/src/lib/efl/interfaces/efl_gfx_color.eo
+++ b/src/lib/efl/interfaces/efl_gfx_color.eo
@@ -1,6 +1,6 @@
 import efl_gfx_types;
 
-mixin @beta Efl.Gfx.Color
+mixin Efl.Gfx.Color
 {
    [[Efl Gfx Color mixin class]]
    data: null;
diff --git a/src/lib/efl/interfaces/efl_gfx_entity.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo
index 6f6c808e46..48caf1ecb3 100644
--- a/src/lib/efl/interfaces/efl_gfx_entity.eo
+++ b/src/lib/efl/interfaces/efl_gfx_entity.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-interface @beta Efl.Gfx.Entity {
+interface Efl.Gfx.Entity {
    [[Efl graphics interface]]
    eo_prefix: efl_gfx_entity;
    methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_hint.eo b/src/lib/efl/interfaces/efl_gfx_hint.eo
index 72ab35ebb3..c45f97633c 100644
--- a/src/lib/efl/interfaces/efl_gfx_hint.eo
+++ b/src/lib/efl/interfaces/efl_gfx_hint.eo
@@ -4,7 +4,7 @@ import efl_gfx_types;
 const Efl.Gfx.Hint_Expand: double = 1.0;
    [[Use with @Efl.Gfx.Hint.hint_weight.]]
 
-interface @beta Efl.Gfx.Hint
+interface Efl.Gfx.Hint
 {
    [[Efl graphics hint interface]]
    event_prefix: efl_gfx_entity;
diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo
index 3784358720..bfe6d1106c 100644
--- a/src/lib/efl/interfaces/efl_gfx_stack.eo
+++ b/src/lib/efl/interfaces/efl_gfx_stack.eo
@@ -1,7 +1,7 @@
 const Efl.Gfx.Stack_Layer_Min: short = -32768; [[bottom-most layer number]]
 const Efl.Gfx.Stack_Layer_Max: short = 32767;  [[top-most layer number]]
 
-interface @beta Efl.Gfx.Stack
+interface Efl.Gfx.Stack
 {
    [[Efl graphics stack interface]]
    event_prefix: efl_gfx_entity;
diff --git a/src/lib/efl/interfaces/efl_io_closer.eo b/src/lib/efl/interfaces/efl_io_closer.eo
index 42be3284ba..2ba4323085 100644
--- a/src/lib/efl/interfaces/efl_io_closer.eo
+++ b/src/lib/efl/interfaces/efl_io_closer.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-interface @beta Efl.Io.Closer {
+interface Efl.Io.Closer {
     [[Generic interface for objects that can close themselves.
 
       This interface allows external objects to transparently close an
diff --git a/src/lib/efl/interfaces/efl_io_reader.eo b/src/lib/efl/interfaces/efl_io_reader.eo
index ca5aea0b09..c173538a16 100644
--- a/src/lib/efl/interfaces/efl_io_reader.eo
+++ b/src/lib/efl/interfaces/efl_io_reader.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-interface @beta Efl.Io.Reader {
+interface Efl.Io.Reader {
     [[Generic interface for objects that can read data into a provided memory.
 
       This interface allows external objects to transparently monitor
diff --git a/src/lib/efl/interfaces/efl_io_writer.eo b/src/lib/efl/interfaces/efl_io_writer.eo
index 443f7b2c78..593c81e4fc 100644
--- a/src/lib/efl/interfaces/efl_io_writer.eo
+++ b/src/lib/efl/interfaces/efl_io_writer.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-interface @beta Efl.Io.Writer {
+interface Efl.Io.Writer {
     [[Generic interface for objects that can write data from a provided memory.
 
       This interface allows external objects to transparently write
diff --git a/src/lib/efl/interfaces/efl_part.eo b/src/lib/efl/interfaces/efl_part.eo
index 04bfd2bc4f..1f37e7e4ab 100644
--- a/src/lib/efl/interfaces/efl_part.eo
+++ b/src/lib/efl/interfaces/efl_part.eo
@@ -1,6 +1,6 @@
 import efl_object;
 
-interface @beta Efl.Part
+interface Efl.Part
 {
    [[Interface for objects supporting named parts.
 
diff --git a/src/lib/efl/interfaces/efl_screen.eo b/src/lib/efl/interfaces/efl_screen.eo
index 43cf8b318e..44f72f337a 100644
--- a/src/lib/efl/interfaces/efl_screen.eo
+++ b/src/lib/efl/interfaces/efl_screen.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-interface @beta Efl.Screen
+interface Efl.Screen
 {
    [[Efl screen interface]]
    methods {
diff --git a/src/lib/efl/interfaces/efl_text.eo b/src/lib/efl/interfaces/efl_text.eo
index 8d0851048a..13733b0d4e 100644
--- a/src/lib/efl/interfaces/efl_text.eo
+++ b/src/lib/efl/interfaces/efl_text.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Text
+interface Efl.Text
 {
    [[Efl text interface]]
    methods {
diff --git a/src/lib/elementary/efl_ui_focus_manager.eo b/src/lib/elementary/efl_ui_focus_manager.eo
index d3291342ff..e0e8ff1625 100644
--- a/src/lib/elementary/efl_ui_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_focus_manager.eo
@@ -28,7 +28,7 @@ struct Efl.Ui.Focus.Manager_Logical_End_Detail {
     element : Efl.Ui.Focus.Object; [[The last element of the logical chain in the @Efl.Ui.Focus.Manager]]
 }
 
-interface @beta Efl.Ui.Focus.Manager {
+interface Efl.Ui.Focus.Manager {
     [[Interface for managing focus objects
 
       This interface is built in order to support movement of the focus property in a set of widgets.
diff --git a/src/lib/elementary/efl_ui_focus_manager_window_root.eo b/src/lib/elementary/efl_ui_focus_manager_window_root.eo
index 18eed60eda..201e3bffc1 100644
--- a/src/lib/elementary/efl_ui_focus_manager_window_root.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_window_root.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Ui.Focus.Manager_Window_Root {
+interface Efl.Ui.Focus.Manager_Window_Root {
   [[ A interface to indicate the end of a focus chain.
 
      Focusmanagers are ensuring that if they give focus to something, that they are registered in the upper focus manager.
diff --git a/src/lib/elementary/efl_ui_focus_object.eo b/src/lib/elementary/efl_ui_focus_object.eo
index d80c0a2754..5a5fc1e590 100644
--- a/src/lib/elementary/efl_ui_focus_object.eo
+++ b/src/lib/elementary/efl_ui_focus_object.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-mixin @beta Efl.Ui.Focus.Object
+mixin Efl.Ui.Focus.Object
 {
     [[Functions of focusable objects.
 
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 35f239e8c1..40ab958928 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,6 +1,6 @@
 import efl_ui;
 
-class @beta Efl.Ui.Layout extends Efl.Ui.Layout_Base implements Efl.File
+class Efl.Ui.Layout extends Efl.Ui.Layout_Base implements Efl.File
 {
    [[Elementary layout class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_layout_base.eo b/src/lib/elementary/efl_ui_layout_base.eo
index 102a253688..14688f1af5 100644
--- a/src/lib/elementary/efl_ui_layout_base.eo
+++ b/src/lib/elementary/efl_ui_layout_base.eo
@@ -1,7 +1,7 @@
 import efl_ui;
 import efl_orientation;
 
-abstract @beta Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container,
+abstract Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container,
                      Efl.Ui.Factory_Bind,
                      Efl.Layout.Calc, Efl.Layout.Signal,
                      Efl.Layout.Group
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 789da8bea8..c06587a533 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -13,7 +13,7 @@ struct Efl.Ui.Widget_Focus_State {
    logical : bool; [[$true if this is registered as logical currently]]
 }
 
-abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Object,
+abstract Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Object,
                         Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
                         Efl.Ui.L10n,
                         Efl.Ui.Selection, Efl.Ui.Dnd,
diff --git a/src/lib/elementary/efl_ui_widget_focus_manager.eo b/src/lib/elementary/efl_ui_widget_focus_manager.eo
index dacc6e9c23..4ffc1353d0 100644
--- a/src/lib/elementary/efl_ui_widget_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_widget_focus_manager.eo
@@ -1,4 +1,4 @@
-mixin @beta Efl.Ui.Widget_Focus_Manager requires Efl.Ui.Widget extends Efl.Ui.Focus.Manager
+mixin Efl.Ui.Widget_Focus_Manager requires Efl.Ui.Widget extends Efl.Ui.Focus.Manager
 {
   methods {
       focus_manager_create @protected @pure_virtual {
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 4143e06629..1766aff987 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -133,7 +133,7 @@ enum Efl.Ui.Win_Move_Resize_Mode
    right = (1 << 4)    [[Start resizing window to the right]]
 }
 
-class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.Window,
+class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.Window,
                   Efl.Access.Component, Efl.Access.Widget.Action,
                   Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
                   Efl.Text, Efl.Config,
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index e7d12ff033..3dcee10c00 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Canvas.Group extends Efl.Canvas.Object
+class Efl.Canvas.Group extends Efl.Canvas.Object
 {
    [[A group object is a container for other canvas objects. Its children
      move along their parent and are often clipped with a common clipper.
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index b43f68bbdf..3f2bd0d2e7 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -6,7 +6,7 @@ struct Efl.Event_Animator_Tick {
    update_area: Eina.Rect; [[Area of the canvas that will be pushed to screen.]]
 }
 
-abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack,
+abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack,
                             Efl.Input.Interface, Efl.Gfx.Hint,
                             Efl.Gfx.Mapping, Efl.Ui.I18n, Efl.Canvas.Pointer
 {
@@ -195,14 +195,16 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
             focus: bool; [[$true if focused by at least one seat or $false otherwise.]]
          }
       }
-      seat_focus_check {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      seat_focus_check @beta {
          [[ Check if this object is focused by a given seat @since 1.19 ]]
          params {
             @in seat: Efl.Input.Device; [[The seat to check if the object is focused. Use $null for the default seat.]]
          }
          return: bool; [[$true if focused or $false otherwise.]]
       }
-      seat_focus_add {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      seat_focus_add @beta  {
          [[ Add a seat to the focus list.
 
            Evas allows the Efl.Canvas.Object to be focused by multiple seats
@@ -218,7 +220,8 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
          }
          return: bool; [[$true if the focus has been set or $false otherwise.]]
       }
-      seat_focus_del {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      seat_focus_del @beta {
          [[ Remove a seat from the focus list.
 
             @since 1.19
diff --git a/src/lib/evas/canvas/efl_gfx_mapping.eo b/src/lib/evas/canvas/efl_gfx_mapping.eo
index 11a4ad273f..0ca0d33a81 100644
--- a/src/lib/evas/canvas/efl_gfx_mapping.eo
+++ b/src/lib/evas/canvas/efl_gfx_mapping.eo
@@ -1,4 +1,4 @@
-mixin @beta Efl.Gfx.Mapping requires Efl.Object
+mixin Efl.Gfx.Mapping requires Efl.Object
 {
    [[Texture UV mapping for all objects (rotation, perspective, 3d, ...).
 
diff --git a/src/lib/evas/canvas/efl_input_focus.eo b/src/lib/evas/canvas/efl_input_focus.eo
index 2adb226f71..d15685a339 100644
--- a/src/lib/evas/canvas/efl_input_focus.eo
+++ b/src/lib/evas/canvas/efl_input_focus.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Input.Focus extends Efl.Object implements Efl.Input.Event
+class Efl.Input.Focus extends Efl.Object implements Efl.Input.Event
 {
    [[Represents a focus event. @since 1.19]]
    methods {
diff --git a/src/lib/evas/canvas/efl_input_state.eo b/src/lib/evas/canvas/efl_input_state.eo
index 51b8155082..6aa88e37e0 100644
--- a/src/lib/evas/canvas/efl_input_state.eo
+++ b/src/lib/evas/canvas/efl_input_state.eo
@@ -1,11 +1,12 @@
 import efl_input_types;
 
-interface @beta Efl.Input.State
+interface Efl.Input.State
 {
    [[Efl input state interface]]
    eo_prefix: efl_input;
    methods {
-      @property modifier_enabled {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      @property modifier_enabled @beta {
          [[Indicates whether a key modifier is on, such as Ctrl, Shift, ...]]
          get {}
          keys {
@@ -16,7 +17,8 @@ interface @beta Efl.Input.State
             is_set: bool; [[$true if the key modifier is pressed.]]
          }
       }
-      @property lock_enabled {
+      /* FIXME Efl.Input.Device is not stable yet*/
+      @property lock_enabled @beta {
          [[Indicates whether a key lock is on, such as NumLock, CapsLock, ...]]
          get {}
          keys {