Mark BETA classes individually

Summary: Instead of surrounding all the #include "*.eo.h" lines in Efl.h with #ifdef EFL_BETA_API_SUPPORT, include these files unconditionally, but mark all classes as @beta in the eo files. This will allow taking them out of beta one by one as we deem them stable enough. Otherwise, the current procedure involves moving the #include line out of the ifdef block, which is cumbersome and messes include order. Depends on D7950 Fixes T7692 Test Plan: Nothing changes Reviewers: zmike, bu5hm4n, cedric Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7692 Differential Revision: https://phab.enlightenment.org/D7951
author: Xavi Artigas <xavierartigas@yahoo.es> 2019-02-14 17:37:02 +0100
committer: Xavi Artigas <xavierartigas@yahoo.es> 2019-02-14 17:46:50 +0100
commit: 333330a6e51225b3ef8d725c4a930fc8c02fac18 (patch)
tree: d36409196ea62ee5d263d4666bf36b8a93339503 /src
parent: 751ff0ed06be9cd91fa230e56eee7ae151d52cca (diff)
393 files changed, 394 insertions, 394 deletions
diff --git a/src/lib/ecore/efl_accelerate_interpolator.eo b/src/lib/ecore/efl_accelerate_interpolator.eo
index 793f8b6212..9af36694af 100644
--- a/src/lib/ecore/efl_accelerate_interpolator.eo
+++ b/src/lib/ecore/efl_accelerate_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Accelerate_Interpolator extends Efl.Object implements Efl.Interpolator
+class @beta Efl.Accelerate_Interpolator extends Efl.Object implements Efl.Interpolator
 {
   [[Efl accelerate interpolator class
diff --git a/src/lib/ecore/efl_app.eo b/src/lib/ecore/efl_app.eo
index e046428626..61d0065a42 100644
--- a/src/lib/ecore/efl_app.eo
+++ b/src/lib/ecore/efl_app.eo
@@ -1,6 +1,6 @@
 import efl_types;
-class Efl.App extends Efl.Loop implements Efl.Core.Command_Line
+class @beta Efl.App extends Efl.Loop implements Efl.Core.Command_Line
 {
   [[ ]]
   data: null;
diff --git a/src/lib/ecore/efl_appthread.eo b/src/lib/ecore/efl_appthread.eo
index 82a9d77ace..076a1506ee 100644
--- a/src/lib/ecore/efl_appthread.eo
+++ b/src/lib/ecore/efl_appthread.eo
@@ -1,4 +1,4 @@
-class Efl.Appthread extends Efl.Loop implements Efl.ThreadIO, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Core.Command_Line
+class @beta Efl.Appthread extends Efl.Loop implements Efl.ThreadIO, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Core.Command_Line
 {
   [[ ]]
   methods {
diff --git a/src/lib/ecore/efl_boolean_model.eo b/src/lib/ecore/efl_boolean_model.eo
index ab6c2e80bb..19f8f02935 100644
--- a/src/lib/ecore/efl_boolean_model.eo
+++ b/src/lib/ecore/efl_boolean_model.eo
@@ -1,4 +1,4 @@
-class Efl.Boolean_Model extends Efl.Composite_Model
+class @beta Efl.Boolean_Model extends Efl.Composite_Model
 {
   [[Efl boolean model class]]
   methods {
diff --git a/src/lib/ecore/efl_bounce_interpolator.eo b/src/lib/ecore/efl_bounce_interpolator.eo
index 85dc219ec2..d6b1147d17 100644
--- a/src/lib/ecore/efl_bounce_interpolator.eo
+++ b/src/lib/ecore/efl_bounce_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Bounce_Interpolator extends Efl.Object implements Efl.Interpolator
+class @beta Efl.Bounce_Interpolator extends Efl.Object implements Efl.Interpolator
 {
   [[Efl bounce interpolator class]]
   data: Efl_Bounce_Interpolator_Data;
diff --git a/src/lib/ecore/efl_composite_model.eo b/src/lib/ecore/efl_composite_model.eo
index b1b3cc7ef5..18a60bcd49 100644
--- a/src/lib/ecore/efl_composite_model.eo
+++ b/src/lib/ecore/efl_composite_model.eo
@@ -1,4 +1,4 @@
-class Efl.Composite_Model extends Efl.Loop_Model implements Efl.Ui.View
+class @beta Efl.Composite_Model extends Efl.Loop_Model implements Efl.Ui.View
 {
   [[Efl model for all composite class which provide a unified API to set source of data.
diff --git a/src/lib/ecore/efl_container_model.eo b/src/lib/ecore/efl_container_model.eo
index 10c6515c51..9ee441587f 100644
--- a/src/lib/ecore/efl_container_model.eo
+++ b/src/lib/ecore/efl_container_model.eo
@@ -1,6 +1,6 @@
 import eina_types;
-class Efl.Container_Model extends Efl.Loop_Model
+class @beta Efl.Container_Model extends Efl.Loop_Model
 {
   [[
     Class used to create data models from Eina containers.
diff --git a/src/lib/ecore/efl_container_model_item.eo b/src/lib/ecore/efl_container_model_item.eo
index 779806ebf5..7fe818600e 100644
--- a/src/lib/ecore/efl_container_model_item.eo
+++ b/src/lib/ecore/efl_container_model_item.eo
@@ -1,4 +1,4 @@
-class Efl.Container_Model_Item extends Efl.Object implements Efl.Model
+class @beta Efl.Container_Model_Item extends Efl.Object implements Efl.Model
 {
   [[
     Used as a child of @Efl.Container_Model.
diff --git a/src/lib/ecore/efl_core_command_line.eo b/src/lib/ecore/efl_core_command_line.eo
index 1cbb020856..436720d9bd 100644
--- a/src/lib/ecore/efl_core_command_line.eo
+++ b/src/lib/ecore/efl_core_command_line.eo
@@ -1,4 +1,4 @@
-mixin Efl.Core.Command_Line {
+mixin @beta Efl.Core.Command_Line {
  [[A mixin that implements standard functions for command lines.
    This object parses the command line that gets passed, later the object can be accessed via accessor or the string directly.
diff --git a/src/lib/ecore/efl_core_env.eo b/src/lib/ecore/efl_core_env.eo
index 86da8c14ff..5aaaa3a263 100644
--- a/src/lib/ecore/efl_core_env.eo
+++ b/src/lib/ecore/efl_core_env.eo
@@ -1,4 +1,4 @@
-class Efl.Core.Env extends Efl.Object implements Efl.Duplicate {
+class @beta Efl.Core.Env extends Efl.Object implements Efl.Duplicate {
   [[This object can maintain a set of key value pairs
     A object of this type alone does not apply the object to the system.
diff --git a/src/lib/ecore/efl_core_proc_env.eo b/src/lib/ecore/efl_core_proc_env.eo
index 23c2c67d75..07840548dd 100644
--- a/src/lib/ecore/efl_core_proc_env.eo
+++ b/src/lib/ecore/efl_core_proc_env.eo
@@ -1,4 +1,4 @@
-class Efl.Core.Proc_Env extends Efl.Core.Env
+class @beta Efl.Core.Proc_Env extends Efl.Core.Env
 {
   eo_prefix : efl_env;
   methods {
diff --git a/src/lib/ecore/efl_cubic_bezier_interpolator.eo b/src/lib/ecore/efl_cubic_bezier_interpolator.eo
index a4dd964bb6..c6dd1449d2 100644
--- a/src/lib/ecore/efl_cubic_bezier_interpolator.eo
+++ b/src/lib/ecore/efl_cubic_bezier_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Cubic_Bezier_Interpolator extends Efl.Object implements Efl.Interpolator
+class @beta Efl.Cubic_Bezier_Interpolator extends Efl.Object implements Efl.Interpolator
 {
   [[Efl cubic_bezier interpolator class]]
   data: Efl_Cubic_Bezier_Interpolator_Data;
diff --git a/src/lib/ecore/efl_decelerate_interpolator.eo b/src/lib/ecore/efl_decelerate_interpolator.eo
index 3e376f8976..802d409b2d 100644
--- a/src/lib/ecore/efl_decelerate_interpolator.eo
+++ b/src/lib/ecore/efl_decelerate_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Decelerate_Interpolator extends Efl.Object implements Efl.Interpolator
+class @beta Efl.Decelerate_Interpolator extends Efl.Object implements Efl.Interpolator
 {
   [[Efl decelerate interpolator class
diff --git a/src/lib/ecore/efl_divisor_interpolator.eo b/src/lib/ecore/efl_divisor_interpolator.eo
index f9baae503c..848c44bf6e 100644
--- a/src/lib/ecore/efl_divisor_interpolator.eo
+++ b/src/lib/ecore/efl_divisor_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Divisor_Interpolator extends Efl.Object implements Efl.Interpolator
+class @beta Efl.Divisor_Interpolator extends Efl.Object implements Efl.Interpolator
 {
   [[Efl divisor interpolator class]]
   data: Efl_Divisor_Interpolator_Data;
diff --git a/src/lib/ecore/efl_exe.eo b/src/lib/ecore/efl_exe.eo
index b7f97da7dc..0d3c29e7f2 100644
--- a/src/lib/ecore/efl_exe.eo
+++ b/src/lib/ecore/efl_exe.eo
@@ -19,7 +19,7 @@ enum Efl.Exe_Flags {
   hide_io          = 4
 }
-class Efl.Exe extends Efl.Task implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer,Efl.Core.Command_Line
+class @beta Efl.Exe extends Efl.Task implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer,Efl.Core.Command_Line
 {
   [[ ]]
   methods {
diff --git a/src/lib/ecore/efl_generic_model.eo b/src/lib/ecore/efl_generic_model.eo
index 4509027a17..bb67dafbc5 100644
--- a/src/lib/ecore/efl_generic_model.eo
+++ b/src/lib/ecore/efl_generic_model.eo
@@ -1,4 +1,4 @@
-class Efl.Generic_Model extends Efl.Loop_Model
+class @beta Efl.Generic_Model extends Efl.Loop_Model
 {
   [[
     Generic model that allows any property to be manually set.
diff --git a/src/lib/ecore/efl_io_buffered_stream.eo b/src/lib/ecore/efl_io_buffered_stream.eo
index 8e22b828af..c61248b30d 100644
--- a/src/lib/ecore/efl_io_buffered_stream.eo
+++ b/src/lib/ecore/efl_io_buffered_stream.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Buffered_Stream extends Efl.Loop_Consumer implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
+class @beta Efl.Io.Buffered_Stream extends Efl.Loop_Consumer implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
    [[A wrapper object offering easy to use buffered streams over existing I/O class.
      The buffered stream encapsulates an actual @Efl.Io.Reader or
diff --git a/src/lib/ecore/efl_io_closer_fd.eo b/src/lib/ecore/efl_io_closer_fd.eo
index e601f582ad..c927cb5b2d 100644
--- a/src/lib/ecore/efl_io_closer_fd.eo
+++ b/src/lib/ecore/efl_io_closer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Closer_Fd requires Efl.Object extends Efl.Io.Closer {
+mixin @beta Efl.Io.Closer_Fd requires Efl.Object extends Efl.Io.Closer {
    [[Close fd using close(2).
      @since 1.19
diff --git a/src/lib/ecore/efl_io_copier.eo b/src/lib/ecore/efl_io_copier.eo
index 2565fba66f..ba4412f359 100644
--- a/src/lib/ecore/efl_io_copier.eo
+++ b/src/lib/ecore/efl_io_copier.eo
@@ -1,6 +1,6 @@
 import eina_types;
-class Efl.Io.Copier extends Efl.Loop_Consumer implements Efl.Io.Closer {
+class @beta Efl.Io.Copier extends Efl.Loop_Consumer implements Efl.Io.Closer {
    [[Copy from an @Efl.Io.Reader source to @Efl.Io.Writer destination.
      During usage it will keep reference to @.source and
diff --git a/src/lib/ecore/efl_io_file.eo b/src/lib/ecore/efl_io_file.eo
index c0b48c381d..c663b723c5 100644
--- a/src/lib/ecore/efl_io_file.eo
+++ b/src/lib/ecore/efl_io_file.eo
@@ -1,4 +1,4 @@
-class Efl.Io.File extends Efl.Loop_Fd implements Efl.File, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Io.Sizer_Fd, Efl.Io.Positioner_Fd {
+class @beta Efl.Io.File extends Efl.Loop_Fd implements Efl.File, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Io.Sizer_Fd, Efl.Io.Positioner_Fd {
    [[File access (open, close, read, write, lseek, ftruncate)
      @Efl.Io.Closer.close_on_exec and
diff --git a/src/lib/ecore/efl_io_positioner_fd.eo b/src/lib/ecore/efl_io_positioner_fd.eo
index ed9cd22f15..f5169e10be 100644
--- a/src/lib/ecore/efl_io_positioner_fd.eo
+++ b/src/lib/ecore/efl_io_positioner_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Positioner_Fd extends Efl.Io.Positioner {
+mixin @beta Efl.Io.Positioner_Fd extends Efl.Io.Positioner {
    [[Positions fd using lseek(2).
      @since 1.19
diff --git a/src/lib/ecore/efl_io_reader_fd.eo b/src/lib/ecore/efl_io_reader_fd.eo
index 30b95b31ef..9c6fc83bae 100644
--- a/src/lib/ecore/efl_io_reader_fd.eo
+++ b/src/lib/ecore/efl_io_reader_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Reader_Fd extends Efl.Io.Reader {
+mixin @beta Efl.Io.Reader_Fd extends Efl.Io.Reader {
    [[Reads fd using read(2).
      @since 1.19
diff --git a/src/lib/ecore/efl_io_sizer_fd.eo b/src/lib/ecore/efl_io_sizer_fd.eo
index 9320324447..6eb12ad8b7 100644
--- a/src/lib/ecore/efl_io_sizer_fd.eo
+++ b/src/lib/ecore/efl_io_sizer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Sizer_Fd extends Efl.Io.Sizer {
+mixin @beta Efl.Io.Sizer_Fd extends Efl.Io.Sizer {
    [[Resizes fd usign ftruncate(2).
      @since 1.19
diff --git a/src/lib/ecore/efl_io_stderr.eo b/src/lib/ecore/efl_io_stderr.eo
index c8ecff3dd4..f183e371e2 100644
--- a/src/lib/ecore/efl_io_stderr.eo
+++ b/src/lib/ecore/efl_io_stderr.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Stderr extends Efl.Loop_Fd implements Efl.Io.Writer_Fd {
+class @beta Efl.Io.Stderr extends Efl.Loop_Fd implements Efl.Io.Writer_Fd {
    [[Application's standard error (stderr).
      @since 1.19
diff --git a/src/lib/ecore/efl_io_stdin.eo b/src/lib/ecore/efl_io_stdin.eo
index 1d4b914e60..75645d2461 100644
--- a/src/lib/ecore/efl_io_stdin.eo
+++ b/src/lib/ecore/efl_io_stdin.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Stdin extends Efl.Loop_Fd implements Efl.Io.Reader_Fd {
+class @beta Efl.Io.Stdin extends Efl.Loop_Fd implements Efl.Io.Reader_Fd {
    [[Application's standard input (stdin).
      @since 1.19
diff --git a/src/lib/ecore/efl_io_stdout.eo b/src/lib/ecore/efl_io_stdout.eo
index 1bc7099397..66497b1211 100644
--- a/src/lib/ecore/efl_io_stdout.eo
+++ b/src/lib/ecore/efl_io_stdout.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Stdout extends Efl.Loop_Fd implements Efl.Io.Writer_Fd {
+class @beta Efl.Io.Stdout extends Efl.Loop_Fd implements Efl.Io.Writer_Fd {
    [[Application's standard output (stdout).
      @since 1.19
diff --git a/src/lib/ecore/efl_io_writer_fd.eo b/src/lib/ecore/efl_io_writer_fd.eo
index b43b8b1d0d..70fe627725 100644
--- a/src/lib/ecore/efl_io_writer_fd.eo
+++ b/src/lib/ecore/efl_io_writer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Writer_Fd extends Efl.Io.Writer {
+mixin @beta Efl.Io.Writer_Fd extends Efl.Io.Writer {
    [[Writes fd using write(2).
      @since 1.19
diff --git a/src/lib/ecore/efl_linear_interpolator.eo b/src/lib/ecore/efl_linear_interpolator.eo
index 748a3be384..e22e980552 100644
--- a/src/lib/ecore/efl_linear_interpolator.eo
+++ b/src/lib/ecore/efl_linear_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Linear_Interpolator extends Efl.Object implements Efl.Interpolator
+class @beta Efl.Linear_Interpolator extends Efl.Object implements Efl.Interpolator
 {
   [[Efl linear interpolator class]]
   data: Efl_Linear_Interpolator_Data;
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index 7480eee867..737c641cf4 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -4,7 +4,7 @@ struct Efl.Loop_Arguments {
   initialization: bool; [[Set to $true when the program should initialize its internal state. This happen once per process instance.]]
 }
-class Efl.Loop extends Efl.Task
+class @beta Efl.Loop extends Efl.Task
 {
   [[The Efl Main Loop
diff --git a/src/lib/ecore/efl_loop_consumer.eo b/src/lib/ecore/efl_loop_consumer.eo
index f03a4d6d86..2f9122075c 100644
--- a/src/lib/ecore/efl_loop_consumer.eo
+++ b/src/lib/ecore/efl_loop_consumer.eo
@@ -1,4 +1,4 @@
-abstract Efl.Loop_Consumer extends Efl.Object
+abstract @beta Efl.Loop_Consumer extends Efl.Object
 {
   [[An @Efl.Loop_Consumer is a class which requires one of the parents to provide
     an @Efl.Loop interface when performing @Efl.Object.provider_find. It will enforce this by
diff --git a/src/lib/ecore/efl_loop_fd.eo b/src/lib/ecore/efl_loop_fd.eo
index 5ced4e709f..7c8faa1b39 100644
--- a/src/lib/ecore/efl_loop_fd.eo
+++ b/src/lib/ecore/efl_loop_fd.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Fd extends Efl.Loop_Consumer
+class @beta Efl.Loop_Fd extends Efl.Loop_Consumer
 {
   [[Fds are objects that watch the activity on a given
     file descriptor. This file descriptor can be a
diff --git a/src/lib/ecore/efl_loop_handler.eo b/src/lib/ecore/efl_loop_handler.eo
index aab8443132..148759d0c0 100644
--- a/src/lib/ecore/efl_loop_handler.eo
+++ b/src/lib/ecore/efl_loop_handler.eo
@@ -7,7 +7,7 @@ enum Efl.Loop_Handler_Flags {
   error = 4, [[ Error channel input is desired ]]
 }
-class Efl.Loop_Handler extends Efl.Object
+class @beta Efl.Loop_Handler extends Efl.Object
 {
   [[ An object that describes an low-level source of I/O to listen to
   for available data to be read or written, depending on the OS and data
diff --git a/src/lib/ecore/efl_loop_message.eo b/src/lib/ecore/efl_loop_message.eo
index ef5ec0ce2a..5a1877c424 100644
--- a/src/lib/ecore/efl_loop_message.eo
+++ b/src/lib/ecore/efl_loop_message.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Message extends Efl.Object
+class @beta Efl.Loop_Message extends Efl.Object
 {
   [[Base message payload object class. Inherit this and extend for
     specific message types.]]
diff --git a/src/lib/ecore/efl_loop_message_future.eo b/src/lib/ecore/efl_loop_message_future.eo
index 047c1c4b6a..f1c508d18f 100644
--- a/src/lib/ecore/efl_loop_message_future.eo
+++ b/src/lib/ecore/efl_loop_message_future.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Message_Future extends Efl.Loop_Message
+class @beta Efl.Loop_Message_Future extends Efl.Loop_Message
 {
   [[ Used internally for futures on the loop ]]
   methods {
diff --git a/src/lib/ecore/efl_loop_message_future_handler.eo b/src/lib/ecore/efl_loop_message_future_handler.eo
index a676555aca..34e0a5982e 100644
--- a/src/lib/ecore/efl_loop_message_future_handler.eo
+++ b/src/lib/ecore/efl_loop_message_future_handler.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Message_Future_Handler extends Efl.Loop_Message_Handler
+class @beta Efl.Loop_Message_Future_Handler extends Efl.Loop_Message_Handler
 {
   [[ Internal use for future on an efl loop - replacing legacy ecore events ]]
   methods {
diff --git a/src/lib/ecore/efl_loop_message_handler.eo b/src/lib/ecore/efl_loop_message_handler.eo
index 291b0bc6af..3fb60a8168 100644
--- a/src/lib/ecore/efl_loop_message_handler.eo
+++ b/src/lib/ecore/efl_loop_message_handler.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Message_Handler extends Efl.Object
+class @beta Efl.Loop_Message_Handler extends Efl.Object
 {
   [[Message handlers represent a single message type on the Efl.Loop
     parent object. These message handlers can be used to listen for
diff --git a/src/lib/ecore/efl_loop_model.eo b/src/lib/ecore/efl_loop_model.eo
index cf11e56242..72e094f221 100644
--- a/src/lib/ecore/efl_loop_model.eo
+++ b/src/lib/ecore/efl_loop_model.eo
@@ -1,4 +1,4 @@
-abstract Efl.Loop_Model extends Efl.Loop_Consumer implements Efl.Model
+abstract @beta Efl.Loop_Model extends Efl.Loop_Consumer implements Efl.Model
 {
   data: null;
   implements {
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index b5b025e7ec..218223a1a3 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Timer extends Efl.Loop_Consumer
+class @beta Efl.Loop_Timer extends Efl.Loop_Consumer
 {
   [[Timers are objects that will call a given callback at some point
     in the future and repeat that tick at a given interval.
diff --git a/src/lib/ecore/efl_select_model.eo b/src/lib/ecore/efl_select_model.eo
index 3300abcb5e..ed7821fa68 100644
--- a/src/lib/ecore/efl_select_model.eo
+++ b/src/lib/ecore/efl_select_model.eo
@@ -1,4 +1,4 @@
-class Efl.Select_Model extends Efl.Boolean_Model
+class @beta Efl.Select_Model extends Efl.Boolean_Model
 {
   [[Efl select model class]]
   implements {
diff --git a/src/lib/ecore/efl_sinusoidal_interpolator.eo b/src/lib/ecore/efl_sinusoidal_interpolator.eo
index 2f644ff354..e0701aa5d3 100644
--- a/src/lib/ecore/efl_sinusoidal_interpolator.eo
+++ b/src/lib/ecore/efl_sinusoidal_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Sinusoidal_Interpolator extends Efl.Object implements Efl.Interpolator
+class @beta Efl.Sinusoidal_Interpolator extends Efl.Object implements Efl.Interpolator
 {
   [[Efl sinusoidal interpolator class
diff --git a/src/lib/ecore/efl_spring_interpolator.eo b/src/lib/ecore/efl_spring_interpolator.eo
index 14593425a4..5549046ff4 100644
--- a/src/lib/ecore/efl_spring_interpolator.eo
+++ b/src/lib/ecore/efl_spring_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Spring_Interpolator extends Efl.Object implements Efl.Interpolator
+class @beta Efl.Spring_Interpolator extends Efl.Object implements Efl.Interpolator
 {
   [[Efl spring interpolator class]]
   data: Efl_Spring_Interpolator_Data;
diff --git a/src/lib/ecore/efl_task.eo b/src/lib/ecore/efl_task.eo
index ddab5e6826..f3c1ac9b4f 100644
--- a/src/lib/ecore/efl_task.eo
+++ b/src/lib/ecore/efl_task.eo
@@ -15,7 +15,7 @@ enum Efl.Task_Flags {
   no_exit_code_error = 4,
 }
-abstract Efl.Task extends Efl.Object
+abstract @beta Efl.Task extends Efl.Object
 {
   [[ ]]
   methods {
diff --git a/src/lib/ecore/efl_thread.eo b/src/lib/ecore/efl_thread.eo
index 02bf2f15df..b935077d8e 100644
--- a/src/lib/ecore/efl_thread.eo
+++ b/src/lib/ecore/efl_thread.eo
@@ -1,4 +1,4 @@
-class Efl.Thread extends Efl.Task implements Efl.ThreadIO, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Core.Command_Line
+class @beta Efl.Thread extends Efl.Task implements Efl.ThreadIO, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Core.Command_Line
 {
   methods {
   }
diff --git a/src/lib/ecore/efl_threadio.eo b/src/lib/ecore/efl_threadio.eo
index 1d3af45cdc..25b1ba29a7 100644
--- a/src/lib/ecore/efl_threadio.eo
+++ b/src/lib/ecore/efl_threadio.eo
@@ -15,7 +15,7 @@ function EFlThreadIOCallSync {
   return: void_ptr; [[ ]]
 };
-mixin Efl.ThreadIO
+mixin @beta Efl.ThreadIO
 {
   [[ ]]
   methods {
diff --git a/src/lib/ecore/efl_view_model.eo b/src/lib/ecore/efl_view_model.eo
index 349a5a4e77..432bfe8499 100644
--- a/src/lib/ecore/efl_view_model.eo
+++ b/src/lib/ecore/efl_view_model.eo
@@ -17,7 +17,7 @@ function EflViewModelPropertySet {
   return: future<any_value_ptr>; [[The value that was finally set.]]
 };
-class Efl.View_Model extends Efl.Composite_Model
+class @beta Efl.View_Model extends Efl.Composite_Model
 {
   [[Efl model providing helpers for custom properties used when linking a model to a view and you need to generate/adapt values for display.
diff --git a/src/lib/ecore_con/efl_net_control_access_point.eo b/src/lib/ecore_con/efl_net_control_access_point.eo
index 53903032f9..7d3d9364ac 100644
--- a/src/lib/ecore_con/efl_net_control_access_point.eo
+++ b/src/lib/ecore_con/efl_net_control_access_point.eo
@@ -74,7 +74,7 @@ enum Efl.Net.Control.Access_Point_Proxy_Method {
    unset, [[Only to be used with @Efl.Net.Control.Access_Point.configuration_proxy.]]
 }
-class Efl.Net.Control.Access_Point extends Efl.Loop_Consumer {
+class @beta Efl.Net.Control.Access_Point extends Efl.Loop_Consumer {
    [[An access point for network connectivity.
      The @Efl.Net.Control.Manager is composed of multiple technologies, each
diff --git a/src/lib/ecore_con/efl_net_control_manager.eo b/src/lib/ecore_con/efl_net_control_manager.eo
index 5afdeb465c..448bdba362 100644
--- a/src/lib/ecore_con/efl_net_control_manager.eo
+++ b/src/lib/ecore_con/efl_net_control_manager.eo
@@ -65,7 +65,7 @@ struct Efl.Net.Control.Agent_Browser_Url {
    url: string; [[The URL to point the browser at.]]
 }
-class Efl.Net.Control.Manager extends Efl.Loop_Consumer {
+class @beta Efl.Net.Control.Manager extends Efl.Loop_Consumer {
    [[Controls network connectivity.
      This class and its child objects are only useful to implement
diff --git a/src/lib/ecore_con/efl_net_control_technology.eo b/src/lib/ecore_con/efl_net_control_technology.eo
index ccc2cf6e8f..947aa11ac3 100644
--- a/src/lib/ecore_con/efl_net_control_technology.eo
+++ b/src/lib/ecore_con/efl_net_control_technology.eo
@@ -15,7 +15,7 @@ enum Efl.Net.Control.Technology_Type {
    p2p, [[Type: Peer-2-Peer]]
 }
-class Efl.Net.Control.Technology extends Efl.Loop_Consumer {
+class @beta Efl.Net.Control.Technology extends Efl.Loop_Consumer {
    [[A technology that allows control of network access points.
      The @Efl.Net.Control.Manager is composed of multiple technologies, each
diff --git a/src/lib/ecore_con/efl_net_dialer.eo b/src/lib/ecore_con/efl_net_dialer.eo
index 1b7b2e9c16..7abba99b1a 100644
--- a/src/lib/ecore_con/efl_net_dialer.eo
+++ b/src/lib/ecore_con/efl_net_dialer.eo
@@ -2,7 +2,7 @@ var Efl.Net.Dialer_Error.COULDNT_CONNECT: Eina.Error; [[The dialer could not con
 var Efl.Net.Dialer_Error.COULDNT_RESOLVE_PROXY: Eina.Error; [[The dialer could not resolve the given proxy server]]
 var Efl.Net.Dialer_Error.PROXY_AUTHENTICATION_FAILED: Eina.Error; [[The dialer failed to authenticate against the proxy server]]
-interface Efl.Net.Dialer extends Efl.Net.Socket {
+interface @beta Efl.Net.Dialer extends Efl.Net.Socket {
    [[Creates a client socket to reach a remote peer.
      The connection process starts when @.dial is executed. This
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo b/src/lib/ecore_con/efl_net_dialer_http.eo
index 18c0c35e0b..032c5c7bbb 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.eo
+++ b/src/lib/ecore_con/efl_net_dialer_http.eo
@@ -7,7 +7,7 @@ enum Efl.Net.Dialer_Http_Primary_Mode {
    upload, [[HTTP upload mode]]
 }
-class Efl.Net.Dialer_Http extends Efl.Loop_Consumer implements Efl.Net.Dialer, Efl.Io.Sizer {
+class @beta Efl.Net.Dialer_Http extends Efl.Loop_Consumer implements Efl.Net.Dialer, Efl.Io.Sizer {
    [[HTTP Dialer (Client).
      The effective URL in use, if @.allow_redirects is $true will be
diff --git a/src/lib/ecore_con/efl_net_dialer_simple.eo b/src/lib/ecore_con/efl_net_dialer_simple.eo
index 0a5aa941b2..e28c929dd1 100644
--- a/src/lib/ecore_con/efl_net_dialer_simple.eo
+++ b/src/lib/ecore_con/efl_net_dialer_simple.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Simple extends Efl.Net.Socket_Simple implements Efl.Net.Dialer {
+class @beta Efl.Net.Dialer_Simple extends Efl.Net.Socket_Simple implements Efl.Net.Dialer {
    [[Connects to a remote server offering an easy to use, buffered I/O.
      The simple dialer is based on @Efl.Net.Socket_Simple, which
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.eo b/src/lib/ecore_con/efl_net_dialer_ssl.eo
index 832361bbea..a80c063aec 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.eo
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Ssl extends Efl.Net.Socket_Ssl implements Efl.Net.Dialer {
+class @beta Efl.Net.Dialer_Ssl extends Efl.Net.Socket_Ssl implements Efl.Net.Dialer {
    [[Connects to a remote SSL server using TCP.
      This creates an internal @Efl.Net.Dialer_Tcp and once connected
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.eo b/src/lib/ecore_con/efl_net_dialer_tcp.eo
index 75c7deeefc..fdbf7d3797 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.eo
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Tcp extends Efl.Net.Socket_Tcp implements Efl.Net.Dialer {
+class @beta Efl.Net.Dialer_Tcp extends Efl.Net.Socket_Tcp implements Efl.Net.Dialer {
    [[Connects to a remote TCP server.
      If the proxy is NULL (default), then the system proxy will be
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.eo b/src/lib/ecore_con/efl_net_dialer_udp.eo
index af7aeec1bd..709031a71e 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.eo
+++ b/src/lib/ecore_con/efl_net_dialer_udp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Udp extends Efl.Net.Socket_Udp implements Efl.Net.Dialer {
+class @beta Efl.Net.Dialer_Udp extends Efl.Net.Socket_Udp implements Efl.Net.Dialer {
    [[Connects to a remote UDP server.
      UDP proxies are not supported, not even using SOCKSv5.
diff --git a/src/lib/ecore_con/efl_net_dialer_unix.eo b/src/lib/ecore_con/efl_net_dialer_unix.eo
index f2454e5db2..a74f34d784 100644
--- a/src/lib/ecore_con/efl_net_dialer_unix.eo
+++ b/src/lib/ecore_con/efl_net_dialer_unix.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Unix extends Efl.Net.Socket_Unix implements Efl.Net.Dialer {
+class @beta Efl.Net.Dialer_Unix extends Efl.Net.Socket_Unix implements Efl.Net.Dialer {
    [[Connects to a local AF_UNIX server.
      The dial address is a file system path (portable) or
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo b/src/lib/ecore_con/efl_net_dialer_websocket.eo
index dfd89a1cf8..d400b02261 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.eo
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo
@@ -47,7 +47,7 @@ struct Efl.Net.Dialer_Websocket_Closed_Reason {
    message: string; [[Textual closing reason message]]
 }
-class Efl.Net.Dialer_Websocket extends Efl.Loop_Consumer implements Efl.Net.Dialer {
+class @beta Efl.Net.Dialer_Websocket extends Efl.Loop_Consumer implements Efl.Net.Dialer {
    [[WebSocket Dialer (Client).
      The WebSocket Protocol (https://tools.ietf.org/html/rfc6455) is
diff --git a/src/lib/ecore_con/efl_net_dialer_windows.eo b/src/lib/ecore_con/efl_net_dialer_windows.eo
index 202b636183..9bce9c35ac 100644
--- a/src/lib/ecore_con/efl_net_dialer_windows.eo
+++ b/src/lib/ecore_con/efl_net_dialer_windows.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Windows extends Efl.Net.Socket_Windows implements Efl.Net.Dialer {
+class @beta Efl.Net.Dialer_Windows extends Efl.Net.Socket_Windows implements Efl.Net.Dialer {
    [[Connects to a Windows NamedPipe server.
      The dial address will have "\\\\.\\pipe\\" prepended as required by
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo b/src/lib/ecore_con/efl_net_ip_address.eo
index 3d1263134f..9b00a66ca3 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -12,7 +12,7 @@ struct Efl.Net.Ip_Address_Resolve_Results {
    results: array<Efl.Net.Ip_Address>; [[The resolved objects. Do not modify this array but you can keep reference to elements using efl_ref() and efl_unref()]]
 }
-class Efl.Net.Ip_Address extends Efl.Object {
+class @beta Efl.Net.Ip_Address extends Efl.Object {
    [[An Internet Protocol (IP) Address.
      This class is a set of helpers to translate to and from address
diff --git a/src/lib/ecore_con/efl_net_server.eo b/src/lib/ecore_con/efl_net_server.eo
index 8e9487f310..141cf9d0ae 100644
--- a/src/lib/ecore_con/efl_net_server.eo
+++ b/src/lib/ecore_con/efl_net_server.eo
@@ -1,4 +1,4 @@
-interface Efl.Net.Server {
+interface @beta Efl.Net.Server {
    [[The basic server interface.
      This will start serving and accepting clients once @.serve is
diff --git a/src/lib/ecore_con/efl_net_server_fd.eo b/src/lib/ecore_con/efl_net_server_fd.eo
index 4758be1634..74d734d86a 100644
--- a/src/lib/ecore_con/efl_net_server_fd.eo
+++ b/src/lib/ecore_con/efl_net_server_fd.eo
@@ -1,4 +1,4 @@
-abstract Efl.Net.Server_Fd extends Efl.Loop_Fd implements Efl.Net.Server {
+abstract @beta Efl.Net.Server_Fd extends Efl.Loop_Fd implements Efl.Net.Server {
    [[A generic server based on file descriptors.
      @since 1.19
diff --git a/src/lib/ecore_con/efl_net_server_ip.eo b/src/lib/ecore_con/efl_net_server_ip.eo
index 3fb8b96d3b..ab1f770b54 100644
--- a/src/lib/ecore_con/efl_net_server_ip.eo
+++ b/src/lib/ecore_con/efl_net_server_ip.eo
@@ -1,4 +1,4 @@
-abstract Efl.Net.Server_Ip extends Efl.Net.Server_Fd {
+abstract @beta Efl.Net.Server_Ip extends Efl.Net.Server_Fd {
    [[An IP server.
      @since 1.20
diff --git a/src/lib/ecore_con/efl_net_server_simple.eo b/src/lib/ecore_con/efl_net_server_simple.eo
index 3934828ffb..7dc4488731 100644
--- a/src/lib/ecore_con/efl_net_server_simple.eo
+++ b/src/lib/ecore_con/efl_net_server_simple.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Simple extends Efl.Loop_Consumer implements Efl.Net.Server {
+class @beta Efl.Net.Server_Simple extends Efl.Loop_Consumer implements Efl.Net.Server {
    [[A network server wrapper that creates clients based on @Efl.Net.Socket_Simple.
      This is just a wrapper server. It takes an actual server
diff --git a/src/lib/ecore_con/efl_net_server_ssl.eo b/src/lib/ecore_con/efl_net_server_ssl.eo
index 52b0bcc595..18a7c22db6 100644
--- a/src/lib/ecore_con/efl_net_server_ssl.eo
+++ b/src/lib/ecore_con/efl_net_server_ssl.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Ssl extends Efl.Net.Server_Tcp {
+class @beta Efl.Net.Server_Ssl extends Efl.Net.Server_Tcp {
    [[A SSL server over TCP.
      @since 1.19
diff --git a/src/lib/ecore_con/efl_net_server_tcp.eo b/src/lib/ecore_con/efl_net_server_tcp.eo
index de6631a32b..4a4e99833f 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.eo
+++ b/src/lib/ecore_con/efl_net_server_tcp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Tcp extends Efl.Net.Server_Ip {
+class @beta Efl.Net.Server_Tcp extends Efl.Net.Server_Ip {
    [[A TCP server.
      @since 1.19
diff --git a/src/lib/ecore_con/efl_net_server_udp.eo b/src/lib/ecore_con/efl_net_server_udp.eo
index 8d7fc01ce9..b5f5cec09d 100644
--- a/src/lib/ecore_con/efl_net_server_udp.eo
+++ b/src/lib/ecore_con/efl_net_server_udp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Udp extends Efl.Net.Server_Ip {
+class @beta Efl.Net.Server_Udp extends Efl.Net.Server_Ip {
    [[A UDP server.
      @since 1.19
diff --git a/src/lib/ecore_con/efl_net_server_udp_client.eo b/src/lib/ecore_con/efl_net_server_udp_client.eo
index 205ca8ba9f..28d979687c 100644
--- a/src/lib/ecore_con/efl_net_server_udp_client.eo
+++ b/src/lib/ecore_con/efl_net_server_udp_client.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Udp_Client extends Efl.Object implements Efl.Net.Socket {
+class @beta Efl.Net.Server_Udp_Client extends Efl.Object implements Efl.Net.Socket {
    [[A UDP client child of Efl.Net.Server_Udp
      Unlike connection protocols such as TCP or Local, UDP doesn't
diff --git a/src/lib/ecore_con/efl_net_server_unix.eo b/src/lib/ecore_con/efl_net_server_unix.eo
index 9e05dd6848..2a541b4eb1 100644
--- a/src/lib/ecore_con/efl_net_server_unix.eo
+++ b/src/lib/ecore_con/efl_net_server_unix.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Unix extends Efl.Net.Server_Fd {
+class @beta Efl.Net.Server_Unix extends Efl.Net.Server_Fd {
    [[An AF_UNIX server.
      The @Efl.Net.Server.serve method will call bind(2) directly.
diff --git a/src/lib/ecore_con/efl_net_server_windows.eo b/src/lib/ecore_con/efl_net_server_windows.eo
index 5bd087a534..e235ea0bb5 100644
--- a/src/lib/ecore_con/efl_net_server_windows.eo
+++ b/src/lib/ecore_con/efl_net_server_windows.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Windows extends Efl.Loop_Consumer implements Efl.Net.Server {
+class @beta Efl.Net.Server_Windows extends Efl.Loop_Consumer implements Efl.Net.Server {
    [[A Windows NamedPipe server.
      The @Efl.Net.Server.serve method calls CreateNamedPipe()
diff --git a/src/lib/ecore_con/efl_net_session.eo b/src/lib/ecore_con/efl_net_session.eo
index 84db3f8ab7..ed968667ef 100644
--- a/src/lib/ecore_con/efl_net_session.eo
+++ b/src/lib/ecore_con/efl_net_session.eo
@@ -27,7 +27,7 @@ enum Efl.Net.Session_Technology {
    all = (Efl.Net.Session_Technology.ethernet | Efl.Net.Session_Technology.wifi | Efl.Net.Session_Technology.bluetooth | Efl.Net.Session_Technology.cellular | Efl.Net.Session_Technology.vpn | Efl.Net.Session_Technology.gadget), [[All technology types]]
 }
-class Efl.Net.Session extends Efl.Loop_Consumer {
+class @beta Efl.Net.Session extends Efl.Loop_Consumer {
    [[Used by application to request network connectivity.
      This API is targeted at applications that need access to the
diff --git a/src/lib/ecore_con/efl_net_socket.eo b/src/lib/ecore_con/efl_net_socket.eo
index f8741226ad..90804f366c 100644
--- a/src/lib/ecore_con/efl_net_socket.eo
+++ b/src/lib/ecore_con/efl_net_socket.eo
@@ -1,4 +1,4 @@
-interface Efl.Net.Socket extends Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
+interface @beta Efl.Net.Socket extends Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
    [[The basic socket interface.
      This is built upon the three core Input/Output interfaces:
diff --git a/src/lib/ecore_con/efl_net_socket_fd.eo b/src/lib/ecore_con/efl_net_socket_fd.eo
index c5b468b759..a02cb65666 100644
--- a/src/lib/ecore_con/efl_net_socket_fd.eo
+++ b/src/lib/ecore_con/efl_net_socket_fd.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Fd extends Efl.Loop_Fd implements Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Net.Socket {
+class @beta Efl.Net.Socket_Fd extends Efl.Loop_Fd implements Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Net.Socket {
    [[A base implementation for sockets over filedescriptors (fd)
      This is the common class and takes an existing FD, usually
diff --git a/src/lib/ecore_con/efl_net_socket_simple.eo b/src/lib/ecore_con/efl_net_socket_simple.eo
index 07b7c3e8da..dd255b5003 100644
--- a/src/lib/ecore_con/efl_net_socket_simple.eo
+++ b/src/lib/ecore_con/efl_net_socket_simple.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Simple extends Efl.Io.Buffered_Stream implements Efl.Net.Socket {
+class @beta Efl.Net.Socket_Simple extends Efl.Io.Buffered_Stream implements Efl.Net.Socket {
    [[A wrapper socket offering an easy to use, buffered I/O.
      The simple socket encapsulates an actual @Efl.Net.Socket and
diff --git a/src/lib/ecore_con/efl_net_socket_ssl.eo b/src/lib/ecore_con/efl_net_socket_ssl.eo
index dc607636dc..02c3b82031 100644
--- a/src/lib/ecore_con/efl_net_socket_ssl.eo
+++ b/src/lib/ecore_con/efl_net_socket_ssl.eo
@@ -1,7 +1,7 @@
 var Efl.Net.Socket_Ssl_Error.HANDSHAKE: Eina.Error; [[Failed SSL handshake]]
 var Efl.Net.Socket_Ssl_Error.CERTIFICATE_VERIFY_FAILED: Eina.Error; [[Failed to verify peer's certificate]]
-class Efl.Net.Socket_Ssl extends Efl.Loop_Consumer implements Efl.Net.Socket {
+class @beta Efl.Net.Socket_Ssl extends Efl.Loop_Consumer implements Efl.Net.Socket {
    [[A wrapper socket doing SSL (Secure Sockets Layer).
      Use this wrapper around an existing socket for secure
diff --git a/src/lib/ecore_con/efl_net_socket_tcp.eo b/src/lib/ecore_con/efl_net_socket_tcp.eo
index d3f0d5b3e7..449f255540 100644
--- a/src/lib/ecore_con/efl_net_socket_tcp.eo
+++ b/src/lib/ecore_con/efl_net_socket_tcp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Tcp extends Efl.Net.Socket_Fd {
+class @beta Efl.Net.Socket_Tcp extends Efl.Net.Socket_Fd {
    [[A base TCP socket.
      This is the common class and takes an existing FD, usually
diff --git a/src/lib/ecore_con/efl_net_socket_udp.eo b/src/lib/ecore_con/efl_net_socket_udp.eo
index 7e2b53307c..dd36e8c58e 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.eo
+++ b/src/lib/ecore_con/efl_net_socket_udp.eo
@@ -1,6 +1,6 @@
 import efl_net_ip_address;
-class Efl.Net.Socket_Udp extends Efl.Net.Socket_Fd {
+class @beta Efl.Net.Socket_Udp extends Efl.Net.Socket_Fd {
    [[A base UDP socket.
      This is the common class and takes an existing FD, usually
diff --git a/src/lib/ecore_con/efl_net_socket_unix.eo b/src/lib/ecore_con/efl_net_socket_unix.eo
index 854130e512..b7a193efc0 100644
--- a/src/lib/ecore_con/efl_net_socket_unix.eo
+++ b/src/lib/ecore_con/efl_net_socket_unix.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Unix extends Efl.Net.Socket_Fd {
+class @beta Efl.Net.Socket_Unix extends Efl.Net.Socket_Fd {
    [[A base UNIX socket.
      This is the common class and takes an existing FD, usually
diff --git a/src/lib/ecore_con/efl_net_socket_windows.eo b/src/lib/ecore_con/efl_net_socket_windows.eo
index f1e1625aa1..dbce9f133b 100644
--- a/src/lib/ecore_con/efl_net_socket_windows.eo
+++ b/src/lib/ecore_con/efl_net_socket_windows.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Windows extends Efl.Loop_Consumer implements Efl.Net.Socket {
+class @beta Efl.Net.Socket_Windows extends Efl.Loop_Consumer implements Efl.Net.Socket {
    [[A base Windows NamedPipe socket.
      This is the common class and takes an existing file HANDLE,
diff --git a/src/lib/ecore_con/efl_net_ssl_context.eo b/src/lib/ecore_con/efl_net_ssl_context.eo
index c19fe198b8..c6ad382341 100644
--- a/src/lib/ecore_con/efl_net_ssl_context.eo
+++ b/src/lib/ecore_con/efl_net_ssl_context.eo
@@ -1,6 +1,6 @@
 import efl_net_ssl_types;
-class Efl.Net.Ssl.Context extends Efl.Object {
+class @beta Efl.Net.Ssl.Context extends Efl.Object {
    [[A SSL Context that is used to start a SSL socket wrapper.
      The context will contain common configurations such as
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index e4f4f6fa8d..d61ef892f2 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -1,6 +1,6 @@
 // FIXME: This EO doc needs a direct link to the "edcref" doc
-class Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.Container, Efl.Part,
+class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.Container, Efl.Part,
                         Efl.Observer, Efl.Layout.Calc,
                         Efl.Layout.Signal, Efl.Layout.Group,
                         Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
diff --git a/src/lib/edje/efl_canvas_layout_part.eo b/src/lib/edje/efl_canvas_layout_part.eo
index 927e70ac9a..416ab4aa97 100644
--- a/src/lib/edje/efl_canvas_layout_part.eo
+++ b/src/lib/edje/efl_canvas_layout_part.eo
@@ -1,6 +1,6 @@
 import edje_types;
-class Efl.Canvas.Layout_Part extends Efl.Object implements Efl.Gfx.Entity, Efl.Ui.Drag
+class @beta Efl.Canvas.Layout_Part extends Efl.Object implements Efl.Gfx.Entity, Efl.Ui.Drag
 {
   [[Common class for part proxy objects for @Efl.Canvas.Layout.
diff --git a/src/lib/edje/efl_canvas_layout_part_box.eo b/src/lib/edje/efl_canvas_layout_part_box.eo
index 4db959292e..0fa1e39f17 100644
--- a/src/lib/edje/efl_canvas_layout_part_box.eo
+++ b/src/lib/edje/efl_canvas_layout_part_box.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Part_Box extends Efl.Canvas.Layout_Part implements Efl.Pack_Linear,
+class @beta Efl.Canvas.Layout_Part_Box extends Efl.Canvas.Layout_Part implements Efl.Pack_Linear,
                                  Efl.Ui.Direction_Readonly
 {
   [[Represents a Box created as part of a layout.
diff --git a/src/lib/edje/efl_canvas_layout_part_external.eo b/src/lib/edje/efl_canvas_layout_part_external.eo
index 25e694c589..eb5ca38815 100644
--- a/src/lib/edje/efl_canvas_layout_part_external.eo
+++ b/src/lib/edje/efl_canvas_layout_part_external.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Part_External extends Efl.Canvas.Layout_Part implements Efl.Content
+class @beta Efl.Canvas.Layout_Part_External extends Efl.Canvas.Layout_Part implements Efl.Content
 {
   [[Class representing an external part in Edje layouts.
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index 1dbef9ffe2..d048657cb8 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements Efl.Content,
+class @beta Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements Efl.Content,
                                      Efl.Pack_Linear, Efl.Ui.Direction_Readonly,
                                      Efl.Pack_Table, Efl.Text,
                                      Efl.Text_Markup, Efl.Text_Markup_Interactive
diff --git a/src/lib/edje/efl_canvas_layout_part_swallow.eo b/src/lib/edje/efl_canvas_layout_part_swallow.eo
index 6b1c4723ed..96088da982 100644
--- a/src/lib/edje/efl_canvas_layout_part_swallow.eo
+++ b/src/lib/edje/efl_canvas_layout_part_swallow.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Part_Swallow extends Efl.Canvas.Layout_Part implements Efl.Content
+class @beta Efl.Canvas.Layout_Part_Swallow extends Efl.Canvas.Layout_Part implements Efl.Content
 {
   [[Represents a SWALLOW part of an Edje object.
diff --git a/src/lib/edje/efl_canvas_layout_part_table.eo b/src/lib/edje/efl_canvas_layout_part_table.eo
index e0184381c4..4abd546bcc 100644
--- a/src/lib/edje/efl_canvas_layout_part_table.eo
+++ b/src/lib/edje/efl_canvas_layout_part_table.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Part_Table extends Efl.Canvas.Layout_Part implements Efl.Pack_Table
+class @beta Efl.Canvas.Layout_Part_Table extends Efl.Canvas.Layout_Part implements Efl.Pack_Table
 {
   [[Represents a Table created as part of a layout.
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index b987c915e7..09213c663e 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -10,7 +10,7 @@ enum Efl.Canvas.Layout_Part_Text_Expand
   max_y  = 1 << 3,
 }
-class Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text,
+class @beta Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text,
 Efl.Text_Markup, Efl.Text_Markup_Interactive, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
 {
   [[Represents a TEXT part of a layout
diff --git a/src/lib/edje/efl_layout_calc.eo b/src/lib/edje/efl_layout_calc.eo
index 018cd7e197..ab43fbbe1f 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 Efl.Layout.Calc
+interface @beta 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 864a3a86c9..5d4d56afcd 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 Efl.Layout.Group
+interface @beta 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 3b4562e596..90709fb8d0 100644
--- a/src/lib/edje/efl_layout_signal.eo
+++ b/src/lib/edje/efl_layout_signal.eo
@@ -17,7 +17,7 @@ function EflLayoutSignalCb {
  }
 };
-interface Efl.Layout.Signal
+interface @beta Efl.Layout.Signal
 {
   [[Layouts asynchronous messaging and signaling interface.
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 52a22d44a5..0ac67feea8 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -71,8 +71,6 @@ typedef struct _Efl_Text_Annotate_Annotation Efl_Text_Annotate_Annotation;
 #include "interfaces/efl_types.eot.h"
-#ifdef EFL_BETA_API_SUPPORT
 #include <Efl_MVVM_Common.h>
 /* Data types */
@@ -187,6 +185,8 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #include "interfaces/efl_text_markup_interactive.eo.h"
 #include "interfaces/efl_text_markup_util.eo.h"
+#ifdef EFL_BETA_API_SUPPORT
 EAPI void efl_observable_tuple_free(Efl_Observable_Tuple *tuple);
 /**
diff --git a/src/lib/efl/interfaces/efl_animator.eo b/src/lib/efl/interfaces/efl_animator.eo
index ca969d99fe..39f7e3ce3f 100644
--- a/src/lib/efl/interfaces/efl_animator.eo
+++ b/src/lib/efl/interfaces/efl_animator.eo
@@ -5,7 +5,7 @@ struct Efl.Event_Animator_Tick {
   update_area: Eina.Rect; [[Area of the canvas that will be pushed to screen.]]
 }
-interface Efl.Animator {
+interface @beta Efl.Animator {
   [[Efl animator interface]]
   eo_prefix: efl_animator;
   event_prefix: efl;
diff --git a/src/lib/efl/interfaces/efl_cached_item.eo b/src/lib/efl/interfaces/efl_cached_item.eo
index f3f82d6baf..a8da315453 100644
--- a/src/lib/efl/interfaces/efl_cached_item.eo
+++ b/src/lib/efl/interfaces/efl_cached_item.eo
@@ -1,4 +1,4 @@
-interface Efl.Cached.Item
+interface @beta Efl.Cached.Item
 {
   [[Efl Cached Item interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_canvas_pointer.eo b/src/lib/efl/interfaces/efl_canvas_pointer.eo
index 45e34f7849..3ea8cddfc7 100644
--- a/src/lib/efl/interfaces/efl_canvas_pointer.eo
+++ b/src/lib/efl/interfaces/efl_canvas_pointer.eo
@@ -1,6 +1,6 @@
 import efl_input_device;
-interface Efl.Canvas.Pointer
+interface @beta Efl.Canvas.Pointer
 {
   [[Efl Canvas Pointer interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_canvas_scene.eo b/src/lib/efl/interfaces/efl_canvas_scene.eo
index ab624be34c..2133378b05 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 Efl.Canvas.Scene
+interface @beta Efl.Canvas.Scene
 {
   [[Common interface for window and some internal classes in EFL.]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_config.eo b/src/lib/efl/interfaces/efl_config.eo
index 78a3f342e3..e6605d4282 100644
--- a/src/lib/efl/interfaces/efl_config.eo
+++ b/src/lib/efl/interfaces/efl_config.eo
@@ -1,4 +1,4 @@
-interface Efl.Config
+interface @beta Efl.Config
 {
   [[A generic configuration interface, that holds key-value pairs.]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index e7157ee0a7..c2f90d4e89 100644
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -1,4 +1,4 @@
-interface Efl.Container
+interface @beta 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 da2088d834..a5dbe43ef6 100644
--- a/src/lib/efl/interfaces/efl_content.eo
+++ b/src/lib/efl/interfaces/efl_content.eo
@@ -1,4 +1,4 @@
-interface Efl.Content
+interface @beta Efl.Content
 {
   [[Common interface for objects that have a (single) content.
diff --git a/src/lib/efl/interfaces/efl_control.eo b/src/lib/efl/interfaces/efl_control.eo
index 39d327eef5..3382cc4392 100644
--- a/src/lib/efl/interfaces/efl_control.eo
+++ b/src/lib/efl/interfaces/efl_control.eo
@@ -1,6 +1,6 @@
 /* FIXME: Rename */
-interface Efl.Control {
+interface @beta Efl.Control {
   [[Efl control interface]]
   methods {
        @property priority {
diff --git a/src/lib/efl/interfaces/efl_duplicate.eo b/src/lib/efl/interfaces/efl_duplicate.eo
index 1b71d803be..6419f35280 100644
--- a/src/lib/efl/interfaces/efl_duplicate.eo
+++ b/src/lib/efl/interfaces/efl_duplicate.eo
@@ -1,4 +1,4 @@
-interface Efl.Duplicate
+interface @beta Efl.Duplicate
 {
   [[An interface for duplication of objects.
diff --git a/src/lib/efl/interfaces/efl_file.eo b/src/lib/efl/interfaces/efl_file.eo
index c9873f06da..8d98a004a4 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 Efl.File {
+mixin @beta Efl.File {
   [[Efl file interface]]
   methods {
      @property load_error {
diff --git a/src/lib/efl/interfaces/efl_file_save.eo b/src/lib/efl/interfaces/efl_file_save.eo
index 153b74b23e..3cdc234fff 100644
--- a/src/lib/efl/interfaces/efl_file_save.eo
+++ b/src/lib/efl/interfaces/efl_file_save.eo
@@ -1,6 +1,6 @@
 import eina_types;
-interface Efl.File_Save {
+interface @beta Efl.File_Save {
   [[Efl file saving interface]]
   methods {
      save @const {
diff --git a/src/lib/efl/interfaces/efl_gfx_blur.eo b/src/lib/efl/interfaces/efl_gfx_blur.eo
index c69e7871fb..a3f2d5dac0 100644
--- a/src/lib/efl/interfaces/efl_gfx_blur.eo
+++ b/src/lib/efl/interfaces/efl_gfx_blur.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Blur
+interface @beta Efl.Gfx.Blur
 {
   [[A simple API to apply blur effects.
diff --git a/src/lib/efl/interfaces/efl_gfx_buffer.eo b/src/lib/efl/interfaces/efl_gfx_buffer.eo
index a4fa28cb98..795b6663bc 100644
--- a/src/lib/efl/interfaces/efl_gfx_buffer.eo
+++ b/src/lib/efl/interfaces/efl_gfx_buffer.eo
@@ -12,7 +12,7 @@ enum Efl.Gfx.Buffer_Access_Mode {
 /* FIXME: YUV and other planar formats are not properly handled in this API! */
-interface Efl.Gfx.Buffer
+interface @beta Efl.Gfx.Buffer
 {
   [[Common APIs for all objects representing images and 2D pixel buffers.]]
diff --git a/src/lib/efl/interfaces/efl_gfx_color.eo b/src/lib/efl/interfaces/efl_gfx_color.eo
index d3c41e1e31..a72cae23db 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 Efl.Gfx.Color
+mixin @beta Efl.Gfx.Color
 {
   [[Efl Gfx Color mixin class]]
   data: null;
diff --git a/src/lib/efl/interfaces/efl_gfx_color_class.eo b/src/lib/efl/interfaces/efl_gfx_color_class.eo
index 990835dfce..51bade3d11 100644
--- a/src/lib/efl/interfaces/efl_gfx_color_class.eo
+++ b/src/lib/efl/interfaces/efl_gfx_color_class.eo
@@ -1,6 +1,6 @@
 import efl_gfx_types;
-mixin Efl.Gfx.Color_Class
+mixin @beta Efl.Gfx.Color_Class
 {
   [[Efl Gfx Color Class 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 30131d6ba3..5f40f6f17a 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 Efl.Gfx.Entity {
+interface @beta Efl.Gfx.Entity {
   [[Efl graphics interface]]
   eo_prefix: efl_gfx_entity;
   methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_fill.eo b/src/lib/efl/interfaces/efl_gfx_fill.eo
index 566f26daad..0cd438012d 100644
--- a/src/lib/efl/interfaces/efl_gfx_fill.eo
+++ b/src/lib/efl/interfaces/efl_gfx_fill.eo
@@ -1,6 +1,6 @@
 import eina_types;
-interface Efl.Gfx.Fill {
+interface @beta Efl.Gfx.Fill {
   [[Efl graphics fill interface]]
   methods {
      @property fill_auto {
diff --git a/src/lib/efl/interfaces/efl_gfx_filter.eo b/src/lib/efl/interfaces/efl_gfx_filter.eo
index 499a29c8de..5cee031f3f 100644
--- a/src/lib/efl/interfaces/efl_gfx_filter.eo
+++ b/src/lib/efl/interfaces/efl_gfx_filter.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Filter
+interface @beta Efl.Gfx.Filter
 {
   [[Graphical filters can be applied to any object implementing this interface.
diff --git a/src/lib/efl/interfaces/efl_gfx_frame_controller.eo b/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
index f08026f2b4..b2a164ca23 100644
--- a/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
@@ -8,7 +8,7 @@ enum Efl.Gfx.Frame_Controller_Loop_Hint {
   pingpong = 2    [[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]]
 }
-interface Efl.Gfx.Frame_Controller
+interface @beta Efl.Gfx.Frame_Controller
 {
   [[Efl frame controller of frame based animated object interface.]]
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient.eo b/src/lib/efl/interfaces/efl_gfx_gradient.eo
index 311e873698..3622034a45 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient.eo
@@ -1,6 +1,6 @@
 import efl_gfx_types;
-interface Efl.Gfx.Gradient
+interface @beta Efl.Gfx.Gradient
 {
   [[Efl graphics gradient interface]]
   eo_prefix: efl_gfx_gradient;
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
index ec7a9bfdfd..238e5d04a4 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Gradient_Linear extends Efl.Gfx.Gradient
+interface @beta Efl.Gfx.Gradient_Linear extends Efl.Gfx.Gradient
 {
   [[Efl graphics gradient linear interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo b/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
index 1b2d6bdf26..9cc3f3f069 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Gradient_Radial extends Efl.Gfx.Gradient
+interface @beta Efl.Gfx.Gradient_Radial extends Efl.Gfx.Gradient
 {
   [[Efl graphics gradient radial interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_image.eo b/src/lib/efl/interfaces/efl_gfx_image.eo
index 4e8a23cdea..420bb8199d 100644
--- a/src/lib/efl/interfaces/efl_gfx_image.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image.eo
@@ -40,7 +40,7 @@ enum Efl.Gfx.Image_Scale_Type
   none         [[Not scale the image]]
 }
-interface Efl.Gfx.Image
+interface @beta Efl.Gfx.Image
 {
   [[Common APIs for all 2D images that can be rendered on the canvas.]]
diff --git a/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
index 66ae1d4085..4771be1478 100644
--- a/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
@@ -13,7 +13,7 @@ enum Efl.Gfx.Image_Load_Controller_State
 }
 */
-interface Efl.Gfx.Image_Load_Controller
+interface @beta Efl.Gfx.Image_Load_Controller
 {
   [[Common APIs for all loadable 2D images.]]
diff --git a/src/lib/efl/interfaces/efl_gfx_path.eo b/src/lib/efl/interfaces/efl_gfx_path.eo
index d60886e499..5f8e0baa59 100644
--- a/src/lib/efl/interfaces/efl_gfx_path.eo
+++ b/src/lib/efl/interfaces/efl_gfx_path.eo
@@ -1,7 +1,7 @@
 import eina_types;
 import efl_gfx_types;
-mixin Efl.Gfx.Path
+mixin @beta Efl.Gfx.Path
 {
   [[EFL graphics path object interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo b/src/lib/efl/interfaces/efl_gfx_shape.eo
index 2dfb554e81..f71ec933ae 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.eo
+++ b/src/lib/efl/interfaces/efl_gfx_shape.eo
@@ -1,6 +1,6 @@
 import efl_gfx_types;
-mixin Efl.Gfx.Shape extends Efl.Gfx.Path
+mixin @beta Efl.Gfx.Shape extends Efl.Gfx.Path
 {
   [[EFL graphics shape object interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_size_class.eo b/src/lib/efl/interfaces/efl_gfx_size_class.eo
index a3e7fc96b2..4cf49ae70e 100644
--- a/src/lib/efl/interfaces/efl_gfx_size_class.eo
+++ b/src/lib/efl/interfaces/efl_gfx_size_class.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Size_Class
+interface @beta Efl.Gfx.Size_Class
 {
   [[Efl Gfx Size Class interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_size_hint.eo
index 676cc04d37..af01fe08be 100644
--- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo
+++ b/src/lib/efl/interfaces/efl_gfx_size_hint.eo
@@ -4,7 +4,7 @@ import efl_gfx_types;
 const Efl.Gfx.Size_Hint_Expand: double = 1.0;
   [[Use with @Efl.Gfx.Size_Hint.hint_weight.]]
-interface Efl.Gfx.Size_Hint
+interface @beta Efl.Gfx.Size_Hint
 {
   [[Efl graphics size 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 515fa73a30..56bdde626f 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 Efl.Gfx.Stack
+interface @beta Efl.Gfx.Stack
 {
   [[Efl graphics stack interface]]
   event_prefix: efl_gfx_entity;
diff --git a/src/lib/efl/interfaces/efl_gfx_text_class.eo b/src/lib/efl/interfaces/efl_gfx_text_class.eo
index bf2c5a1339..a3c7f3f20b 100644
--- a/src/lib/efl/interfaces/efl_gfx_text_class.eo
+++ b/src/lib/efl/interfaces/efl_gfx_text_class.eo
@@ -1,6 +1,6 @@
 import efl_gfx_types;
-interface Efl.Gfx.Text_Class
+interface @beta Efl.Gfx.Text_Class
 {
   [[Efl Gfx Text Class interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_gfx_view.eo b/src/lib/efl/interfaces/efl_gfx_view.eo
index 233175c6a2..f18d0dc52a 100644
--- a/src/lib/efl/interfaces/efl_gfx_view.eo
+++ b/src/lib/efl/interfaces/efl_gfx_view.eo
@@ -1,6 +1,6 @@
 import eina_types;
-interface Efl.Gfx.View
+interface @beta Efl.Gfx.View
 {
   [[Efl graphics view interface]]
   eo_prefix: efl_gfx;
diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/efl/interfaces/efl_input_device.eo
index 91a0760bb5..86091a2d11 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/efl/interfaces/efl_input_device.eo
@@ -19,7 +19,7 @@ enum Efl.Input.Device_Type
  @property canvas { values { canvas: Efl.Canvas; } }
 */
-class Efl.Input.Device extends Efl.Object
+class @beta 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_interpolator.eo b/src/lib/efl/interfaces/efl_interpolator.eo
index 870582ab6f..ba01e742d2 100644
--- a/src/lib/efl/interfaces/efl_interpolator.eo
+++ b/src/lib/efl/interfaces/efl_interpolator.eo
@@ -1,4 +1,4 @@
-interface Efl.Interpolator
+interface @beta Efl.Interpolator
 {
   [[Efl interpolator interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_io_buffer.eo b/src/lib/efl/interfaces/efl_io_buffer.eo
index 230c2aa061..0f781d0bd0 100644
--- a/src/lib/efl/interfaces/efl_io_buffer.eo
+++ b/src/lib/efl/interfaces/efl_io_buffer.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Buffer extends Efl.Object implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Io.Sizer, Efl.Io.Positioner {
+class @beta Efl.Io.Buffer extends Efl.Object implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Io.Sizer, Efl.Io.Positioner {
    [[Generic In-memory buffer of data to be used as I/O.
      This class offers both input and output, which can be used at
diff --git a/src/lib/efl/interfaces/efl_io_closer.eo b/src/lib/efl/interfaces/efl_io_closer.eo
index 2ba4323085..42be3284ba 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 Efl.Io.Closer {
+interface @beta 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_positioner.eo b/src/lib/efl/interfaces/efl_io_positioner.eo
index 4b4033c670..ace155f400 100644
--- a/src/lib/efl/interfaces/efl_io_positioner.eo
+++ b/src/lib/efl/interfaces/efl_io_positioner.eo
@@ -7,7 +7,7 @@ enum Efl.Io.Positioner_Whence {
    end, [[Seek from the end of stream/file]]
 }
-mixin Efl.Io.Positioner {
+mixin @beta Efl.Io.Positioner {
    [[Generic interface for objects that can change or report position.
      @since 1.19
diff --git a/src/lib/efl/interfaces/efl_io_queue.eo b/src/lib/efl/interfaces/efl_io_queue.eo
index c8c6f1e46c..39bc760c8e 100644
--- a/src/lib/efl/interfaces/efl_io_queue.eo
+++ b/src/lib/efl/interfaces/efl_io_queue.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Queue extends Efl.Object implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
+class @beta Efl.Io.Queue extends Efl.Object implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
    [[Generic In-memory queue of data to be used as I/O.
      This class is to be used to receive temporary data using
diff --git a/src/lib/efl/interfaces/efl_io_reader.eo b/src/lib/efl/interfaces/efl_io_reader.eo
index ccb3efe90f..0fa08b4798 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 Efl.Io.Reader {
+interface @beta 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_sizer.eo b/src/lib/efl/interfaces/efl_io_sizer.eo
index a91cf665a1..9f358619e5 100644
--- a/src/lib/efl/interfaces/efl_io_sizer.eo
+++ b/src/lib/efl/interfaces/efl_io_sizer.eo
@@ -1,6 +1,6 @@
 import eina_types;
-mixin Efl.Io.Sizer {
+mixin @beta Efl.Io.Sizer {
    [[Generic interface for objects that can resize or report size of themselves.
      This interface allows external objects to transparently resize
diff --git a/src/lib/efl/interfaces/efl_io_writer.eo b/src/lib/efl/interfaces/efl_io_writer.eo
index 7e109cf372..295fe7c9e4 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 Efl.Io.Writer {
+interface @beta 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_model.eo b/src/lib/efl/interfaces/efl_model.eo
index 72de91d809..48c4809aa8 100644
--- a/src/lib/efl/interfaces/efl_model.eo
+++ b/src/lib/efl/interfaces/efl_model.eo
@@ -13,7 +13,7 @@ struct Efl.Model_Children_Event {
                          the parent, it will be available here.]]
 }
-interface Efl.Model
+interface @beta Efl.Model
 {
   [[Efl model interface]]
   eo_prefix: efl_model;
diff --git a/src/lib/efl/interfaces/efl_observable.eo b/src/lib/efl/interfaces/efl_observable.eo
index 4055217c51..cf31f41e48 100644
--- a/src/lib/efl/interfaces/efl_observable.eo
+++ b/src/lib/efl/interfaces/efl_observable.eo
@@ -1,6 +1,6 @@
 import efl_types;
-class Efl.Observable extends Efl.Object {
+class @beta Efl.Observable extends Efl.Object {
   [[Efl observable class]]
   methods {
      observer_add {
diff --git a/src/lib/efl/interfaces/efl_observer.eo b/src/lib/efl/interfaces/efl_observer.eo
index 38764f843d..82e91c2682 100644
--- a/src/lib/efl/interfaces/efl_observer.eo
+++ b/src/lib/efl/interfaces/efl_observer.eo
@@ -1,4 +1,4 @@
-interface Efl.Observer {
+interface @beta Efl.Observer {
   [[Efl observer interface]]
   methods {
      update {
diff --git a/src/lib/efl/interfaces/efl_orientation.eo b/src/lib/efl/interfaces/efl_orientation.eo
index 4f83c25c97..8eb4f55b4a 100644
--- a/src/lib/efl/interfaces/efl_orientation.eo
+++ b/src/lib/efl/interfaces/efl_orientation.eo
@@ -28,7 +28,7 @@ enum Efl.Flip
   vertical = 2 [[Flip image vertically]]
 }
-interface Efl.Orientation
+interface @beta Efl.Orientation
 {
   [[Efl orientation interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_pack.eo b/src/lib/efl/interfaces/efl_pack.eo
index 012c9699eb..624a0004fe 100644
--- a/src/lib/efl/interfaces/efl_pack.eo
+++ b/src/lib/efl/interfaces/efl_pack.eo
@@ -1,4 +1,4 @@
-interface Efl.Pack extends Efl.Container
+interface @beta Efl.Pack extends Efl.Container
 {
   [[API common to all UI container objects.]]
   methods
diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo
index 3b47fa37d7..2760886705 100644
--- a/src/lib/efl/interfaces/efl_pack_layout.eo
+++ b/src/lib/efl/interfaces/efl_pack_layout.eo
@@ -1,4 +1,4 @@
-interface Efl.Pack_Layout
+interface @beta Efl.Pack_Layout
 {
   [[Low-level APIs for object that can lay their children out.
diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo
index 5829c73d27..423c6cbb6c 100644
--- a/src/lib/efl/interfaces/efl_pack_linear.eo
+++ b/src/lib/efl/interfaces/efl_pack_linear.eo
@@ -1,4 +1,4 @@
-interface Efl.Pack_Linear extends Efl.Pack
+interface @beta Efl.Pack_Linear extends Efl.Pack
 {
   [[API for containers ]]
   eo_prefix: efl_pack;
diff --git a/src/lib/efl/interfaces/efl_pack_table.eo b/src/lib/efl/interfaces/efl_pack_table.eo
index 6b0bfd8b6e..ea88ca61da 100644
--- a/src/lib/efl/interfaces/efl_pack_table.eo
+++ b/src/lib/efl/interfaces/efl_pack_table.eo
@@ -1,6 +1,6 @@
 import efl_ui_direction;
-interface Efl.Pack_Table extends Efl.Pack_Linear
+interface @beta Efl.Pack_Table extends Efl.Pack_Linear
 {
   [[2D containers aligned on a table with rows and columns]]
   eo_prefix: efl_pack;
diff --git a/src/lib/efl/interfaces/efl_part.eo b/src/lib/efl/interfaces/efl_part.eo
index 1f37e7e4ab..04bfd2bc4f 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 Efl.Part
+interface @beta Efl.Part
 {
   [[Interface for objects supporting named parts.
diff --git a/src/lib/efl/interfaces/efl_playable.eo b/src/lib/efl/interfaces/efl_playable.eo
index 56dbc9e51b..69df4235d9 100644
--- a/src/lib/efl/interfaces/efl_playable.eo
+++ b/src/lib/efl/interfaces/efl_playable.eo
@@ -1,4 +1,4 @@
-interface Efl.Playable
+interface @beta Efl.Playable
 {
   [[Efl media playable interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_player.eo b/src/lib/efl/interfaces/efl_player.eo
index 0353b36752..5c3a32c6d7 100644
--- a/src/lib/efl/interfaces/efl_player.eo
+++ b/src/lib/efl/interfaces/efl_player.eo
@@ -1,4 +1,4 @@
-interface Efl.Player
+interface @beta Efl.Player
 {
   [[Efl media player interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_screen.eo b/src/lib/efl/interfaces/efl_screen.eo
index c779dcedce..ee1696f3d4 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 Efl.Screen
+interface @beta 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 13733b0d4e..8d0851048a 100644
--- a/src/lib/efl/interfaces/efl_text.eo
+++ b/src/lib/efl/interfaces/efl_text.eo
@@ -1,4 +1,4 @@
-interface Efl.Text
+interface @beta Efl.Text
 {
   [[Efl text interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_text_annotate.eo b/src/lib/efl/interfaces/efl_text_annotate.eo
index f22209ec39..9dc5f6e003 100644
--- a/src/lib/efl/interfaces/efl_text_annotate.eo
+++ b/src/lib/efl/interfaces/efl_text_annotate.eo
@@ -1,6 +1,6 @@
 import efl_text_types;
-interface Efl.Text_Annotate {
+interface @beta Efl.Text_Annotate {
   [[Cursor API
     @since 1.20
diff --git a/src/lib/efl/interfaces/efl_text_cursor.eo b/src/lib/efl/interfaces/efl_text_cursor.eo
index 87bba61bdd..855c49f207 100644
--- a/src/lib/efl/interfaces/efl_text_cursor.eo
+++ b/src/lib/efl/interfaces/efl_text_cursor.eo
@@ -22,7 +22,7 @@ enum Efl.Text_Cursor_Type
   under [[Cursor type under]]
 }
-interface Efl.Text_Cursor {
+interface @beta Efl.Text_Cursor {
   [[Cursor API
     @since 1.20
diff --git a/src/lib/efl/interfaces/efl_text_font.eo b/src/lib/efl/interfaces/efl_text_font.eo
index 34e5dab22a..bcbc837439 100644
--- a/src/lib/efl/interfaces/efl_text_font.eo
+++ b/src/lib/efl/interfaces/efl_text_font.eo
@@ -49,7 +49,7 @@ enum Efl.Text_Font_Bitmap_Scalable {
   color = (1 << 0), [[Enable scalable feature for color bitmap fonts.]]
 }
-interface Efl.Text_Font {
+interface @beta Efl.Text_Font {
   [[Font settings of the text
     @since 1.20
diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo
index 0ec9c98240..04a99ac582 100644
--- a/src/lib/efl/interfaces/efl_text_format.eo
+++ b/src/lib/efl/interfaces/efl_text_format.eo
@@ -16,7 +16,7 @@ enum Efl.Text_Format_Horizontal_Alignment_Auto_Type {
   end     [[Text is places at opposite side of LTR/RTL (bidirectional) settings]]
 }
-interface Efl.Text_Format {
+interface @beta Efl.Text_Format {
   [[The look and layout of the text
     The text format can affect the geometry of the text object, as well as
diff --git a/src/lib/efl/interfaces/efl_text_markup.eo b/src/lib/efl/interfaces/efl_text_markup.eo
index 7d6968445c..a12b0728b8 100644
--- a/src/lib/efl/interfaces/efl_text_markup.eo
+++ b/src/lib/efl/interfaces/efl_text_markup.eo
@@ -1,4 +1,4 @@
-interface Efl.Text_Markup {
+interface @beta Efl.Text_Markup {
   [[Markup data that populates the text object's style and format
     @since 1.21
diff --git a/src/lib/efl/interfaces/efl_text_markup_interactive.eo b/src/lib/efl/interfaces/efl_text_markup_interactive.eo
index 4906d5931a..dc0a04af5d 100644
--- a/src/lib/efl/interfaces/efl_text_markup_interactive.eo
+++ b/src/lib/efl/interfaces/efl_text_markup_interactive.eo
@@ -1,4 +1,4 @@
-interface Efl.Text_Markup_Interactive extends Efl.Text_Cursor {
+interface @beta Efl.Text_Markup_Interactive extends Efl.Text_Cursor {
   [[Markup data that populates the text object's style and format
     @since 1.22
diff --git a/src/lib/efl/interfaces/efl_text_markup_util.eo b/src/lib/efl/interfaces/efl_text_markup_util.eo
index 845694d489..f29d2f8d77 100644
--- a/src/lib/efl/interfaces/efl_text_markup_util.eo
+++ b/src/lib/efl/interfaces/efl_text_markup_util.eo
@@ -1,4 +1,4 @@
-class Efl.Text_Markup_Util {
+class @beta Efl.Text_Markup_Util {
   [[Utility class for markup, such as conversions
     @since 1.21.
diff --git a/src/lib/efl/interfaces/efl_text_style.eo b/src/lib/efl/interfaces/efl_text_style.eo
index 99552ac036..d6952cd53b 100644
--- a/src/lib/efl/interfaces/efl_text_style.eo
+++ b/src/lib/efl/interfaces/efl_text_style.eo
@@ -55,7 +55,7 @@ enum Efl.Text_Style_Underline_Type
   dashed, [[Underlined with a dashed line]]
 }
-interface Efl.Text_Style {
+interface @beta Efl.Text_Style {
   [[Style to apply to the text
     A style can be coloring, effects, underline, strikethrough etc.
diff --git a/src/lib/efl/interfaces/efl_ui_autorepeat.eo b/src/lib/efl/interfaces/efl_ui_autorepeat.eo
index 5bcf451e5a..1c374a5172 100644
--- a/src/lib/efl/interfaces/efl_ui_autorepeat.eo
+++ b/src/lib/efl/interfaces/efl_ui_autorepeat.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Autorepeat {
+interface @beta Efl.Ui.Autorepeat {
   [[Efl UI autorepeat interface]]
      eo_prefix: efl_ui;
   methods {
diff --git a/src/lib/efl/interfaces/efl_ui_clickable.eo b/src/lib/efl/interfaces/efl_ui_clickable.eo
index 869d5e3650..34da147875 100644
--- a/src/lib/efl/interfaces/efl_ui_clickable.eo
+++ b/src/lib/efl/interfaces/efl_ui_clickable.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Clickable
+interface @beta Efl.Ui.Clickable
 {
   [[Efl UI clickable interface]]
   event_prefix: efl_ui;
diff --git a/src/lib/efl/interfaces/efl_ui_direction.eo b/src/lib/efl/interfaces/efl_ui_direction.eo
index 7e5aa74c0e..9a0ad01847 100644
--- a/src/lib/efl/interfaces/efl_ui_direction.eo
+++ b/src/lib/efl/interfaces/efl_ui_direction.eo
@@ -25,7 +25,7 @@ enum Efl.Ui.Dir
   left = Efl.Ui.Dir.rtl, [[Left is an alias for RTL.]]
 }
-interface Efl.Ui.Direction
+interface @beta Efl.Ui.Direction
 {
   [[EFL UI object direction interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_ui_direction_readonly.eo b/src/lib/efl/interfaces/efl_ui_direction_readonly.eo
index 900b990c49..aaba2d45c5 100644
--- a/src/lib/efl/interfaces/efl_ui_direction_readonly.eo
+++ b/src/lib/efl/interfaces/efl_ui_direction_readonly.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Direction_Readonly extends Efl.Ui.Direction
+mixin @beta Efl.Ui.Direction_Readonly extends Efl.Ui.Direction
 {
  implements {
    Efl.Ui.Direction.direction { set; [[This will always print and error that this is a readonly object]]}
diff --git a/src/lib/efl/interfaces/efl_ui_drag.eo b/src/lib/efl/interfaces/efl_ui_drag.eo
index dedcb348f1..acc1304cdc 100644
--- a/src/lib/efl/interfaces/efl_ui_drag.eo
+++ b/src/lib/efl/interfaces/efl_ui_drag.eo
@@ -2,7 +2,7 @@
 import efl_ui_types;
-interface Efl.Ui.Drag
+interface @beta Efl.Ui.Drag
 {
   [[Common interface for draggable objects and parts.
diff --git a/src/lib/efl/interfaces/efl_ui_draggable.eo b/src/lib/efl/interfaces/efl_ui_draggable.eo
index a202a3e434..3cd939667b 100644
--- a/src/lib/efl/interfaces/efl_ui_draggable.eo
+++ b/src/lib/efl/interfaces/efl_ui_draggable.eo
@@ -1,5 +1,5 @@
 /* FIXME: Edje Drag and this Dnd Draggable have confusingly similar names! */
-interface Efl.Ui.Draggable
+interface @beta Efl.Ui.Draggable
 {
   [[Efl UI draggable interface]]
   event_prefix: efl_ui;
diff --git a/src/lib/efl/interfaces/efl_ui_factory.eo b/src/lib/efl/interfaces/efl_ui_factory.eo
index 7b4356a04b..6f6735a6d9 100644
--- a/src/lib/efl/interfaces/efl_ui_factory.eo
+++ b/src/lib/efl/interfaces/efl_ui_factory.eo
@@ -4,7 +4,7 @@ struct Efl.Ui.Factory_Item_Created_Event {
   item: Efl.Gfx.Entity; [[The item that was just created.]]
 }
-interface Efl.Ui.Factory extends Efl.Ui.Property_Bind, Efl.Ui.Factory_Bind
+interface @beta Efl.Ui.Factory extends Efl.Ui.Property_Bind, Efl.Ui.Factory_Bind
 {
   [[Efl UI factory interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_ui_factory_bind.eo b/src/lib/efl/interfaces/efl_ui_factory_bind.eo
index 0e36b44f05..d26832453f 100644
--- a/src/lib/efl/interfaces/efl_ui_factory_bind.eo
+++ b/src/lib/efl/interfaces/efl_ui_factory_bind.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Factory_Bind
+interface @beta Efl.Ui.Factory_Bind
 {
   [[Efl UI Property interface.
     view object can have @Efl.Model and need to set cotent with those model stored data.
diff --git a/src/lib/efl/interfaces/efl_ui_format.eo b/src/lib/efl/interfaces/efl_ui_format.eo
index e78478e8bd..07e51ce28e 100644
--- a/src/lib/efl/interfaces/efl_ui_format.eo
+++ b/src/lib/efl/interfaces/efl_ui_format.eo
@@ -6,7 +6,7 @@ function Efl.Ui.Format_Func_Cb {
   }
 };
-mixin Efl.Ui.Format
+mixin @beta Efl.Ui.Format
 {
   [[interface class for format_func]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_ui_i18n.eo b/src/lib/efl/interfaces/efl_ui_i18n.eo
index 3dffa16c1e..ece81f6314 100644
--- a/src/lib/efl/interfaces/efl_ui_i18n.eo
+++ b/src/lib/efl/interfaces/efl_ui_i18n.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.I18n
+interface @beta Efl.Ui.I18n
 {
   [[A common Internationalization interface for UI objects.]]
   eo_prefix: efl_ui;
diff --git a/src/lib/efl/interfaces/efl_ui_menu.eo b/src/lib/efl/interfaces/efl_ui_menu.eo
index be4b6cb82f..699790ab49 100644
--- a/src/lib/efl/interfaces/efl_ui_menu.eo
+++ b/src/lib/efl/interfaces/efl_ui_menu.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Menu {
+interface @beta Efl.Ui.Menu {
   [[Efl UI menu interface]]
   legacy_prefix: null;
   methods {
diff --git a/src/lib/efl/interfaces/efl_ui_multi_selectable.eo b/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
index f8a95afeed..90c825f223 100644
--- a/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
@@ -9,7 +9,7 @@ enum Efl.Ui.Select_Mode {
   none [[Last value of select mode. child cannot be selected at all.]]
 }
-interface Efl.Ui.Multi_Selectable
+interface @beta Efl.Ui.Multi_Selectable
 {
   [[Efl UI Multi selectable interface.
     The container have to control select property of multiple chidren.]]
diff --git a/src/lib/efl/interfaces/efl_ui_property_bind.eo b/src/lib/efl/interfaces/efl_ui_property_bind.eo
index e709bd87c7..54ce4d9d26 100644
--- a/src/lib/efl/interfaces/efl_ui_property_bind.eo
+++ b/src/lib/efl/interfaces/efl_ui_property_bind.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Property_Bind
+interface @beta Efl.Ui.Property_Bind
 {
   [[Efl UI Property_Bind interface.
     view object can have @Efl.Model to manage the data,
diff --git a/src/lib/efl/interfaces/efl_ui_range_display.eo b/src/lib/efl/interfaces/efl_ui_range_display.eo
index 3a3891d5c4..ca9d2c1e1b 100644
--- a/src/lib/efl/interfaces/efl_ui_range_display.eo
+++ b/src/lib/efl/interfaces/efl_ui_range_display.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Range_Display
+interface @beta Efl.Ui.Range_Display
 {
   [[Interface that contains properties regarding the displaying of a range.]]
   eo_prefix: efl_ui_range;
diff --git a/src/lib/efl/interfaces/efl_ui_range_interactive.eo b/src/lib/efl/interfaces/efl_ui_range_interactive.eo
index d7114e8073..a7af8c8c8f 100644
--- a/src/lib/efl/interfaces/efl_ui_range_interactive.eo
+++ b/src/lib/efl/interfaces/efl_ui_range_interactive.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Range_Interactive extends Efl.Ui.Range_Display
+interface @beta Efl.Ui.Range_Interactive extends Efl.Ui.Range_Display
 {
   [[Interface that extends the normal displaying properties with usage properties.
diff --git a/src/lib/efl/interfaces/efl_ui_scrollable.eo b/src/lib/efl/interfaces/efl_ui_scrollable.eo
index b1284e5cd6..3b30a25ccb 100644
--- a/src/lib/efl/interfaces/efl_ui_scrollable.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollable.eo
@@ -12,7 +12,7 @@ enum Efl.Ui.Scroll_Block
   horizontal = 2 [[Block horizontal movement.]]
 }
-interface Efl.Ui.Scrollable
+interface @beta Efl.Ui.Scrollable
 {
   [[Efl UI scrollable interface]]
   event_prefix: efl_ui;
diff --git a/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo b/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
index 3e72ba4853..c5bbc1cceb 100644
--- a/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
@@ -1,6 +1,6 @@
 import eina_types;
-interface Efl.Ui.Scrollable_Interactive extends Efl.Ui.Scrollable
+interface @beta Efl.Ui.Scrollable_Interactive extends Efl.Ui.Scrollable
 {
   eo_prefix: efl_ui_scrollable;
   methods {
diff --git a/src/lib/efl/interfaces/efl_ui_scrollbar.eo b/src/lib/efl/interfaces/efl_ui_scrollbar.eo
index 46e1bad5fe..18b9e05d8b 100644
--- a/src/lib/efl/interfaces/efl_ui_scrollbar.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollbar.eo
@@ -12,7 +12,7 @@ enum Efl.Ui.Scrollbar_Direction
   vertical,
   last
 }
-interface Efl.Ui.Scrollbar
+interface @beta Efl.Ui.Scrollbar
 {
   methods {
      @property bar_mode {
diff --git a/src/lib/efl/interfaces/efl_ui_selectable.eo b/src/lib/efl/interfaces/efl_ui_selectable.eo
index 2d67ac018f..770e5e2132 100644
--- a/src/lib/efl/interfaces/efl_ui_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_selectable.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Selectable
+interface @beta Efl.Ui.Selectable
 {
   [[Efl UI selectable interface]]
   event_prefix: efl_ui;
diff --git a/src/lib/efl/interfaces/efl_ui_view.eo b/src/lib/efl/interfaces/efl_ui_view.eo
index 144b2fa660..33919d5c96 100644
--- a/src/lib/efl/interfaces/efl_ui_view.eo
+++ b/src/lib/efl/interfaces/efl_ui_view.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.View
+interface @beta Efl.Ui.View
 {
   [[Efl UI view interface]]
   methods {
diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo
index d719d3bfae..c053aec1b4 100644
--- a/src/lib/efl/interfaces/efl_ui_zoom.eo
+++ b/src/lib/efl/interfaces/efl_ui_zoom.eo
@@ -9,7 +9,7 @@ enum Efl.Ui.Zoom_Mode
   last [[Sentinel value to indicate last enum field during iteration]]
 }
-interface Efl.Ui.Zoom
+interface @beta Efl.Ui.Zoom
 {
   [[Efl UI zoom interface]]
   event_prefix: efl_ui;
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index 9ac9e637c9..8213591b87 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -21,7 +21,7 @@ function EflIoDirectInfo {
  }
 };
-class Efl.Io.Manager extends Efl.Loop_Consumer
+class @beta Efl.Io.Manager extends Efl.Loop_Consumer
 {
  [[Class representing an asynchronous file operation.]]
diff --git a/src/lib/eio/efl_io_model.eo b/src/lib/eio/efl_io_model.eo
index 9939a80f51..0d881fe6e2 100644
--- a/src/lib/eio/efl_io_model.eo
+++ b/src/lib/eio/efl_io_model.eo
@@ -9,7 +9,7 @@ function EflIoFilter {
  return: int;
 };
-class Efl.Io.Model extends Efl.Loop_Model
+class @beta Efl.Io.Model extends Efl.Loop_Model
 {
    [[Efl Io model class]]
diff --git a/src/lib/elementary/efl_access_action.eo b/src/lib/elementary/efl_access_action.eo
index 073a7a2f1b..94804b5081 100644
--- a/src/lib/elementary/efl_access_action.eo
+++ b/src/lib/elementary/efl_access_action.eo
@@ -1,6 +1,6 @@
 import efl_ui;
-mixin Efl.Access.Action
+mixin @beta Efl.Access.Action
 {
   [[Accessible action mixin]]
   data: null;
diff --git a/src/lib/elementary/efl_access_component.eo b/src/lib/elementary/efl_access_component.eo
index 3b5f561191..b18921b3fd 100644
--- a/src/lib/elementary/efl_access_component.eo
+++ b/src/lib/elementary/efl_access_component.eo
@@ -1,6 +1,6 @@
 import eina_types;
-mixin Efl.Access.Component extends Efl.Gfx.Entity, Efl.Gfx.Stack
+mixin @beta Efl.Access.Component extends Efl.Gfx.Entity, Efl.Gfx.Stack
 {
   [[AT-SPI component mixin]]
   data: null;
diff --git a/src/lib/elementary/efl_access_editable_text.eo b/src/lib/elementary/efl_access_editable_text.eo
index 126d8f7821..e780f0576f 100644
--- a/src/lib/elementary/efl_access_editable_text.eo
+++ b/src/lib/elementary/efl_access_editable_text.eo
@@ -1,4 +1,4 @@
-interface Efl.Access.Editable.Text
+interface @beta Efl.Access.Editable.Text
 {
   [[Elementary editable text interface]]
   methods {
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index 9a11511a9b..26ebcca586 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -239,7 +239,7 @@ struct Efl.Access.Relation
   objects: list<Efl.Object>; [[List with relation objects]]
 }
-mixin Efl.Access.Object requires Efl.Object
+mixin @beta Efl.Access.Object requires Efl.Object
 {
   [[Accessibility accessible mixin]]
   eo_prefix: efl_access_object;
diff --git a/src/lib/elementary/efl_access_selection.eo b/src/lib/elementary/efl_access_selection.eo
index ca9c4f085b..4f199ff73a 100644
--- a/src/lib/elementary/efl_access_selection.eo
+++ b/src/lib/elementary/efl_access_selection.eo
@@ -1,4 +1,4 @@
-interface Efl.Access.Selection
+interface @beta Efl.Access.Selection
 {
   [[Elementary access selection interface]]
   methods {
diff --git a/src/lib/elementary/efl_access_text.eo b/src/lib/elementary/efl_access_text.eo
index 6226af90ee..d49e0d372b 100644
--- a/src/lib/elementary/efl_access_text.eo
+++ b/src/lib/elementary/efl_access_text.eo
@@ -44,7 +44,7 @@ struct Efl.Access.Text_Change_Info
   len: size; [[Change length]]
 }
-interface Efl.Access.Text
+interface @beta Efl.Access.Text
 {
   [[Elementary accessible text interface]]
   methods {
diff --git a/src/lib/elementary/efl_access_value.eo b/src/lib/elementary/efl_access_value.eo
index 43d6d219b8..4ab0a7b35e 100644
--- a/src/lib/elementary/efl_access_value.eo
+++ b/src/lib/elementary/efl_access_value.eo
@@ -1,4 +1,4 @@
-interface Efl.Access.Value
+interface @beta Efl.Access.Value
 {
   [[Elementary Access value interface]]
   methods {
diff --git a/src/lib/elementary/efl_access_widget_action.eo b/src/lib/elementary/efl_access_widget_action.eo
index da381591af..58f795948f 100644
--- a/src/lib/elementary/efl_access_widget_action.eo
+++ b/src/lib/elementary/efl_access_widget_action.eo
@@ -1,6 +1,6 @@
 import efl_ui;
-mixin Efl.Access.Widget.Action extends Efl.Access.Action
+mixin @beta Efl.Access.Widget.Action extends Efl.Access.Action
 {
   [[Access widget action mixin]]
   data: null;
diff --git a/src/lib/elementary/efl_access_window.eo b/src/lib/elementary/efl_access_window.eo
index 9422b1b5a0..12c00a81ef 100644
--- a/src/lib/elementary/efl_access_window.eo
+++ b/src/lib/elementary/efl_access_window.eo
@@ -1,4 +1,4 @@
-interface Efl.Access.Window
+interface @beta Efl.Access.Window
 {
   [[Elementary accessible window interface]]
   events {
diff --git a/src/lib/elementary/efl_config_global.eo b/src/lib/elementary/efl_config_global.eo
index aba9adedb4..5ec518a8a6 100644
--- a/src/lib/elementary/efl_config_global.eo
+++ b/src/lib/elementary/efl_config_global.eo
@@ -1,4 +1,4 @@
-class Efl.Config_Global extends Efl.Object implements Efl.Config
+class @beta Efl.Config_Global extends Efl.Object implements Efl.Config
 {
   [[This class is a singleton representing the global configuration for the
     running application.
diff --git a/src/lib/elementary/efl_datetime_manager.eo b/src/lib/elementary/efl_datetime_manager.eo
index 194c6bd546..3368fdcdc5 100644
--- a/src/lib/elementary/efl_datetime_manager.eo
+++ b/src/lib/elementary/efl_datetime_manager.eo
@@ -1,6 +1,6 @@
 import efl_types;
-class Efl.Datetime.Manager extends Efl.Object
+class @beta Efl.Datetime.Manager extends Efl.Object
 {
   [[Efl datetime manager class for Datepicker and Timepicker]]
   methods {
diff --git a/src/lib/elementary/efl_page_indicator.eo b/src/lib/elementary/efl_page_indicator.eo
index a3602438cb..be03c56433 100644
--- a/src/lib/elementary/efl_page_indicator.eo
+++ b/src/lib/elementary/efl_page_indicator.eo
@@ -1,4 +1,4 @@
-class Efl.Page.Indicator extends Efl.Object
+class @beta Efl.Page.Indicator extends Efl.Object
 {
   [[Page indicator
diff --git a/src/lib/elementary/efl_page_indicator_icon.eo b/src/lib/elementary/efl_page_indicator_icon.eo
index d6b8ec93f1..1af3bdc397 100644
--- a/src/lib/elementary/efl_page_indicator_icon.eo
+++ b/src/lib/elementary/efl_page_indicator_icon.eo
@@ -1,4 +1,4 @@
-class Efl.Page.Indicator_Icon extends Efl.Page.Indicator
+class @beta Efl.Page.Indicator_Icon extends Efl.Page.Indicator
 {
   [[Icon type page indicator
diff --git a/src/lib/elementary/efl_page_transition.eo b/src/lib/elementary/efl_page_transition.eo
index bf67b7ea7b..5f97951b0e 100644
--- a/src/lib/elementary/efl_page_transition.eo
+++ b/src/lib/elementary/efl_page_transition.eo
@@ -1,4 +1,4 @@
-class Efl.Page.Transition extends Efl.Object
+class @beta Efl.Page.Transition extends Efl.Object
 {
   [[Page transition for @Efl.Ui.Pager
diff --git a/src/lib/elementary/efl_page_transition_scroll.eo b/src/lib/elementary/efl_page_transition_scroll.eo
index 2575a507fe..e9af63b224 100644
--- a/src/lib/elementary/efl_page_transition_scroll.eo
+++ b/src/lib/elementary/efl_page_transition_scroll.eo
@@ -1,4 +1,4 @@
-class Efl.Page.Transition_Scroll extends Efl.Page.Transition
+class @beta Efl.Page.Transition_Scroll extends Efl.Page.Transition
 {
   [[Page transition for @Efl.Ui.Pager
diff --git a/src/lib/elementary/efl_text_interactive.eo b/src/lib/elementary/efl_text_interactive.eo
index 0cb4d6f766..8d2d444a34 100644
--- a/src/lib/elementary/efl_text_interactive.eo
+++ b/src/lib/elementary/efl_text_interactive.eo
@@ -1,6 +1,6 @@
 import efl_text_types;
-interface Efl.Text_Interactive extends Efl.Text, Efl.Text_Font,
+interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text_Font,
   Efl.Text_Format, Efl.Text_Style
 {
   [[This is an interface interactive text inputs should implement]]
diff --git a/src/lib/elementary/efl_ui_alert_popup.eo b/src/lib/elementary/efl_ui_alert_popup.eo
index fdcb6eb86f..9b2e911592 100644
--- a/src/lib/elementary/efl_ui_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_alert_popup.eo
@@ -10,7 +10,7 @@ struct Efl.Ui.Alert_Popup_Button_Clicked_Event {
   button_type: Efl.Ui.Alert_Popup_Button; [[Clicked button type]]
 }
-class Efl.Ui.Alert_Popup extends Efl.Ui.Popup
+class @beta Efl.Ui.Alert_Popup extends Efl.Ui.Popup
 {
   [[EFL UI Alert Popup class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_alert_popup_part.eo b/src/lib/elementary/efl_ui_alert_popup_part.eo
index 41e00d05c7..b5860a99ff 100644
--- a/src/lib/elementary/efl_ui_alert_popup_part.eo
+++ b/src/lib/elementary/efl_ui_alert_popup_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Alert_Popup_Part extends Efl.Ui.Layout_Part_Text
+class @beta Efl.Ui.Alert_Popup_Part extends Efl.Ui.Layout_Part_Text
 {
   [[Efl UI Alert Popup internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_anchor_popup.eo b/src/lib/elementary/efl_ui_anchor_popup.eo
index 1f8ab61651..85b81c80e3 100644
--- a/src/lib/elementary/efl_ui_anchor_popup.eo
+++ b/src/lib/elementary/efl_ui_anchor_popup.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Anchor_Popup extends Efl.Ui.Popup
+class @beta Efl.Ui.Anchor_Popup extends Efl.Ui.Popup
 {
   [[EFL UI Anchor Popup class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_average_model.eo b/src/lib/elementary/efl_ui_average_model.eo
index 16831e7af6..98d97598f8 100644
--- a/src/lib/elementary/efl_ui_average_model.eo
+++ b/src/lib/elementary/efl_ui_average_model.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Average_Model extends Efl.Ui.Exact_Model
+class @beta Efl.Ui.Average_Model extends Efl.Ui.Exact_Model
 {
   [[Class to be used to store object item size for List/Grid View.
diff --git a/src/lib/elementary/efl_ui_bg.eo b/src/lib/elementary/efl_ui_bg.eo
index 26b16437ab..b928549fef 100644
--- a/src/lib/elementary/efl_ui_bg.eo
+++ b/src/lib/elementary/efl_ui_bg.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Bg extends Efl.Ui.Layout implements Efl.Gfx.Color, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller
+class @beta Efl.Ui.Bg extends Efl.Ui.Layout implements Efl.Gfx.Color, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller
 {
   [[The bg (background) widget is used for setting (solid) background decorations
   for a window (unless it has transparency enabled) or for any container object. It
diff --git a/src/lib/elementary/efl_ui_bg_legacy.eo b/src/lib/elementary/efl_ui_bg_legacy.eo
index 7ab9aab3b4..cc681b0b8e 100644
--- a/src/lib/elementary/efl_ui_bg_legacy.eo
+++ b/src/lib/elementary/efl_ui_bg_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Bg_Legacy extends Efl.Ui.Bg implements Efl.Ui.Legacy
+class @beta Efl.Ui.Bg_Legacy extends Efl.Ui.Bg implements Efl.Ui.Legacy
 {
   [[The bg (background) widget is used for setting (solid) background decorations
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index fddf253d90..164bdb8879 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pack_Layout,
+class @beta Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pack_Layout,
                  Efl.Ui.Direction
 {
   [[The box widget.
diff --git a/src/lib/elementary/efl_ui_box_flow.eo b/src/lib/elementary/efl_ui_box_flow.eo
index 82e5bdbdfe..3ba120b6fb 100644
--- a/src/lib/elementary/efl_ui_box_flow.eo
+++ b/src/lib/elementary/efl_ui_box_flow.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Box_Flow extends Efl.Ui.Box
+class @beta Efl.Ui.Box_Flow extends Efl.Ui.Box
 {
   [[A custom layout engine for @Efl.Ui.Box.]]
   methods {
diff --git a/src/lib/elementary/efl_ui_box_stack.eo b/src/lib/elementary/efl_ui_box_stack.eo
index 7d2ebfbbee..61035b45f9 100644
--- a/src/lib/elementary/efl_ui_box_stack.eo
+++ b/src/lib/elementary/efl_ui_box_stack.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Box_Stack extends Efl.Ui.Box
+class @beta Efl.Ui.Box_Stack extends Efl.Ui.Box
 {
   [[A custom layout engine for @Efl.Ui.Box that stacks items.
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index adb22ba3dc..ff79209e27 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
+class @beta Efl.Ui.Button extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
                     Efl.Text, Efl.Content,
                     Efl.Access.Widget.Action
 {
diff --git a/src/lib/elementary/efl_ui_button_legacy.eo b/src/lib/elementary/efl_ui_button_legacy.eo
index acb2c8d7ac..557704b9d2 100644
--- a/src/lib/elementary/efl_ui_button_legacy.eo
+++ b/src/lib/elementary/efl_ui_button_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button_Legacy extends Efl.Ui.Button implements Efl.Ui.Legacy
+class @beta Efl.Ui.Button_Legacy extends Efl.Ui.Button implements Efl.Ui.Legacy
 {
   [[Push-button widget
diff --git a/src/lib/elementary/efl_ui_button_legacy_part.eo b/src/lib/elementary/efl_ui_button_legacy_part.eo
index baa055146e..0d7c7c9967 100644
--- a/src/lib/elementary/efl_ui_button_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_button_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button_Legacy_Part extends Efl.Ui.Layout_Part_Content
+class @beta Efl.Ui.Button_Legacy_Part extends Efl.Ui.Layout_Part_Content
 {
   [[Elementary button internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_caching_factory.eo b/src/lib/elementary/efl_ui_caching_factory.eo
index ee53983a54..266ea5803d 100644
--- a/src/lib/elementary/efl_ui_caching_factory.eo
+++ b/src/lib/elementary/efl_ui_caching_factory.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Caching_Factory extends Efl.Ui.Widget_Factory
+class @beta Efl.Ui.Caching_Factory extends Efl.Ui.Widget_Factory
 {
   [[Efl Ui Factory that provides object caching.
diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo
index 78bc2b4a38..33547507da 100644
--- a/src/lib/elementary/efl_ui_calendar.eo
+++ b/src/lib/elementary/efl_ui_calendar.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Calendar_Weekday
   last  [[Sentinel value to indicate last enum field during iteration]]
 }
-class Efl.Ui.Calendar extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format
+class @beta Efl.Ui.Calendar extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format
 {
   [[Calendar widget
diff --git a/src/lib/elementary/efl_ui_calendar_item.eo b/src/lib/elementary/efl_ui_calendar_item.eo
index ad235e0332..2dcd80a613 100644
--- a/src/lib/elementary/efl_ui_calendar_item.eo
+++ b/src/lib/elementary/efl_ui_calendar_item.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Calendar_Item extends Efl.Object implements Efl.Ui.Focus.Object
+class @beta Efl.Ui.Calendar_Item extends Efl.Object implements Efl.Ui.Focus.Object
 {
    [[EFL UI Calendar Item class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo
index b6ea04f879..19d77613a1 100644
--- a/src/lib/elementary/efl_ui_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Check extends Efl.Ui.Nstate implements Efl.Access.Widget.Action
+class @beta Efl.Ui.Check extends Efl.Ui.Nstate implements Efl.Access.Widget.Action
 {
   [[Check widget
diff --git a/src/lib/elementary/efl_ui_check_legacy.eo b/src/lib/elementary/efl_ui_check_legacy.eo
index 9486bf608f..f16ded2435 100644
--- a/src/lib/elementary/efl_ui_check_legacy.eo
+++ b/src/lib/elementary/efl_ui_check_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Check_Legacy extends Efl.Ui.Check implements Efl.Ui.Legacy
+class @beta Efl.Ui.Check_Legacy extends Efl.Ui.Check implements Efl.Ui.Legacy
 {
   [[Check widget
diff --git a/src/lib/elementary/efl_ui_check_legacy_part.eo b/src/lib/elementary/efl_ui_check_legacy_part.eo
index b856f08f12..afd8703716 100644
--- a/src/lib/elementary/efl_ui_check_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_check_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Check_Legacy_Part extends Efl.Ui.Layout_Part_Content
+class @beta Efl.Ui.Check_Legacy_Part extends Efl.Ui.Layout_Part_Content
 {
   [[Elementary check internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 678b210af2..767f8b2b7d 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Clock_Type
   ampm    = 7, [[Indicates AM/PM field .]]
 }
-class Efl.Ui.Clock extends Efl.Ui.Layout
+class @beta Efl.Ui.Clock extends Efl.Ui.Layout
 {
   [[Efl UI clock class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_clock_legacy.eo b/src/lib/elementary/efl_ui_clock_legacy.eo
index 463af9676e..acc7cea33c 100644
--- a/src/lib/elementary/efl_ui_clock_legacy.eo
+++ b/src/lib/elementary/efl_ui_clock_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Clock_Legacy extends Efl.Ui.Clock implements Efl.Ui.Legacy
+class @beta Efl.Ui.Clock_Legacy extends Efl.Ui.Clock implements Efl.Ui.Legacy
 {
   [[Efl UI clock class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_cursor.eo b/src/lib/elementary/efl_ui_cursor.eo
index a172e533f7..4c14411bd4 100644
--- a/src/lib/elementary/efl_ui_cursor.eo
+++ b/src/lib/elementary/efl_ui_cursor.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Cursor
+interface @beta Efl.Ui.Cursor
 {
   [[An interface to define mouse cursors to use when hovering
     over UI widgets.
diff --git a/src/lib/elementary/efl_ui_datepicker.eo b/src/lib/elementary/efl_ui_datepicker.eo
index 81d9b1634e..4225c28e75 100644
--- a/src/lib/elementary/efl_ui_datepicker.eo
+++ b/src/lib/elementary/efl_ui_datepicker.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Datepicker extends Efl.Ui.Layout
+class @beta Efl.Ui.Datepicker extends Efl.Ui.Layout
 {
   [[Datepicker widget
diff --git a/src/lib/elementary/efl_ui_dnd.eo b/src/lib/elementary/efl_ui_dnd.eo
index a4ea5e9b78..08f668856b 100644
--- a/src/lib/elementary/efl_ui_dnd.eo
+++ b/src/lib/elementary/efl_ui_dnd.eo
@@ -1,6 +1,6 @@
 import efl_ui_dnd_types;
-mixin Efl.Ui.Dnd {
+mixin @beta Efl.Ui.Dnd {
   data: null;
   methods {
      drag_start {
diff --git a/src/lib/elementary/efl_ui_dnd_container.eo b/src/lib/elementary/efl_ui_dnd_container.eo
index ee1e727a4a..05eccfeef8 100644
--- a/src/lib/elementary/efl_ui_dnd_container.eo
+++ b/src/lib/elementary/efl_ui_dnd_container.eo
@@ -1,6 +1,6 @@
 import efl_ui_dnd_types;
-mixin Efl.Ui.Dnd_Container {
+mixin @beta Efl.Ui.Dnd_Container {
   methods {
      @property drag_delay_time {
         [[The time since mouse down happens to drag starts.]]
diff --git a/src/lib/elementary/efl_ui_exact_model.eo b/src/lib/elementary/efl_ui_exact_model.eo
index 0a91e21023..691a7504ef 100644
--- a/src/lib/elementary/efl_ui_exact_model.eo
+++ b/src/lib/elementary/efl_ui_exact_model.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Exact_Model extends Efl.Ui.Size_Model
+class @beta Efl.Ui.Exact_Model extends Efl.Ui.Size_Model
 {
   [[Class to be used to store object item size for List/Grid View.
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index 80999e0cda..ac233a1fbe 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -28,7 +28,7 @@ enum Efl.Ui.Flip_Interaction
   page [[Page interaction]]
 }
-class Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
+class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
 {
   [[Efl UI flip class]]
   legacy_prefix: elm_flip;
diff --git a/src/lib/elementary/efl_ui_flip_legacy.eo b/src/lib/elementary/efl_ui_flip_legacy.eo
index c19762fe56..19eb088d28 100644
--- a/src/lib/elementary/efl_ui_flip_legacy.eo
+++ b/src/lib/elementary/efl_ui_flip_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Flip_Legacy extends Efl.Ui.Flip implements Efl.Ui.Legacy
+class @beta Efl.Ui.Flip_Legacy extends Efl.Ui.Flip implements Efl.Ui.Legacy
 {
   [[Efl UI flip class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_flip_part.eo b/src/lib/elementary/efl_ui_flip_part.eo
index 84c3b0f1fb..f0b06442fc 100644
--- a/src/lib/elementary/efl_ui_flip_part.eo
+++ b/src/lib/elementary/efl_ui_flip_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Flip_Part extends Efl.Ui.Widget_Part implements Efl.Content
+class @beta Efl.Ui.Flip_Part extends Efl.Ui.Widget_Part implements Efl.Content
 {
   [[Efl UI flip internal class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_focus_composition.eo b/src/lib/elementary/efl_ui_focus_composition.eo
index 120867e53a..3fb5a360dc 100644
--- a/src/lib/elementary/efl_ui_focus_composition.eo
+++ b/src/lib/elementary/efl_ui_focus_composition.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Focus.Composition requires Efl.Ui.Widget {
+mixin @beta Efl.Ui.Focus.Composition requires Efl.Ui.Widget {
   [[This defines the inheriting widget as Composition widget.
     A composition widget is a widget that's the logical parent of another set of widgets which can be used for interaction.
diff --git a/src/lib/elementary/efl_ui_focus_composition_adapter.eo b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
index bb4e81c222..118f4a3a2a 100644
--- a/src/lib/elementary/efl_ui_focus_composition_adapter.eo
+++ b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Composition_Adapter extends Efl.Object implements Efl.Ui.Focus.Object
+class @beta Efl.Ui.Focus.Composition_Adapter extends Efl.Object implements Efl.Ui.Focus.Object
 {
   [[EFL UI Focus Composition Adapter class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_focus_layer.eo b/src/lib/elementary/efl_ui_focus_layer.eo
index 92145ae29c..fd177caf62 100644
--- a/src/lib/elementary/efl_ui_focus_layer.eo
+++ b/src/lib/elementary/efl_ui_focus_layer.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Focus.Layer requires Efl.Ui.Widget extends Efl.Ui.Widget_Focus_Manager {
+mixin @beta Efl.Ui.Focus.Layer requires Efl.Ui.Widget extends Efl.Ui.Widget_Focus_Manager {
   [[This defines the inheriting widget as focus layer
     A focus layer is the uppermost one which received input and handles all focus related events for as long as it exists and is visible. It's NOT possible to escape this layer with focus movement.
diff --git a/src/lib/elementary/efl_ui_focus_manager.eo b/src/lib/elementary/efl_ui_focus_manager.eo
index 425ad9de67..2d777bfa02 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; [[Focus object element]]
 }
-interface Efl.Ui.Focus.Manager {
+interface @beta Efl.Ui.Focus.Manager {
    [[Calculates the directions of Efl.Ui.Focus.Direction
      Each registered item will get a other registered object into each
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.eo b/src/lib/elementary/efl_ui_focus_manager_calc.eo
index 19212c7c87..72f0a2299b 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus.Manager {
+class @beta Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus.Manager {
    [[Calculates the directions of Efl.Ui.Focus.Direction
      Each registered item will get an other registered object in each
diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
index 14f0f3a43a..64b4d83695 100644
--- a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Manager_Root_Focus extends Efl.Ui.Focus.Manager_Calc  {
+class @beta Efl.Ui.Focus.Manager_Root_Focus extends Efl.Ui.Focus.Manager_Calc  {
  [[ This class ensures that the root is at least focusable, if nothing else is focusable]]
  methods {
     @property canvas_object {
diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.eo b/src/lib/elementary/efl_ui_focus_manager_sub.eo
index a2414d43eb..79e06c86ff 100644
--- a/src/lib/elementary/efl_ui_focus_manager_sub.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_sub.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Focus.Manager_Sub requires Efl.Object extends Efl.Ui.Focus.Manager
+mixin @beta Efl.Ui.Focus.Manager_Sub requires Efl.Object extends Efl.Ui.Focus.Manager
 {
    [[A class that automatically registers its border elements in the parent manager
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 201e3bffc1..18eed60eda 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 Efl.Ui.Focus.Manager_Window_Root {
+interface @beta 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 1ac6e0fd36..451e0b314a 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 Efl.Ui.Focus.Object
+mixin @beta Efl.Ui.Focus.Object
 {
    [[Functions of focusable objects.
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider.eo b/src/lib/elementary/efl_ui_focus_parent_provider.eo
index 04fa38ae31..7e33027da5 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider.eo
+++ b/src/lib/elementary/efl_ui_focus_parent_provider.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Focus.Parent_Provider {
+interface @beta Efl.Ui.Focus.Parent_Provider {
   [[EFL UI Focus Parent Provider interface]]
   methods {
      find_logical_parent {
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
index 3bb66972d2..8cf0135610 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Parent_Provider_Gen extends Efl.Object implements Efl.Ui.Focus.Parent_Provider {
+class @beta Efl.Ui.Focus.Parent_Provider_Gen extends Efl.Object implements Efl.Ui.Focus.Parent_Provider {
   [[EFL UI Focus Parent Provider Gen class]]
   methods {
      @property content_item_map {
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo b/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
index d9d38b5301..40cce41449 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Parent_Provider_Standard extends Efl.Object implements Efl.Ui.Focus.Parent_Provider {
+class @beta Efl.Ui.Focus.Parent_Provider_Standard extends Efl.Object implements Efl.Ui.Focus.Parent_Provider {
   [[EFL UI Focus Parent Provider Standard Class]]
   implements {
      Efl.Ui.Focus.Parent_Provider.find_logical_parent;
diff --git a/src/lib/elementary/efl_ui_focus_util.eo b/src/lib/elementary/efl_ui_focus_util.eo
index 4724dccc47..c19c05cb18 100644
--- a/src/lib/elementary/efl_ui_focus_util.eo
+++ b/src/lib/elementary/efl_ui_focus_util.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Util extends Efl.Object  {
+class @beta Efl.Ui.Focus.Util extends Efl.Object  {
   [[EFL UI Focus Util class]]
   methods {
      focus @class {
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index af6b59278a..853c7a72c2 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Frame extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
+class @beta Efl.Ui.Frame extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
                    Efl.Content
 {
   [[Frame widget
diff --git a/src/lib/elementary/efl_ui_frame_legacy.eo b/src/lib/elementary/efl_ui_frame_legacy.eo
index fb21570094..bb8dd99653 100644
--- a/src/lib/elementary/efl_ui_frame_legacy.eo
+++ b/src/lib/elementary/efl_ui_frame_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Frame_Legacy extends Efl.Ui.Frame implements Efl.Ui.Legacy
+class @beta Efl.Ui.Frame_Legacy extends Efl.Ui.Frame implements Efl.Ui.Legacy
 {
   [[Frame widget
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index 293eacf11e..4b61a52e13 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -1,6 +1,6 @@
 import efl_ui_grid_item;
-class Efl.Ui.Grid extends Efl.Ui.Layout implements
+class @beta Efl.Ui.Grid extends Efl.Ui.Layout implements
                   Efl.Ui.Scrollable_Interactive,
                   Efl.Ui.Scrollbar,
                   Efl.Pack_Linear, Efl.Pack_Layout,
diff --git a/src/lib/elementary/efl_ui_grid_default_item.eo b/src/lib/elementary/efl_ui_grid_default_item.eo
index c0f5862484..625482ed82 100644
--- a/src/lib/elementary/efl_ui_grid_default_item.eo
+++ b/src/lib/elementary/efl_ui_grid_default_item.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Grid_Default_Item extends Efl.Ui.Grid_Item implements
+class @beta Efl.Ui.Grid_Default_Item extends Efl.Ui.Grid_Item implements
                                Efl.Text,
                                Efl.Text_Markup,
                                Efl.Ui.L10n,
diff --git a/src/lib/elementary/efl_ui_grid_default_item_part_end.eo b/src/lib/elementary/efl_ui_grid_default_item_part_end.eo
index 66ebd2a1a7..dc3b6dfbbb 100644
--- a/src/lib/elementary/efl_ui_grid_default_item_part_end.eo
+++ b/src/lib/elementary/efl_ui_grid_default_item_part_end.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Grid_Default_Item_Part_End extends Efl.Ui.Layout_Part implements Efl.Content
+class @beta Efl.Ui.Grid_Default_Item_Part_End extends Efl.Ui.Layout_Part implements Efl.Content
 {
   [[Grid Default Item internal content of end part class]]
        data: null;
diff --git a/src/lib/elementary/efl_ui_grid_default_item_part_icon.eo b/src/lib/elementary/efl_ui_grid_default_item_part_icon.eo
index 4dede025b6..47e290bace 100644
--- a/src/lib/elementary/efl_ui_grid_default_item_part_icon.eo
+++ b/src/lib/elementary/efl_ui_grid_default_item_part_icon.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Grid_Default_Item_Part_Icon extends Efl.Ui.Layout_Part implements Efl.Content
+class @beta Efl.Ui.Grid_Default_Item_Part_Icon extends Efl.Ui.Layout_Part implements Efl.Content
 {
   [[Grid Default Item internal content of icon part class]]
        data: null;
diff --git a/src/lib/elementary/efl_ui_grid_item.eo b/src/lib/elementary/efl_ui_grid_item.eo
index f430cab123..99a4abca01 100644
--- a/src/lib/elementary/efl_ui_grid_item.eo
+++ b/src/lib/elementary/efl_ui_grid_item.eo
@@ -1,5 +1,5 @@
-abstract Efl.Ui.Grid_Item extends Efl.Ui.Item
+abstract @beta Efl.Ui.Grid_Item extends Efl.Ui.Item
 {
   implements {
      //Efl.Object
diff --git a/src/lib/elementary/efl_ui_homogeneous_model.eo b/src/lib/elementary/efl_ui_homogeneous_model.eo
index 4a82f6cf66..996c1ac364 100644
--- a/src/lib/elementary/efl_ui_homogeneous_model.eo
+++ b/src/lib/elementary/efl_ui_homogeneous_model.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Homogeneous_Model extends Efl.Ui.Size_Model
+class @beta Efl.Ui.Homogeneous_Model extends Efl.Ui.Size_Model
 {
   [[Class to be used to store object item size for List/Grid View.
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 8cdc14ff5b..7a19d04b8f 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -18,7 +18,7 @@ struct Efl.Ui.Image_Error
   open_error: bool; [[$true if the error happened when opening the file, $false otherwise]]
 }
-class Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.Ui.Draggable,
+class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.Ui.Draggable,
                 Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View,
                 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
                 Efl.Orientation,
diff --git a/src/lib/elementary/efl_ui_image_factory.eo b/src/lib/elementary/efl_ui_image_factory.eo
index 884fb9099c..5ebcc1cd32 100644
--- a/src/lib/elementary/efl_ui_image_factory.eo
+++ b/src/lib/elementary/efl_ui_image_factory.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Image_Factory extends Efl.Ui.Caching_Factory
+class @beta Efl.Ui.Image_Factory extends Efl.Ui.Caching_Factory
 {
   [[Efl UI image factory class]]
   implements {
diff --git a/src/lib/elementary/efl_ui_image_legacy.eo b/src/lib/elementary/efl_ui_image_legacy.eo
index 15a3005746..1e9b90cc64 100644
--- a/src/lib/elementary/efl_ui_image_legacy.eo
+++ b/src/lib/elementary/efl_ui_image_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Image_Legacy extends Efl.Ui.Image implements Efl.Ui.Legacy
+class @beta Efl.Ui.Image_Legacy extends Efl.Ui.Image implements Efl.Ui.Legacy
 {
   [[ Efl UI image class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index b22c45c110..1c458e1cd6 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -2,7 +2,7 @@
 struct @extern Elm.Photocam.Error;
 struct @extern Elm.Photocam.Progress;
-class Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
+class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
                             Efl.Ui.Scrollable_Interactive,
                             Efl.Ui.Scrollbar
 {
diff --git a/src/lib/elementary/efl_ui_image_zoomable_legacy.eo b/src/lib/elementary/efl_ui_image_zoomable_legacy.eo
index 233d9ad95e..b1a41977be 100644
--- a/src/lib/elementary/efl_ui_image_zoomable_legacy.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Image_Zoomable_Legacy extends Efl.Ui.Image_Zoomable implements Efl.Ui.Legacy
+class @beta Efl.Ui.Image_Zoomable_Legacy extends Efl.Ui.Image_Zoomable implements Efl.Ui.Legacy
 {
   [[Elementary Image Zoomable class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_image_zoomable_pan.eo b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
index 4cb307e04e..792f1a9a2f 100644
--- a/src/lib/elementary/efl_ui_image_zoomable_pan.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Image_Zoomable_Pan extends Efl.Ui.Pan
+class @beta Efl.Ui.Image_Zoomable_Pan extends Efl.Ui.Pan
 {
   [[Elementary photocom pan class]]
   legacy_prefix: elm_photocam_pan;
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index f3505140ae..a7bf52293c 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Text implements Efl.Text_Interactive
+class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Text implements Efl.Text_Interactive
 {
   [[An internal object in charge of the interactive aspect of the text widget.
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.eo b/src/lib/elementary/efl_ui_internal_text_scroller.eo
index bc9b33e86e..4b46694b6b 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.eo
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.eo
@@ -5,7 +5,7 @@ enum Efl.Ui.Text_Scroller_Mode
   multiline = 1,
 }
-class Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
+class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
 {
   [[Internal-usage text scroller class.
diff --git a/src/lib/elementary/efl_ui_item.eo b/src/lib/elementary/efl_ui_item.eo
index e3ba8afa33..f2a85b6aeb 100644
--- a/src/lib/elementary/efl_ui_item.eo
+++ b/src/lib/elementary/efl_ui_item.eo
@@ -1,4 +1,4 @@
-abstract Efl.Ui.Item extends Efl.Ui.Layout implements Efl.Ui.Selectable, Efl.Ui.Clickable
+abstract @beta Efl.Ui.Item extends Efl.Ui.Layout implements Efl.Ui.Selectable, Efl.Ui.Clickable
 {
   [[Item abstract class for pack widget. All item have to be inherited from this class.]]
   methods {
diff --git a/src/lib/elementary/efl_ui_l10n.eo b/src/lib/elementary/efl_ui_l10n.eo
index 5275759262..8eec6e12d4 100644
--- a/src/lib/elementary/efl_ui_l10n.eo
+++ b/src/lib/elementary/efl_ui_l10n.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.L10n
+interface @beta Efl.Ui.L10n
 {
   [[Interface for all translatable text APIs.
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index b1855cfcd0..350fac560c 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 Efl.Ui.Layout extends Efl.Ui.Widget implements Efl.Container, Efl.File,
+class @beta Efl.Ui.Layout extends Efl.Ui.Widget implements Efl.Container, Efl.File,
                     Efl.Ui.View, Efl.Ui.Property_Bind, Efl.Ui.Factory_Bind,
                     Efl.Layout.Calc, Efl.Layout.Signal,
                     Efl.Layout.Group
diff --git a/src/lib/elementary/efl_ui_layout_factory.eo b/src/lib/elementary/efl_ui_layout_factory.eo
index 75ced32ed7..b31486db02 100644
--- a/src/lib/elementary/efl_ui_layout_factory.eo
+++ b/src/lib/elementary/efl_ui_layout_factory.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Factory extends Efl.Ui.Caching_Factory
+class @beta Efl.Ui.Layout_Factory extends Efl.Ui.Caching_Factory
 {
   [[Efl Ui Layout Factory class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_layout_legacy.eo b/src/lib/elementary/efl_ui_layout_legacy.eo
index ca16e604c8..6f43fc18e7 100644
--- a/src/lib/elementary/efl_ui_layout_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Legacy extends Efl.Ui.Layout implements Efl.Ui.Legacy
+class @beta Efl.Ui.Layout_Legacy extends Efl.Ui.Layout implements Efl.Ui.Legacy
 {
   [[Elementary layout class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part.eo b/src/lib/elementary/efl_ui_layout_part.eo
index 9dad61e75f..50a6c4728c 100644
--- a/src/lib/elementary/efl_ui_layout_part.eo
+++ b/src/lib/elementary/efl_ui_layout_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part extends Efl.Ui.Widget_Part implements Efl.Ui.Cursor
+class @beta Efl.Ui.Layout_Part extends Efl.Ui.Widget_Part implements Efl.Ui.Cursor
 {
   [[Elementary layout internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_bg.eo b/src/lib/elementary/efl_ui_layout_part_bg.eo
index dff060f9bd..f1404d2c10 100644
--- a/src/lib/elementary/efl_ui_layout_part_bg.eo
+++ b/src/lib/elementary/efl_ui_layout_part_bg.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Bg extends Efl.Ui.Widget_Part_Bg
+class @beta Efl.Ui.Layout_Part_Bg extends Efl.Ui.Widget_Part_Bg
 {
   [[Elementary layout internal part background class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo
index 799fc7c752..3f19196898 100644
--- a/src/lib/elementary/efl_ui_layout_part_box.eo
+++ b/src/lib/elementary/efl_ui_layout_part_box.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Box extends Efl.Object implements Efl.Pack_Linear,
+class @beta Efl.Ui.Layout_Part_Box extends Efl.Object implements Efl.Pack_Linear,
                              Efl.Ui.Direction_Readonly
 {
   [[Represents a Box created as part of a layout.
diff --git a/src/lib/elementary/efl_ui_layout_part_content.eo b/src/lib/elementary/efl_ui_layout_part_content.eo
index c09d075d40..923033dd4e 100644
--- a/src/lib/elementary/efl_ui_layout_part_content.eo
+++ b/src/lib/elementary/efl_ui_layout_part_content.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Content extends Efl.Ui.Layout_Part implements Efl.Content
+class @beta Efl.Ui.Layout_Part_Content extends Efl.Ui.Layout_Part implements Efl.Content
 {
   [[Elementary layout internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_legacy.eo b/src/lib/elementary/efl_ui_layout_part_legacy.eo
index af6279eea2..3137a43b6d 100644
--- a/src/lib/elementary/efl_ui_layout_part_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_part_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Legacy extends Efl.Ui.Layout_Part implements Efl.Content, Efl.Text,
+class @beta Efl.Ui.Layout_Part_Legacy extends Efl.Ui.Layout_Part implements Efl.Content, Efl.Text,
                                 Efl.Text_Markup, Efl.Ui.L10n
 {
   [[Elementary layout internal part class]]
diff --git a/src/lib/elementary/efl_ui_layout_part_table.eo b/src/lib/elementary/efl_ui_layout_part_table.eo
index db6ce0836d..a2d580de6c 100644
--- a/src/lib/elementary/efl_ui_layout_part_table.eo
+++ b/src/lib/elementary/efl_ui_layout_part_table.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Table extends Efl.Object implements Efl.Pack_Table
+class @beta Efl.Ui.Layout_Part_Table extends Efl.Object implements Efl.Pack_Table
 {
   [[Represents a Table created as part of a layout.
diff --git a/src/lib/elementary/efl_ui_layout_part_text.eo b/src/lib/elementary/efl_ui_layout_part_text.eo
index 0a092a251f..a7442a7f45 100644
--- a/src/lib/elementary/efl_ui_layout_part_text.eo
+++ b/src/lib/elementary/efl_ui_layout_part_text.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Text extends Efl.Ui.Layout_Part implements Efl.Text, Efl.Text_Markup,
+class @beta Efl.Ui.Layout_Part_Text extends Efl.Ui.Layout_Part implements Efl.Text, Efl.Text_Markup,
                               Efl.Ui.L10n
 {
   [[Elementary layout internal part class]]
diff --git a/src/lib/elementary/efl_ui_legacy.eo b/src/lib/elementary/efl_ui_legacy.eo
index eab362b1f4..4537d302ed 100644
--- a/src/lib/elementary/efl_ui_legacy.eo
+++ b/src/lib/elementary/efl_ui_legacy.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Legacy
+interface @beta Efl.Ui.Legacy
 {
   [[The bg (background) widget is used for setting (solid) background decorations
diff --git a/src/lib/elementary/efl_ui_list.eo b/src/lib/elementary/efl_ui_list.eo
index 6f6b640889..7dcf29931a 100644
--- a/src/lib/elementary/efl_ui_list.eo
+++ b/src/lib/elementary/efl_ui_list.eo
@@ -1,6 +1,6 @@
 import efl_ui_list_item;
-class Efl.Ui.List extends Efl.Ui.Layout implements
+class @beta Efl.Ui.List extends Efl.Ui.Layout implements
                   Efl.Ui.Scrollable_Interactive,
                   Efl.Ui.Scrollbar,
                   Efl.Pack_Linear, Efl.Pack_Layout,
diff --git a/src/lib/elementary/efl_ui_list_default_item.eo b/src/lib/elementary/efl_ui_list_default_item.eo
index d4aca6941e..5ea4d2e44a 100644
--- a/src/lib/elementary/efl_ui_list_default_item.eo
+++ b/src/lib/elementary/efl_ui_list_default_item.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.List_Default_Item extends Efl.Ui.List_Item implements
+class @beta Efl.Ui.List_Default_Item extends Efl.Ui.List_Item implements
                                Efl.Text,
                                Efl.Text_Markup,
                                Efl.Content
diff --git a/src/lib/elementary/efl_ui_list_default_item_part_end.eo b/src/lib/elementary/efl_ui_list_default_item_part_end.eo
index c7b51fbf01..9ff2d1160e 100644
--- a/src/lib/elementary/efl_ui_list_default_item_part_end.eo
+++ b/src/lib/elementary/efl_ui_list_default_item_part_end.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_Default_Item_Part_End extends Efl.Ui.Layout_Part implements Efl.Content
+class @beta Efl.Ui.List_Default_Item_Part_End extends Efl.Ui.Layout_Part implements Efl.Content
 {
   [[List Default Item internal content of end part class]]
        data: null;
diff --git a/src/lib/elementary/efl_ui_list_default_item_part_icon.eo b/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
index ff0ec0e432..232b0d95b1 100644
--- a/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
+++ b/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_Default_Item_Part_Icon extends Efl.Ui.Layout_Part implements Efl.Content
+class @beta Efl.Ui.List_Default_Item_Part_Icon extends Efl.Ui.Layout_Part implements Efl.Content
 {
   [[List Default Item internal content of icon part class]]
        data: null;
diff --git a/src/lib/elementary/efl_ui_list_empty_item.eo b/src/lib/elementary/efl_ui_list_empty_item.eo
index 9b3456dee5..070b60531f 100644
--- a/src/lib/elementary/efl_ui_list_empty_item.eo
+++ b/src/lib/elementary/efl_ui_list_empty_item.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.List_Empty_Item extends Efl.Ui.List_Item implements Efl.Content
+class @beta Efl.Ui.List_Empty_Item extends Efl.Ui.List_Item implements Efl.Content
 {
   [[List Empty Item class. This item have only one swallow space,
     thus user can decorate item by filling the swallow with
diff --git a/src/lib/elementary/efl_ui_list_item.eo b/src/lib/elementary/efl_ui_list_item.eo
index e1bcf9235d..2997926cfd 100644
--- a/src/lib/elementary/efl_ui_list_item.eo
+++ b/src/lib/elementary/efl_ui_list_item.eo
@@ -1,5 +1,5 @@
-abstract Efl.Ui.List_Item extends Efl.Ui.Item
+abstract @beta Efl.Ui.List_Item extends Efl.Ui.Item
 {
   implements {
      //Efl.Object
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index 2828756908..b6a2bf8016 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -6,7 +6,7 @@ struct Efl.Ui.List_View_Item_Event
   child: Efl.Model;
   index: int;
 }
-class Efl.Ui.List_View extends Efl.Ui.Layout implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
+class @beta Efl.Ui.List_View extends Efl.Ui.Layout implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
                Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
                Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager
 {
diff --git a/src/lib/elementary/efl_ui_list_view_model.eo b/src/lib/elementary/efl_ui_list_view_model.eo
index 1c99555606..cf4780ed5f 100644
--- a/src/lib/elementary/efl_ui_list_view_model.eo
+++ b/src/lib/elementary/efl_ui_list_view_model.eo
@@ -1,6 +1,6 @@
 import efl_ui_list_view_types;
-interface Efl.Ui.List_View_Model
+interface @beta Efl.Ui.List_View_Model
 {
   methods {
      @property load_range {
diff --git a/src/lib/elementary/efl_ui_list_view_pan.eo b/src/lib/elementary/efl_ui_list_view_pan.eo
index e05cd09b96..1bd72a8300 100644
--- a/src/lib/elementary/efl_ui_list_view_pan.eo
+++ b/src/lib/elementary/efl_ui_list_view_pan.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_View_Pan extends Efl.Ui.Pan
+class @beta Efl.Ui.List_View_Pan extends Efl.Ui.Pan
 {
   [[Elementary Efl_Ui_List_View pan class]]
   implements {
diff --git a/src/lib/elementary/efl_ui_list_view_precise_layouter.eo b/src/lib/elementary/efl_ui_list_view_precise_layouter.eo
index 52f4964c6c..0a83c0a08b 100644
--- a/src/lib/elementary/efl_ui_list_view_precise_layouter.eo
+++ b/src/lib/elementary/efl_ui_list_view_precise_layouter.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_View_Precise_Layouter extends Efl.Object implements Efl.Ui.List_View_Relayout
+class @beta Efl.Ui.List_View_Precise_Layouter extends Efl.Object implements Efl.Ui.List_View_Relayout
 {
   implements {
      Efl.Object.constructor;
diff --git a/src/lib/elementary/efl_ui_list_view_relayout.eo b/src/lib/elementary/efl_ui_list_view_relayout.eo
index 77112450a9..07b5dc65bb 100644
--- a/src/lib/elementary/efl_ui_list_view_relayout.eo
+++ b/src/lib/elementary/efl_ui_list_view_relayout.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.List_View_Relayout
+interface @beta Efl.Ui.List_View_Relayout
 {
   methods {
      layout_do {
diff --git a/src/lib/elementary/efl_ui_navigation_bar.eo b/src/lib/elementary/efl_ui_navigation_bar.eo
index 15f4d922a8..77f1e5abdc 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar extends Efl.Ui.Layout implements Efl.Content, Efl.Text
+class @beta Efl.Ui.Navigation_Bar extends Efl.Ui.Layout implements Efl.Content, Efl.Text
 {
   [[Navigation_Bar widget.
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part.eo b/src/lib/elementary/efl_ui_navigation_bar_part.eo
index c94b5a5f02..40b0bcf74b 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar_Part extends Efl.Ui.Layout_Part_Content
+class @beta Efl.Ui.Navigation_Bar_Part extends Efl.Ui.Layout_Part_Content
 {
   [[Efl UI Navigation_Bar internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
index 43e3dd1613..2ed99a181f 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar_Part_Back_Button extends Efl.Ui.Layout_Part implements Efl.Ui.Clickable, Efl.Gfx.Entity, Efl.Text, Efl.Content
+class @beta Efl.Ui.Navigation_Bar_Part_Back_Button extends Efl.Ui.Layout_Part implements Efl.Ui.Clickable, Efl.Gfx.Entity, Efl.Text, Efl.Content
 {
   [[Efl Ui Navigation_Bar internal part back button class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_navigation_layout.eo b/src/lib/elementary/efl_ui_navigation_layout.eo
index 51fe71f8ae..373d711839 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.eo
+++ b/src/lib/elementary/efl_ui_navigation_layout.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Layout extends Efl.Ui.Layout implements Efl.Content
+class @beta Efl.Ui.Navigation_Layout extends Efl.Ui.Layout implements Efl.Content
 {
   [[Navigation_Layout widget.
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index 31b29acd56..622d4c1e69 100644
--- a/src/lib/elementary/efl_ui_nstate.eo
+++ b/src/lib/elementary/efl_ui_nstate.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Nstate extends Efl.Ui.Button
+class @beta Efl.Ui.Nstate extends Efl.Ui.Button
 {
   [[Efl UI nstate class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo
index 7ccdd0c791..50bcecb78b 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -5,7 +5,7 @@ enum Efl.Ui.Pager_Loop
   enabled
 }
-class Efl.Ui.Pager extends Efl.Ui.Layout implements Efl.Pack_Linear
+class @beta Efl.Ui.Pager extends Efl.Ui.Layout implements Efl.Pack_Linear
 {
   [[Pager widget
diff --git a/src/lib/elementary/efl_ui_pan.eo b/src/lib/elementary/efl_ui_pan.eo
index 907d50b197..84d2e0df81 100644
--- a/src/lib/elementary/efl_ui_pan.eo
+++ b/src/lib/elementary/efl_ui_pan.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Pan extends Efl.Canvas.Group implements Efl.Content
+class @beta Efl.Ui.Pan extends Efl.Canvas.Group implements Efl.Content
 {
   [[Elementary pan class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_panel.eo b/src/lib/elementary/efl_ui_panel.eo
index 6d0bc5ccb5..8aa1189001 100644
--- a/src/lib/elementary/efl_ui_panel.eo
+++ b/src/lib/elementary/efl_ui_panel.eo
@@ -15,7 +15,7 @@ struct Efl.Ui.Panel_Scroll_Info
   rel_y: double; [[content scrolled position (0.0 ~ 1.0) in the panel]]
 }
-class Efl.Ui.Panel extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Content,
+class @beta Efl.Ui.Panel extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Content,
                    Efl.Access.Widget.Action
 {
   [[Elementary panel class]]
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index eb4d0c3669..a7e15570ad 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Panes extends Efl.Ui.Layout implements Efl.Ui.Direction,
+class @beta Efl.Ui.Panes extends Efl.Ui.Layout implements Efl.Ui.Direction,
                    Efl.Ui.Clickable
 {
   [[Elementary panes class]]
diff --git a/src/lib/elementary/efl_ui_panes_legacy.eo b/src/lib/elementary/efl_ui_panes_legacy.eo
index 28f9ca5af9..6c8355e0b9 100644
--- a/src/lib/elementary/efl_ui_panes_legacy.eo
+++ b/src/lib/elementary/efl_ui_panes_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Panes_Legacy extends Efl.Ui.Panes implements Efl.Ui.Legacy
+class @beta Efl.Ui.Panes_Legacy extends Efl.Ui.Panes implements Efl.Ui.Legacy
 {
   [[Elementary panes class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_panes_part.eo b/src/lib/elementary/efl_ui_panes_part.eo
index 4a96713c83..d7e6da12a4 100644
--- a/src/lib/elementary/efl_ui_panes_part.eo
+++ b/src/lib/elementary/efl_ui_panes_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Panes_Part extends Efl.Ui.Layout_Part_Content
+class @beta Efl.Ui.Panes_Part extends Efl.Ui.Layout_Part_Content
 {
   [[Elementary Panes internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index e2946adca2..31b7b531f2 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -8,7 +8,7 @@ enum Efl.Ui.Popup_Align {
    bottom    [[Popup aligned to bottom]]
 }
-class Efl.Ui.Popup extends Efl.Ui.Layout implements Efl.Content, Efl.Ui.Focus.Layer
+class @beta Efl.Ui.Popup extends Efl.Ui.Layout implements Efl.Content, Efl.Ui.Focus.Layer
 {
   [[EFL UI popup class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_popup_part_backwall.eo b/src/lib/elementary/efl_ui_popup_part_backwall.eo
index 124d27c909..759e0f4697 100644
--- a/src/lib/elementary/efl_ui_popup_part_backwall.eo
+++ b/src/lib/elementary/efl_ui_popup_part_backwall.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Popup_Part_Backwall extends Efl.Ui.Layout_Part implements Efl.File
+class @beta Efl.Ui.Popup_Part_Backwall extends Efl.Ui.Layout_Part implements Efl.File
 {
   [[Efl UI Popup internal part backwall class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index 39dff28ee0..9b291707f6 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar extends Efl.Ui.Layout implements Efl.Ui.Range_Display, Efl.Ui.Format,
+class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout implements Efl.Ui.Range_Display, Efl.Ui.Format,
                          Efl.Ui.Direction, Efl.Access.Value,
                          Efl.Text, Efl.Content, Efl.Text_Markup
 {
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy.eo b/src/lib/elementary/efl_ui_progressbar_legacy.eo
index a8361cf09d..a59f3342cc 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy.eo
+++ b/src/lib/elementary/efl_ui_progressbar_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Legacy extends Efl.Ui.Progressbar implements Efl.Ui.Legacy
+class @beta Efl.Ui.Progressbar_Legacy extends Efl.Ui.Progressbar implements Efl.Ui.Legacy
 {
   [[Elementary progressbar class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
index fd989e518d..da75f9602d 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Legacy_Part extends Efl.Ui.Layout_Part_Content
+class @beta Efl.Ui.Progressbar_Legacy_Part extends Efl.Ui.Layout_Part_Content
 {
   [[Elementary progressbar internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar_part.eo b/src/lib/elementary/efl_ui_progressbar_part.eo
index 3ab05796f3..b80177dd16 100644
--- a/src/lib/elementary/efl_ui_progressbar_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Part extends Efl.Ui.Layout_Part implements Efl.Ui.Range_Display
+class @beta Efl.Ui.Progressbar_Part extends Efl.Ui.Layout_Part implements Efl.Ui.Range_Display
 {
   [[Elementary progressbar internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo
index c85d163be1..96e6f76b05 100644
--- a/src/lib/elementary/efl_ui_radio.eo
+++ b/src/lib/elementary/efl_ui_radio.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Radio extends Efl.Ui.Check implements Efl.Access.Widget.Action, Efl.Content
+class @beta Efl.Ui.Radio extends Efl.Ui.Check implements Efl.Access.Widget.Action, Efl.Content
 {
   [[Elementary radio class]]
   legacy_prefix: elm_radio;
diff --git a/src/lib/elementary/efl_ui_radio_legacy.eo b/src/lib/elementary/efl_ui_radio_legacy.eo
index 8089c48763..a129d6152a 100644
--- a/src/lib/elementary/efl_ui_radio_legacy.eo
+++ b/src/lib/elementary/efl_ui_radio_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Radio_Legacy extends Efl.Ui.Radio implements Efl.Ui.Legacy
+class @beta Efl.Ui.Radio_Legacy extends Efl.Ui.Radio implements Efl.Ui.Legacy
 {
   [[Elementary radio class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_radio_legacy_part.eo b/src/lib/elementary/efl_ui_radio_legacy_part.eo
index e7edcdeb2e..12a99be7c8 100644
--- a/src/lib/elementary/efl_ui_radio_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_radio_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Radio_Legacy_Part extends Efl.Ui.Layout_Part_Content
+class @beta Efl.Ui.Radio_Legacy_Part extends Efl.Ui.Layout_Part_Content
 {
   [[Elementary radio internal part class]]
   data: null;
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.eo b/src/lib/elementary/efl_ui_scroll_alert_popup.eo
index fe4cf365d5..fb9aeb2558 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.eo
@@ -1,6 +1,6 @@
 import eina_types;
-class Efl.Ui.Scroll_Alert_Popup extends Efl.Ui.Alert_Popup
+class @beta Efl.Ui.Scroll_Alert_Popup extends Efl.Ui.Alert_Popup
 {
   [[EFL UI Scroll Alert Popup class]]
   methods {
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo b/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo
index f100d02286..b9a818a00f 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Scroll_Alert_Popup_Part extends Efl.Ui.Layout_Part implements Efl.Content, Efl.Text
+class @beta Efl.Ui.Scroll_Alert_Popup_Part extends Efl.Ui.Layout_Part implements Efl.Content, Efl.Text
 {
   [[Efl UI Scroll Alert Popup internal part class]]
   data: null;
author	Xavi Artigas <xavierartigas@yahoo.es>	2019-02-14 17:37:02 +0100
committer	Xavi Artigas <xavierartigas@yahoo.es>	2019-02-14 17:46:50 +0100
commit	333330a6e51225b3ef8d725c4a930fc8c02fac18 (patch)
tree	d36409196ea62ee5d263d4666bf36b8a93339503 /src
parent	751ff0ed06be9cd91fa230e56eee7ae151d52cca (diff)