diff --git a/src/lib/ecore/efl_exe.eo b/src/lib/ecore/efl_exe.eo
index 01ba9a34bf..9f72137ed4 100644
--- a/src/lib/ecore/efl_exe.eo
+++ b/src/lib/ecore/efl_exe.eo
@@ -1,4 +1,4 @@
-enum Efl.Exe_Signal {
+enum @beta Efl.Exe_Signal {
    [[ ]]
    int,
    quit,
@@ -11,7 +11,7 @@ enum Efl.Exe_Signal {
    usr2
 }
 
-enum Efl.Exe_Flags {
+enum @beta Efl.Exe_Flags {
    [[ ]]
    none             = 0,
    group_leader     = 1,
diff --git a/src/lib/ecore/efl_loop_handler.eo b/src/lib/ecore/efl_loop_handler.eo
index 148759d0c0..8779324ef3 100644
--- a/src/lib/ecore/efl_loop_handler.eo
+++ b/src/lib/ecore/efl_loop_handler.eo
@@ -1,4 +1,4 @@
-enum Efl.Loop_Handler_Flags {
+enum @beta Efl.Loop_Handler_Flags {
    [[ A set of flags that can be OR'd together to indicate which are
    desired ]]
    none = 0, [[ No I/O is desired (generally useless) ]]
diff --git a/src/lib/ecore/efl_threadio.eo b/src/lib/ecore/efl_threadio.eo
index 25b1ba29a7..2049ad86d6 100644
--- a/src/lib/ecore/efl_threadio.eo
+++ b/src/lib/ecore/efl_threadio.eo
@@ -1,13 +1,13 @@
 import efl_object;
 
-function EFlThreadIOCall {
+function @beta EFlThreadIOCall {
    [[ A Function to call on the "other end" of a thread obvject ]]
    params {
       @cref event: Efl.Event; [[ ]]
    }
 };
 
-function EFlThreadIOCallSync {
+function @beta EFlThreadIOCallSync {
    [[ A Function to call on the "other end" of a thread obvject ]]
    params {
       @cref event: Efl.Event; [[ ]]
diff --git a/src/lib/ecore/efl_view_model.eo b/src/lib/ecore/efl_view_model.eo
index 432bfe8499..d7092b3b7a 100644
--- a/src/lib/ecore/efl_view_model.eo
+++ b/src/lib/ecore/efl_view_model.eo
@@ -1,4 +1,4 @@
-function EflViewModelPropertyGet {
+function @beta EflViewModelPropertyGet {
    [[Function called when a property is get.]]
    params {
       @in view_model: const(Efl.View_Model); [[The ViewModel object the @.property.get is issued on.]]
@@ -7,7 +7,7 @@ function EflViewModelPropertyGet {
    return: any_value_ptr; [[The property value.]]
 };
 
-function EflViewModelPropertySet {
+function @beta EflViewModelPropertySet {
    [[Function called when a property is set.]]
    params {
       @in view_model: Efl.View_Model; [[The ViewModel object the @.property.set is issued on.]]
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index dff009eea9..af668fbe32 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -1,7 +1,7 @@
 type @extern Ecore.Audio.Vio: __undefined_type; [[Ecore audio vio type]] /* FIXME: Had function pointer members. */
 type @extern efl_key_data_free_func: __undefined_type; [[Efl key data free function type]] /* FIXME: Function pointers not allowed. */
 
-enum Ecore.Audio.Format {
+enum @beta Ecore.Audio.Format {
     [[Ecore audio format type]]
     auto, [[Automatically detect the format (for inputs)]]
     raw, [[RAW samples (float)]]
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 7d3d9364ac..a2c9206fcc 100644
--- a/src/lib/ecore_con/efl_net_control_access_point.eo
+++ b/src/lib/ecore_con/efl_net_control_access_point.eo
@@ -1,4 +1,4 @@
-enum Efl.Net.Control.Access_Point_State {
+enum @beta Efl.Net.Control.Access_Point_State {
     [[Provides the access point state.
 
       @since 1.19
@@ -12,7 +12,7 @@ enum Efl.Net.Control.Access_Point_State {
     failure, [[The connection attempt failed, @Efl.Net.Control.Access_Point.error will provide more details]]
 }
 
-enum Efl.Net.Control.Access_Point_Error {
+enum @beta Efl.Net.Control.Access_Point_Error {
     [[The reason for the connection error.
 
       @since 1.19
@@ -25,7 +25,7 @@ enum Efl.Net.Control.Access_Point_Error {
     login_failed, [[Login or authentication information was incorrect, agent_request_input event may be emitted.]]
 }
 
-enum Efl.Net.Control.Access_Point_Security {
+enum @beta Efl.Net.Control.Access_Point_Security {
     [[Bitwise-able securities supported by an access point.
 
       @since 1.19
@@ -37,7 +37,7 @@ enum Efl.Net.Control.Access_Point_Security {
     ieee802_1x = (1 << 3), [[IEEE 802.1X]]
 }
 
-enum Efl.Net.Control.Access_Point_Ipv4_Method {
+enum @beta Efl.Net.Control.Access_Point_Ipv4_Method {
     [[The method used to configure IPv4
 
       @since 1.19
@@ -48,7 +48,7 @@ enum Efl.Net.Control.Access_Point_Ipv4_Method {
     unset, [[Only to be used with @Efl.Net.Control.Access_Point.configuration_ipv4]]
 }
 
-enum Efl.Net.Control.Access_Point_Ipv6_Method {
+enum @beta Efl.Net.Control.Access_Point_Ipv6_Method {
     [[The method used to configure IPv6
 
       @since 1.19
@@ -63,7 +63,7 @@ enum Efl.Net.Control.Access_Point_Ipv6_Method {
     unset, [[Only to be used with @Efl.Net.Control.Access_Point.configuration_ipv6]]
 }
 
-enum Efl.Net.Control.Access_Point_Proxy_Method {
+enum @beta Efl.Net.Control.Access_Point_Proxy_Method {
     [[The method used to configure Proxies.
 
       @since 1.19
diff --git a/src/lib/ecore_con/efl_net_control_manager.eo b/src/lib/ecore_con/efl_net_control_manager.eo
index 448bdba362..e0f769bac7 100644
--- a/src/lib/ecore_con/efl_net_control_manager.eo
+++ b/src/lib/ecore_con/efl_net_control_manager.eo
@@ -2,7 +2,7 @@ import eina_types;
 import efl_net_control_access_point;
 import efl_net_control_technology;
 
-enum Efl.Net.Control.State {
+enum @beta Efl.Net.Control.State {
     [[Provides the global network connectivity state.
 
       For more details, use @Efl.Net.Control.Manager access points and
@@ -15,7 +15,7 @@ enum Efl.Net.Control.State {
     online, [[At least one access point is connected and the internet has been verified]]
 }
 
-enum Efl.Net.Control.Agent_Request_Input_Field {
+enum @beta Efl.Net.Control.Agent_Request_Input_Field {
     [[Bitwise-able fields requested to the agent.
 
       @since 1.19
@@ -27,7 +27,7 @@ enum Efl.Net.Control.Agent_Request_Input_Field {
     wps = (1 << 4), [[Use WPS authentication. If passphrase is present, this is an alternative to that.]]
 }
 
-struct Efl.Net.Control.Agent_Request_Input_Information {
+struct @beta Efl.Net.Control.Agent_Request_Input_Information {
     [[Name-value information pair provided to the agent.
 
       @since 1.19
@@ -36,7 +36,7 @@ struct Efl.Net.Control.Agent_Request_Input_Information {
     value: string; [[The contents of the information]]
 }
 
-struct Efl.Net.Control.Agent_Request_Input {
+struct @beta Efl.Net.Control.Agent_Request_Input {
     [[Requests input to the agent.
 
       @since 1.19
@@ -47,7 +47,7 @@ struct Efl.Net.Control.Agent_Request_Input {
     informational: list<ptr(Efl.Net.Control.Agent_Request_Input_Information)>; [[Such as the previous passphrase, VPN host]]
 }
 
-struct Efl.Net.Control.Agent_Error {
+struct @beta Efl.Net.Control.Agent_Error {
     [[Reports error to the agent.
 
       @since 1.19
@@ -56,7 +56,7 @@ struct Efl.Net.Control.Agent_Error {
     message: string; [[The error message.]]
 }
 
-struct Efl.Net.Control.Agent_Browser_Url {
+struct @beta Efl.Net.Control.Agent_Browser_Url {
     [[Reports to agent that it should open a browser at a given URL.
 
       @since 1.19
diff --git a/src/lib/ecore_con/efl_net_control_technology.eo b/src/lib/ecore_con/efl_net_control_technology.eo
index 947aa11ac3..1c651a0d57 100644
--- a/src/lib/ecore_con/efl_net_control_technology.eo
+++ b/src/lib/ecore_con/efl_net_control_technology.eo
@@ -1,4 +1,4 @@
-enum Efl.Net.Control.Technology_Type {
+enum @beta Efl.Net.Control.Technology_Type {
     [[Technology types
 
       @since 1.19
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo b/src/lib/ecore_con/efl_net_dialer_http.eo
index 032c5c7bbb..4edff59178 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.eo
+++ b/src/lib/ecore_con/efl_net_dialer_http.eo
@@ -1,6 +1,6 @@
 import efl_net_http_types;
 
-enum Efl.Net.Dialer_Http_Primary_Mode {
+enum @beta Efl.Net.Dialer_Http_Primary_Mode {
     [[Primary HTTP mode]]
     auto, [[HTTP auto mode]]
     download, [[HTTP download mode]]
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo b/src/lib/ecore_con/efl_net_dialer_websocket.eo
index d400b02261..4a29fc30d5 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.eo
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo
@@ -1,7 +1,7 @@
 import eina_types;
 import efl_net_http_types;
 
-enum Efl.Net.Dialer_Websocket_Streaming_Mode {
+enum @beta Efl.Net.Dialer_Websocket_Streaming_Mode {
     [[How to map WebSocket to EFL I/O Interfaces.
 
       @since 1.19
@@ -11,7 +11,7 @@ enum Efl.Net.Dialer_Websocket_Streaming_Mode {
     text, [[@Efl.Io.Writer.write will result in @Efl.Net.Dialer_Websocket.text_send]]
 }
 
-enum Efl.Net.Dialer_Websocket_Close_Reason {
+enum @beta Efl.Net.Dialer_Websocket_Close_Reason {
     [[Registered reasons for the CLOSE (opcode=0x8).
 
       These are the well known reasons, with some ranges being defined
@@ -38,7 +38,7 @@ enum Efl.Net.Dialer_Websocket_Close_Reason {
     private_end = 4999, [[Applications can use range 4000-4999]]
 }
 
-struct Efl.Net.Dialer_Websocket_Closed_Reason {
+struct @beta Efl.Net.Dialer_Websocket_Closed_Reason {
     [[Close reason event payload.
 
       @since 1.19
diff --git a/src/lib/ecore_con/efl_net_http_types.eot b/src/lib/ecore_con/efl_net_http_types.eot
index f2e5aaa0e7..d86b9e368f 100644
--- a/src/lib/ecore_con/efl_net_http_types.eot
+++ b/src/lib/ecore_con/efl_net_http_types.eot
@@ -1,6 +1,6 @@
 import eina_types;
 
-enum Efl.Net.Http.Version {
+enum @beta Efl.Net.Http.Version {
     [[HTTP protocol versions]]
 
     v1_0 = 100, [[HTTP version 1.0]]
@@ -8,7 +8,7 @@ enum Efl.Net.Http.Version {
     v2_0 = 200, [[HTTP version 2.0]]
 }
 
-enum Efl.Net.Http.Authentication_Method {
+enum @beta Efl.Net.Http.Authentication_Method {
     [[HTTP authentication methods]]
 
     none = 0, [[HTTP authentication method none]]
@@ -21,7 +21,7 @@ enum Efl.Net.Http.Authentication_Method {
     any = Efl.Net.Http.Authentication_Method.any_safe | Efl.Net.Http.Authentication_Method.basic, [[HTTP authentication method any]]
 }
 
-enum Efl.Net.Http.Status {
+enum @beta Efl.Net.Http.Status {
     [[Common HTTP status codes. A more detailed description on the various HTTPS status codes can be
     found one Wikipedia: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes]]
 
@@ -109,7 +109,7 @@ enum Efl.Net.Http.Status {
     network_authentication_required = 511, [[HTTP status code: network authentication required]]
 }
 
-struct Efl.Net.Http.Header {
+struct @beta Efl.Net.Http.Header {
     [[An HTTP Header.
 
       Do not assume strings are Eina_Stringshare and they may be
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo b/src/lib/ecore_con/efl_net_ip_address.eo
index 9b00a66ca3..b1cdd466c6 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-struct Efl.Net.Ip_Address_Resolve_Results {
+struct @beta Efl.Net.Ip_Address_Resolve_Results {
     [[The results of @Efl.Net.Ip_Address.resolve call.
 
       This structure is created by @Efl.Net.Ip_Address.resolve.
diff --git a/src/lib/ecore_con/efl_net_session.eo b/src/lib/ecore_con/efl_net_session.eo
index ed968667ef..81ef902a47 100644
--- a/src/lib/ecore_con/efl_net_session.eo
+++ b/src/lib/ecore_con/efl_net_session.eo
@@ -1,4 +1,4 @@
-enum Efl.Net.Session_State {
+enum @beta Efl.Net.Session_State {
     [[Provides the session connectivity state.
 
       @since 1.19
@@ -9,7 +9,7 @@ enum Efl.Net.Session_State {
 }
 
 /* keep in sync with efl_net_control_technology.eo, comment what doesn't make sense */
-enum Efl.Net.Session_Technology {
+enum @beta Efl.Net.Session_Technology {
     [[Bitwise-able technologies to allow for a network session.
 
       @since 1.9
diff --git a/src/lib/ecore_con/efl_net_ssl_types.eot b/src/lib/ecore_con/efl_net_ssl_types.eot
index 5c41b921c5..8b7d1a1231 100644
--- a/src/lib/ecore_con/efl_net_ssl_types.eot
+++ b/src/lib/ecore_con/efl_net_ssl_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Net.Ssl.Verify_Mode {
+enum @beta Efl.Net.Ssl.Verify_Mode {
     [[Defines how remote peers should be verified.
 
       @since 1.19
@@ -8,7 +8,7 @@ enum Efl.Net.Ssl.Verify_Mode {
     required, [[Always verify and fail if certificate wasn't provided]]
 }
 
-enum Efl.Net.Ssl.Cipher {
+enum @beta Efl.Net.Ssl.Cipher {
     [[Defines the SSL/TLS version to use.
 
       Prefer 'auto' or one of the TLS variants.
diff --git a/src/lib/ector/ector_buffer.eo b/src/lib/ector/ector_buffer.eo
index 9d0aaf4040..505442cdff 100644
--- a/src/lib/ector/ector_buffer.eo
+++ b/src/lib/ector/ector_buffer.eo
@@ -1,6 +1,6 @@
 import efl_gfx_types;
 
-enum Ector.Buffer.Flag {
+enum @beta Ector.Buffer.Flag {
    [[Buffer capabilities]]
    none              = 0x00, [[Buffer may not have any backing, indicates an invalid buffer.]]
    cpu_readable      = 0x01, [[Can be read from the CPU after map. Reading may still be very slow.]]
@@ -13,7 +13,7 @@ enum Ector.Buffer.Flag {
 /* non_coherent      = 0x80, [[Memory may be mapped but will not be coherent between GPU and CPU. Call flush or invalidate to synchronize it.]] */
 }
 
-enum Ector.Buffer.Access_Flag {
+enum @beta Ector.Buffer.Access_Flag {
    [[Buffer access permissions]]
    none      = 0x0, [[No access permission]]
    read      = 0x1, [[Read access permission]]
diff --git a/src/lib/edje/edje_types.eot b/src/lib/edje/edje_types.eot
index bd58febd61..87a5cc3b1d 100644
--- a/src/lib/edje/edje_types.eot
+++ b/src/lib/edje/edje_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Canvas.Layout_Part_Type
+enum @beta Efl.Canvas.Layout_Part_Type
 {
    [[Type of a part in an Efl.Canvas.Layout object (edje object).]]
    none      = 0,  [[None type value, indicates invalid parts.]]
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index 09213c663e..a46326391c 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -1,4 +1,4 @@
-enum Efl.Canvas.Layout_Part_Text_Expand
+enum @beta Efl.Canvas.Layout_Part_Text_Expand
 {
    [[Text layout policy to enforce. If none is set, min/max descriptions
      are taken in considerations solely.
diff --git a/src/lib/efl/interfaces/efl_gfx_buffer.eo b/src/lib/efl/interfaces/efl_gfx_buffer.eo
index 795b6663bc..074dd7843a 100644
--- a/src/lib/efl/interfaces/efl_gfx_buffer.eo
+++ b/src/lib/efl/interfaces/efl_gfx_buffer.eo
@@ -2,7 +2,7 @@ import efl_gfx_types;
 import eina_types;
 
 /* FIXME: this is very very low level. expose to apps? */
-enum Efl.Gfx.Buffer_Access_Mode {
+enum @beta Efl.Gfx.Buffer_Access_Mode {
    [[Graphics buffer access mode]]
    none      = 0x0, [[No buffer access]]
    read      = 0x1, [[Read access to buffer]]
diff --git a/src/lib/efl/interfaces/efl_gfx_frame_controller.eo b/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
index b2a164ca23..1b53f3a454 100644
--- a/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
@@ -1,7 +1,7 @@
 /* FIXME: invalid type from evas/emile! */
 /* type @extern Evas.Animated_Loop_Hint: int; */
 
-enum Efl.Gfx.Frame_Controller_Loop_Hint {
+enum @beta Efl.Gfx.Frame_Controller_Loop_Hint {
    [[Frame loop modes]]
    none = 0,       [[No looping order specified.]]
    loop = 1,       [[Standard loop: 1->2->3->1->2->3->1]]
diff --git a/src/lib/efl/interfaces/efl_gfx_image.eo b/src/lib/efl/interfaces/efl_gfx_image.eo
index 5d42432aba..11eb6bfaa8 100644
--- a/src/lib/efl/interfaces/efl_gfx_image.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image.eo
@@ -1,7 +1,7 @@
 import efl_gfx_types;
 import eina_types;
 
-enum Efl.Gfx.Image_Content_Hint
+enum @beta Efl.Gfx.Image_Content_Hint
 {
    [[How an image's data is to be treated by EFL, for optimization.]]
    none = 0,    [[No hint on the content (default).]]
@@ -9,7 +9,7 @@ enum Efl.Gfx.Image_Content_Hint
    static = 2   [[The content won't change over time.]]
 }
 
-enum Efl.Gfx.Image_Scale_Hint
+enum @beta Efl.Gfx.Image_Scale_Hint
 {
   /* FIXME: Legacy is in Emile, where it does not belong. */
   [[How an image's data is to be treated by EFL, with regard to scaling cache.]]
@@ -18,7 +18,7 @@ enum Efl.Gfx.Image_Scale_Hint
   static = 2   [[Image will not be re-scaled over time, thus turning scaling cache ON for its data.]]
 }
 
-enum Efl.Gfx.Image_Scale_Type
+enum @beta Efl.Gfx.Image_Scale_Type
 {
    [[Enumeration that defines scale types of an image.]]
    fill,        [[Scale the image so that it matches
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 1727e578e6..d0cef46b35 100644
--- a/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo
@@ -2,7 +2,7 @@ import eina_types;
 import efl_gfx_types;
 
 /*
-enum Efl.Gfx.Image_Load_Controller_State
+enum @beta Efl.Gfx.Image_Load_Controller_State
 {
    none = 0,      [[Not loading any image.]]
    loaded = 1,    [[Image data is loaded, nothing is pending.]]
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot
index 283c9286dd..6d625e630e 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -1,6 +1,6 @@
 import eina_types;
 
-enum Efl.Gfx.Colorspace {
+enum @beta Efl.Gfx.Colorspace {
   [[Graphics colorspace type]]
   argb8888,             [[ARGB 32 bits per pixel, high-byte is Alpha, accessed one 32bit word at a time.]]
   ycbcr422p601_pl,      [[YCbCr 4:2:2 Planar, ITU.BT-601 specifications. The data pointed to is just an array of row pointer, pointing to the Y rows, then the Cb, then Cr rows.]]
@@ -23,14 +23,14 @@ enum Efl.Gfx.Colorspace {
   rgba_s3tc_dxt5 = 18   [[OpenGL COMPRESSED_RGBA_S3TC_DXT5_EXT format with RGBA. @since 1.11.]]
 }
 
-enum Efl.Gfx.Render_Op {
+enum @beta Efl.Gfx.Render_Op {
   [[Graphics render operation mode]]
   blend = 0, [[Alpha blending onto destination (default); d = d*(1-sa) + s.]]
   copy  = 1, [[Copy source to destination; d = s.]]
   last       [[Sentinel value to indicate last enum field during iteration]]
 }
 
-enum Efl.Gfx.Path_Command_Type {
+enum @beta Efl.Gfx.Path_Command_Type {
   [[These values determine how the points are interpreted in a stream of points.
     @since 1.14
   ]]
@@ -42,7 +42,7 @@ enum Efl.Gfx.Path_Command_Type {
   last       [[Sentinel value to indicate last enum field during iteration]]
 }
 
-enum Efl.Gfx.Cap {
+enum @beta Efl.Gfx.Cap {
   [[These values determine how the end of opened sub-paths are rendered in a
     stroke.
     @Efl.Gfx.Shape.stroke_cap.set
@@ -54,7 +54,7 @@ enum Efl.Gfx.Cap {
   last       [[Sentinel value to indicate last enum field during iteration]]
 }
 
-enum Efl.Gfx.Join
+enum @beta Efl.Gfx.Join
 {
   [[These values determine how two joining lines are rendered in a stroker.
     @Efl.Gfx.Shape.stroke_join.set
@@ -66,7 +66,7 @@ enum Efl.Gfx.Join
   last [[Sentinel value to indicate last enum field during iteration]]
 }
 
-enum Efl.Gfx.Gradient_Spread
+enum @beta Efl.Gfx.Gradient_Spread
 {
   [[Specifies how the area outside the gradient area should be filled.
     @Efl.Gfx.Gradient.spread.set
@@ -78,7 +78,7 @@ enum Efl.Gfx.Gradient_Spread
   last [[Sentinel value to indicate last enum field during iteration]]
 }
 
-enum Efl.Gfx.Fill_Rule
+enum @beta Efl.Gfx.Fill_Rule
 {
   [[Type defining how an image content get filled.
     @since 1.14
@@ -87,7 +87,7 @@ enum Efl.Gfx.Fill_Rule
   odd_even = 1,  [[Draw a horizontal line from the point to a location outside the shape, and count the number of intersections. If the number of intersections is an odd number, the point is inside the shape.]]
 }
 
-struct Efl.Gfx.Dash {
+struct @beta Efl.Gfx.Dash {
   [[Type describing dash.
     @Efl.Gfx.Shape.stroke_dash.set
     @since 1.14
@@ -96,7 +96,7 @@ struct Efl.Gfx.Dash {
   gap: double;     [[Distance between two dashes.]]
 }
 
-struct Efl.Gfx.Gradient_Stop
+struct @beta Efl.Gfx.Gradient_Stop
 {
   [[Type defining gradient stops.
     Describes the location and color of a transition point in a gradient.
@@ -109,7 +109,7 @@ struct Efl.Gfx.Gradient_Stop
   a: int; [[The component A color of the gradient stop]]
 }
 
-struct Efl.Gfx.Stroke_Color
+struct @beta Efl.Gfx.Stroke_Color
 {
   [[Internal structure for @Efl.Gfx.Stroke.]]
   r: int; [[The component R color of the stroke]]
@@ -118,7 +118,7 @@ struct Efl.Gfx.Stroke_Color
   a: int; [[The component A color of the stroke]]
 }
 
-struct Efl.Gfx.Stroke
+struct @beta Efl.Gfx.Stroke
 {
   [[Type defining stroke information.
     Describes the properties to define the path stroke.
@@ -134,13 +134,13 @@ struct Efl.Gfx.Stroke
   join: Efl.Gfx.Join; [[Stroke join]]
 }
 
-struct Efl.Gfx.Shape_Public
+struct @beta Efl.Gfx.Shape_Public
 {
    [[Public shape]]
    stroke: Efl.Gfx.Stroke; [[Internal representation as stroke]]
 }
 
-enum Efl.Gfx.Border_Fill_Mode
+enum @beta Efl.Gfx.Border_Fill_Mode
 {
    [[How an image's center region (the complement to the border region) should be rendered by EFL]]
    none = 0, [[Image's center region is $not to be rendered]]
@@ -148,7 +148,7 @@ enum Efl.Gfx.Border_Fill_Mode
    solid = 2 [[Image's center region is to be made solid, even if it has transparency on it]]
 }
 
-enum Efl.Gfx.Change_Flag
+enum @beta Efl.Gfx.Change_Flag
 {
    [[What property got changed for this object @since 1.18]]
    none    = 0x0, [[No change]]
@@ -188,14 +188,14 @@ enum Efl.Gfx.Hint_Aspect
               aspect.]]
 }
 
-enum Efl.Gfx.Color_Class_Layer {
+enum @beta Efl.Gfx.Color_Class_Layer {
    [[Efl Gfx Color Class layer enum]]
    normal = 0, [[Default color]]
    outline, [[Outline color]]
    shadow [[Shadow color]]
 }
 
-type Efl.Font.Size: int; [[Efl font size type]]
+type @beta Efl.Font.Size: int; [[Efl font size type]]
 
 var Efl.Gfx.Image.Load_Error.NONE: Eina.Error; [[No error on load]]
 var Efl.Gfx.Image.Load_Error.GENERIC: Eina.Error; [[A non-specific error occurred]]
diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/efl/interfaces/efl_input_device.eo
index 86091a2d11..90f507af21 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/efl/interfaces/efl_input_device.eo
@@ -1,4 +1,4 @@
-enum Efl.Input.Device_Type
+enum @beta Efl.Input.Device_Type
 {
    [[General type of input device.
 
diff --git a/src/lib/efl/interfaces/efl_input_types.eot b/src/lib/efl/interfaces/efl_input_types.eot
index a06f6044f7..eb5f8edeb7 100644
--- a/src/lib/efl/interfaces/efl_input_types.eot
+++ b/src/lib/efl/interfaces/efl_input_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Pointer.Action
+enum @beta Efl.Pointer.Action
 {
    [[Pointer event type. Represents which kind of event this is.
 
@@ -18,7 +18,7 @@ enum Efl.Pointer.Action
    axis,   [[Axis event (pen, stick, ...).]]
 }
 
-enum Efl.Pointer.Flags
+enum @beta Efl.Pointer.Flags
 {
    [[Pointer flags indicating whether a double or triple click is under way.
 
@@ -29,7 +29,7 @@ enum Efl.Pointer.Flags
    triple_click = (1 << 1), [[This mouse button press was the 3rd press of a triple click]]
 }
 
-enum Efl.Input.Flags
+enum @beta Efl.Input.Flags
 {
    [[Special flags set during an input event propagation.
 
@@ -48,7 +48,7 @@ enum Efl.Input.Flags
                            actually perform anything.]]
 }
 
-enum Efl.Input.Object_Pointer_Mode {
+enum @beta Efl.Input.Object_Pointer_Mode {
    [[How the mouse pointer should be handled by EFL.
 
      In the mode $autograb, when a mouse button is pressed down over an
@@ -74,7 +74,7 @@ enum Efl.Input.Object_Pointer_Mode {
                             ]]
 }
 
-enum Efl.Input.Value {
+enum @beta Efl.Input.Value {
    [[Keys for the generic values of all events.
 
      @since 1.19
diff --git a/src/lib/efl/interfaces/efl_io_positioner.eo b/src/lib/efl/interfaces/efl_io_positioner.eo
index ace155f400..f1f3f201ce 100644
--- a/src/lib/efl/interfaces/efl_io_positioner.eo
+++ b/src/lib/efl/interfaces/efl_io_positioner.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-enum Efl.Io.Positioner_Whence {
+enum @beta Efl.Io.Positioner_Whence {
     [[Seek position modes]]
     start, [[Seek from start of the stream/file]]
     current, [[Seek from current position]]
diff --git a/src/lib/efl/interfaces/efl_model.eo b/src/lib/efl/interfaces/efl_model.eo
index e7ff4aa05f..82f4a92b40 100644
--- a/src/lib/efl/interfaces/efl_model.eo
+++ b/src/lib/efl/interfaces/efl_model.eo
@@ -1,10 +1,10 @@
-struct Efl.Model_Property_Event {
+struct @beta Efl.Model_Property_Event {
      [[EFL model property event data structure]]
      changed_properties: array<string>; [[List of changed properties]]
      invalidated_properties: array<string>; [[Removed properties identified by name]]
 }
 
-struct Efl.Model_Children_Event {
+struct @beta Efl.Model_Children_Event {
      [[Every time a child is added the event @[Efl.Model.child,added] is dispatched
      passing along this structure.]]
      index: uint; [[index is a hint and is intended to provide a way for applications
diff --git a/src/lib/efl/interfaces/efl_orientation.eo b/src/lib/efl/interfaces/efl_orientation.eo
index 8eb4f55b4a..e874dcfdb7 100644
--- a/src/lib/efl/interfaces/efl_orientation.eo
+++ b/src/lib/efl/interfaces/efl_orientation.eo
@@ -1,6 +1,6 @@
 parse efl_ui_direction;
 
-enum Efl.Orient
+enum @beta Efl.Orient
 {
    [[An orientation type, to rotate visual objects.
 
@@ -17,7 +17,7 @@ enum Efl.Orient
    left = 270, [[Orient left, rotate 90 degrees clock-wise.]]
 }
 
-enum Efl.Flip
+enum @beta Efl.Flip
 {
    [[A flip type, to flip visual objects.
 
diff --git a/src/lib/efl/interfaces/efl_text_cursor.eo b/src/lib/efl/interfaces/efl_text_cursor.eo
index 1f8b4ed59b..f8ad8c5e81 100644
--- a/src/lib/efl/interfaces/efl_text_cursor.eo
+++ b/src/lib/efl/interfaces/efl_text_cursor.eo
@@ -1,7 +1,7 @@
 import eina_types;
 import efl_text_types;
 
-enum Efl.Text_Cursor_Get_Type {
+enum @beta Efl.Text_Cursor_Get_Type {
    [[All available cursor states]]
    default = 0,     [[Main cursor state (alias to "main")]]
    main,            [[Main cursor state]]
@@ -13,7 +13,7 @@ enum Efl.Text_Cursor_Get_Type {
    user_extra       [[User extra cursor state]]
 }
 
-enum Efl.Text_Cursor_Type
+enum @beta Efl.Text_Cursor_Type
 {
    [[Text cursor types]]
    before, [[Cursor type before]]
diff --git a/src/lib/efl/interfaces/efl_text_font.eo b/src/lib/efl/interfaces/efl_text_font.eo
index bcbc837439..6eb36ce676 100644
--- a/src/lib/efl/interfaces/efl_text_font.eo
+++ b/src/lib/efl/interfaces/efl_text_font.eo
@@ -1,6 +1,6 @@
 // src/lib/efl/interfaces/efl_text_font.eo
 import efl_gfx_types;
-enum Efl.Text_Font_Weight {
+enum @beta Efl.Text_Font_Weight {
    [[Type of font weight]]
    normal, [[Normal font weight]]
    thin, [[Thin font weight]]
@@ -17,7 +17,7 @@ enum Efl.Text_Font_Weight {
    extrablack, [[Extrablack font weight]]
 }
 
-enum Efl.Text_Font_Width {
+enum @beta Efl.Text_Font_Width {
    [[Type of font width]]
    normal, [[Normal font width]]
    ultracondensed, [[Ultracondensed font width]]
@@ -30,7 +30,7 @@ enum Efl.Text_Font_Width {
    ultraexpanded, [[Ultraexpanded font width]]
 }
 
-enum Efl.Text_Font_Slant {
+enum @beta Efl.Text_Font_Slant {
     [[Type of font slant]]
     normal, [[Normal font slant]]
     oblique, [[Oblique font slant]]
@@ -40,7 +40,7 @@ enum Efl.Text_Font_Slant {
 /* FIXME: It needs to support "normal" option for non-color bitmap font.
    For supporting "normal" option, S/W glyph drawing engine should be updated.
  */
-enum Efl.Text_Font_Bitmap_Scalable {
+enum @beta Efl.Text_Font_Bitmap_Scalable {
    [[Scalable of bitmap fonts
 
      @since 1.21
diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo
index f474258c55..31c0b9c862 100644
--- a/src/lib/efl/interfaces/efl_text_format.eo
+++ b/src/lib/efl/interfaces/efl_text_format.eo
@@ -1,4 +1,4 @@
-enum Efl.Text_Format_Wrap {
+enum @beta Efl.Text_Format_Wrap {
    [[Wrap mode of the text (not in effect if not multiline)]]
    none, [[No wrapping]]
    char, [[Wrap mode character]]
@@ -7,7 +7,7 @@ enum Efl.Text_Format_Wrap {
    hyphenation [[Wrap mode hyphenation]]
 }
 
-enum Efl.Text_Format_Horizontal_Alignment_Auto_Type {
+enum @beta Efl.Text_Format_Horizontal_Alignment_Auto_Type {
    [[Auto-horizontal alignment of the text]]
    none,   [[No auto-alignment rule]]
    normal, [[Respects LTR/RTL (bidirectional) settings]]
diff --git a/src/lib/efl/interfaces/efl_text_style.eo b/src/lib/efl/interfaces/efl_text_style.eo
index d6952cd53b..71220608fe 100644
--- a/src/lib/efl/interfaces/efl_text_style.eo
+++ b/src/lib/efl/interfaces/efl_text_style.eo
@@ -1,18 +1,18 @@
-enum Efl.Text_Style_Backing_Type
+enum @beta Efl.Text_Style_Backing_Type
 {
    [[Whether to apply backing style to the displayed text or not]]
    disabled = 0, [[Do not use backing]]
    enabled,      [[Use backing style]]
 }
 
-enum Efl.Text_Style_Strikethrough_Type
+enum @beta Efl.Text_Style_Strikethrough_Type
 {
    [[Whether to apply strikethrough style to the displayed text or not]]
    disabled = 0, [[Do not use strikethrough]]
    enabled,      [[Use strikethrough style]]
 }
 
-enum Efl.Text_Style_Effect_Type
+enum @beta Efl.Text_Style_Effect_Type
 {
    [[Effect to apply to the displayed text]]
    none = 0, [[No effect]]
@@ -32,7 +32,7 @@ enum Efl.Text_Style_Effect_Type
    outline_soft_shadow, [[Outline soft shadow effect]]
 }
 
-enum Efl.Text_Style_Shadow_Direction
+enum @beta Efl.Text_Style_Shadow_Direction
 {
    [[Direction of the shadow style, if used]]
    bottom_right = 0, [[Shadow towards bottom right]]
@@ -45,7 +45,7 @@ enum Efl.Text_Style_Shadow_Direction
    right, [[Shadow towards right]]
 }
 
-enum Efl.Text_Style_Underline_Type
+enum @beta Efl.Text_Style_Underline_Type
 {
    [[Underline type of the displayed text]]
    off = 0, [[Text without underline]]
diff --git a/src/lib/efl/interfaces/efl_text_types.eot b/src/lib/efl/interfaces/efl_text_types.eot
index 61003586b9..1e1d59fd1e 100644
--- a/src/lib/efl/interfaces/efl_text_types.eot
+++ b/src/lib/efl/interfaces/efl_text_types.eot
@@ -7,7 +7,7 @@ enum Efl.Text_Bidirectional_Type {
    inherit [[Inherit text type]]
 }
 
-struct Efl.Ui.Text_Change_Info {
+struct @beta Efl.Ui.Text_Change_Info {
    [[This structure includes all the information about content changes.
 
      It's meant to be used to implement undo/redo.
diff --git a/src/lib/efl/interfaces/efl_ui_direction.eo b/src/lib/efl/interfaces/efl_ui_direction.eo
index 9a0ad01847..a75872eb85 100644
--- a/src/lib/efl/interfaces/efl_ui_direction.eo
+++ b/src/lib/efl/interfaces/efl_ui_direction.eo
@@ -3,7 +3,7 @@
 
 parse efl_orientation;
 
-enum Efl.Ui.Dir
+enum @beta Efl.Ui.Dir
 {
    [[Direction for UI objects and layouts.
 
diff --git a/src/lib/efl/interfaces/efl_ui_factory.eo b/src/lib/efl/interfaces/efl_ui_factory.eo
index 6f6735a6d9..e2c2ae3318 100644
--- a/src/lib/efl/interfaces/efl_ui_factory.eo
+++ b/src/lib/efl/interfaces/efl_ui_factory.eo
@@ -1,4 +1,4 @@
-struct Efl.Ui.Factory_Item_Created_Event {
+struct @beta Efl.Ui.Factory_Item_Created_Event {
    [[EFL Ui Factory event structure provided when an item was just created.]]
    model: Efl.Model; [[The model already set on the new item.]]
    item: Efl.Gfx.Entity; [[The item that was just created.]]
diff --git a/src/lib/efl/interfaces/efl_ui_format.eo b/src/lib/efl/interfaces/efl_ui_format.eo
index 07e51ce28e..c4cf9a311d 100644
--- a/src/lib/efl/interfaces/efl_ui_format.eo
+++ b/src/lib/efl/interfaces/efl_ui_format.eo
@@ -1,4 +1,4 @@
-function Efl.Ui.Format_Func_Cb {
+function @beta Efl.Ui.Format_Func_Cb {
    [[Function pointer for format function hook]]
    params {
       @in str: strbuf; [[the formated string to be appended by user.]]
diff --git a/src/lib/efl/interfaces/efl_ui_multi_selectable.eo b/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
index 4285c2dee7..a99ff458f4 100644
--- a/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Select_Mode {
+enum @beta Efl.Ui.Select_Mode {
    [[Type of multi selectable object.]]
    single, [[Only single child is selected. if the child is selected,
              previous selected child will be unselected.]]
diff --git a/src/lib/efl/interfaces/efl_ui_scrollable.eo b/src/lib/efl/interfaces/efl_ui_scrollable.eo
index 3b30a25ccb..664ab6f47d 100644
--- a/src/lib/efl/interfaces/efl_ui_scrollable.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollable.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Scroll_Block
+enum @beta Efl.Ui.Scroll_Block
 {
    [[Direction in which a scroller should be blocked.
 
diff --git a/src/lib/efl/interfaces/efl_ui_scrollbar.eo b/src/lib/efl/interfaces/efl_ui_scrollbar.eo
index 8d2fd49d48..50b2b2f34c 100644
--- a/src/lib/efl/interfaces/efl_ui_scrollbar.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollbar.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Scrollbar_Mode
+enum @beta Efl.Ui.Scrollbar_Mode
 {
    auto = 0, [[Visible if necessary]]
    on, [[Always visible]]
@@ -6,7 +6,7 @@ enum Efl.Ui.Scrollbar_Mode
    last [[For internal use only]]
 }
 
-enum Efl.Ui.Scrollbar_Direction
+enum @beta Efl.Ui.Scrollbar_Direction
 {
    horizontal = 0,
    vertical,
diff --git a/src/lib/efl/interfaces/efl_ui_types.eot b/src/lib/efl/interfaces/efl_ui_types.eot
index 59cf1abf7f..2622e4225f 100644
--- a/src/lib/efl/interfaces/efl_ui_types.eot
+++ b/src/lib/efl/interfaces/efl_ui_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Ui.Drag_Dir {
+enum @beta Efl.Ui.Drag_Dir {
    [[Permitted directions for dragging objects.]]
    none = 0,  [[Not draggable in any direction.]]
    x = 1,     [[Draggable horizontally.]]
diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo
index d42e1ab5e7..b3d949aa5f 100644
--- a/src/lib/efl/interfaces/efl_ui_zoom.eo
+++ b/src/lib/efl/interfaces/efl_ui_zoom.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Zoom_Mode
+enum @beta Efl.Ui.Zoom_Mode
 {
    [[Types of zoom available.]]
    manual = 0, [[Zoom controlled normally by efl_ui_zoom_set]]
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index 8213591b87..2ce5fbe978 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -1,20 +1,20 @@
 import eina_types;
 
-struct Eio.Data
+struct @beta Eio.Data
 {
   [[A structure to handle arbitrary data to be sent over Promises.]]
   data: void_ptr; [[Private data pointer]]
   size: uint; [[Size of private data]]
 }
 
-function EflIoPath {
+function @beta EflIoPath {
   [[EflIoPath function]]
   params {
      @in paths: array<string>; [[Accessor to an array of path.]]
   }
 };
 
-function EflIoDirectInfo {
+function @beta EflIoDirectInfo {
   [[EflIoDirectInfo function]]
   params {
      @in entries: array<ptr(Eina.File_Direct_Info)>; [[Accessor to an array of info.]]
diff --git a/src/lib/eio/efl_io_model.eo b/src/lib/eio/efl_io_model.eo
index 0d881fe6e2..206ba07dc5 100644
--- a/src/lib/eio/efl_io_model.eo
+++ b/src/lib/eio/efl_io_model.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-function EflIoFilter {
+function @beta EflIoFilter {
   [[EflIoFilter function]]
   params {
     @in model: Efl.Io.Model;
diff --git a/src/lib/eio/eio_sentry.eo b/src/lib/eio/eio_sentry.eo
index bd0d19a82a..1b3845532f 100644
--- a/src/lib/eio/eio_sentry.eo
+++ b/src/lib/eio/eio_sentry.eo
@@ -1,4 +1,4 @@
-struct Eio.Sentry.Event
+struct @beta Eio.Sentry.Event
 {
   [[Wraps the data about a monitor event on a file.]]
   trigger: string; [[The cause of the event.]]
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index 4f54020558..933533663a 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -1,4 +1,4 @@
-enum Efl.Access.Type
+enum @beta Efl.Access.Type
 {
    [[Type of accessibility object]]
    regular, [[default accessible object]]
@@ -6,7 +6,7 @@ enum Efl.Access.Type
    skipped [[skip object in accessibility hierarchy]]
 }
 
-enum Efl.Access.Role
+enum @beta Efl.Access.Role
 {
    [[Describes the role of an object visible to Accessibility Clients.]]
    invalid, [[Role: invalid]]
@@ -115,7 +115,7 @@ enum Efl.Access.Role
    last_defined,  [[Last enum entry sentinel]]
 }
 
-enum Efl.Access.State_Type
+enum @beta Efl.Access.State_Type
 {
    [[Describes the possible states for an object visible to accessibility clients.]]
    invalid, [[State: invalid]]
@@ -162,7 +162,7 @@ enum Efl.Access.State_Type
    last_defined,  [[Last enum entry sentinel]]
 }
 
-enum Efl.Access.Relation_Type
+enum @beta Efl.Access.Relation_Type
 {
    [[Describes the relationship between two objects.]]
    null, [[No relation]]
@@ -187,7 +187,7 @@ enum Efl.Access.Relation_Type
    last_defined, [[Last enum entry sentinel]]
 }
 
-enum Efl.Access.Reading.Info.Type
+enum @beta Efl.Access.Reading.Info.Type
 {
    [[The accessible Reading information type that can be read.]]
    name = 1 << 0, [[Name should be read]]
@@ -196,18 +196,18 @@ enum Efl.Access.Reading.Info.Type
    state = 1 << 3, [[State should be read.]]
 }
 
-type Efl.Access.State_Set: uint64; [[Accessibility object state set.]]
+type @beta Efl.Access.State_Set: uint64; [[Accessibility object state set.]]
 
-struct Efl.Access.Event.Handler; [[Accessibility event listener]]
+struct @beta Efl.Access.Event.Handler; [[Accessibility event listener]]
 
-struct Efl.Access.Event.State_Changed.Data
+struct @beta Efl.Access.Event.State_Changed.Data
 {
    [[Accessibility state changed event data]]
    type: Efl.Access.State_Type; [[Type of the state changed event]]
    new_value: bool; [[New value]]
 }
 
-struct Efl.Access.Event.Geometry_Changed.Data
+struct @beta Efl.Access.Event.Geometry_Changed.Data
 {
    [[Accessibility geometry changed event data]]
    x: int; [[X coordinate]]
@@ -216,7 +216,7 @@ struct Efl.Access.Event.Geometry_Changed.Data
    height: int; [[Height]]
 }
 
-struct Efl.Access.Event.Children_Changed.Data
+struct @beta Efl.Access.Event.Children_Changed.Data
 {
    [[Accessibility children changed event data]]
    is_added: bool; [[Child is added or not]]
@@ -230,7 +230,7 @@ struct @free(efl_access_attribute_free) Efl.Access.Attribute
    value: string; [[Attribute value]]
 }
 
-struct Efl.Access.Relation
+struct @beta Efl.Access.Relation
 {
    [[Accessibility Relation]]
    type: Efl.Access.Relation_Type; [[Relation type]]
diff --git a/src/lib/elementary/efl_access_text.eo b/src/lib/elementary/efl_access_text.eo
index d16874fb2f..0d42c02c7b 100644
--- a/src/lib/elementary/efl_access_text.eo
+++ b/src/lib/elementary/efl_access_text.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-enum Efl.Access.Text_Granularity
+enum @beta Efl.Access.Text_Granularity
 {
    [[Text accessibility granularity]]
    char, [[Character granularity]]
@@ -10,7 +10,7 @@ enum Efl.Access.Text_Granularity
    paragraph [[Paragraph granularity]]
 }
 
-enum Efl.Access.Text_Clip_Type
+enum @beta Efl.Access.Text_Clip_Type
 {
    [[Text clip type]]
    none, [[No clip type]]
@@ -34,7 +34,7 @@ struct @free(elm_atspi_text_text_range_free) Efl.Access.Text_Range
    content: ptr(char); [[Range content]]
 }
 
-struct Efl.Access.Text_Change_Info
+struct @beta Efl.Access.Text_Change_Info
 {
    [[Text change information]]
    content: string; [[Change content]]
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index bc9c2bcce7..20310e6faf 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -31,7 +31,7 @@ enum Efl.Ui.Focus.Move_Policy
                Left, Right, Up, Down, Tab, or Shift+Tab.]]
 }
 
-enum Efl.Ui.Slider_Indicator_Visible_Mode
+enum @beta Efl.Ui.Slider_Indicator_Visible_Mode
 {
    [[Slider's indicator visibility mode.
 
@@ -54,7 +54,7 @@ enum Efl.Ui.Focus.Autoscroll_Mode
    bring_in [[Bring in the focused region or item automatically which might invole the scrolling.]]
 }
 
-enum Efl.Ui.Softcursor_Mode
+enum @beta Efl.Ui.Softcursor_Mode
 {
    [[Software cursor mode.
 
@@ -66,7 +66,7 @@ enum Efl.Ui.Softcursor_Mode
 }
 
 /* 'on_access_activate' is beta API in the Widget class */
-enum Efl.Ui.Activate
+enum @beta Efl.Ui.Activate
 {
    [[Accessibility ]]
    default = 0, [[Activate default]]
@@ -77,7 +77,7 @@ enum Efl.Ui.Activate
    back, [[Activate back]]
 }
 
-enum Efl.Ui.Widget_Orientation_Mode
+enum @beta Efl.Ui.Widget_Orientation_Mode
 {
    [[Widget orientation mode, or how the theme handles screen orientation.
 
@@ -92,4 +92,4 @@ enum Efl.Ui.Widget_Orientation_Mode
 }
 
 /* Types for A11Y (internal/beta API) */
-type @extern Efl.Access.Action_Data: __undefined_type; [[Internal struct for accesssibility.]]
+type @beta @extern Efl.Access.Action_Data: __undefined_type; [[Internal struct for accesssibility.]]
diff --git a/src/lib/elementary/efl_ui_alert_popup.eo b/src/lib/elementary/efl_ui_alert_popup.eo
index 9b2e911592..48e6bbae51 100644
--- a/src/lib/elementary/efl_ui_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_alert_popup.eo
@@ -1,11 +1,11 @@
-enum Efl.Ui.Alert_Popup_Button {
+enum @beta Efl.Ui.Alert_Popup_Button {
    [[Defines the type of the alert button.]]
    positive = 0, [[Button having positive meaning. e.g. "Yes"]]
    negative, [[Button having negative meaning. e.g. "No"]]
    user [[Button having user-defined meaning. e.g. "Cancel"]]
 }
 
-struct Efl.Ui.Alert_Popup_Button_Clicked_Event {
+struct @beta Efl.Ui.Alert_Popup_Button_Clicked_Event {
    [[Information of clicked event]]
    button_type: Efl.Ui.Alert_Popup_Button; [[Clicked button type]]
 }
diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo
index 7bf81da305..888319d382 100644
--- a/src/lib/elementary/efl_ui_calendar.eo
+++ b/src/lib/elementary/efl_ui_calendar.eo
@@ -1,6 +1,6 @@
 import efl_types;
 
-enum Efl.Ui.Calendar_Weekday
+enum @beta Efl.Ui.Calendar_Weekday
 {
    [[A weekday
 
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 7f8486684a..e2c7fdec6e 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -1,6 +1,6 @@
 import efl_types;
 
-enum Efl.Ui.Clock_Type
+enum @beta Efl.Ui.Clock_Type
 {
    [[Identifies a clock field, The widget supports 6 fields : Year, month,
      Date, Hour, Minute, AM/PM
diff --git a/src/lib/elementary/efl_ui_dnd_types.eot b/src/lib/elementary/efl_ui_dnd_types.eot
index f07de0bc33..9f24c6682d 100644
--- a/src/lib/elementary/efl_ui_dnd_types.eot
+++ b/src/lib/elementary/efl_ui_dnd_types.eot
@@ -1,6 +1,6 @@
 import efl_ui_selection_types;
 
-function Efl.Dnd.Drag_Icon_Create {
+function @beta Efl.Dnd.Drag_Icon_Create {
    [[Function pointer for creating icon at the drag side.]]
    params {
       @in win: Efl.Canvas.Object; [[The window to create the objects relative to]]
@@ -10,7 +10,7 @@ function Efl.Dnd.Drag_Icon_Create {
    return: Efl.Canvas.Object; [[The drag icon object]]
 };
 
-function Efl.Dnd.Drag_Data_Get {
+function @beta Efl.Dnd.Drag_Data_Get {
    [[Function pointer for getting data and format at the drag side.]]
    params {
       @in obj: Efl.Canvas.Object; [[The container object]]
@@ -20,7 +20,7 @@ function Efl.Dnd.Drag_Data_Get {
    }
 };
 
-function Efl.Dnd.Item_Get {
+function @beta Efl.Dnd.Item_Get {
    [[Function pointer to find out which item is under position (x, y)]]
    params {
       @in obj: Efl.Canvas.Object; [[The container object]]
@@ -30,7 +30,7 @@ function Efl.Dnd.Item_Get {
    return: Efl.Object; [[Object under x,y coordinates or NULL if not found]]
 };
 
-function Efl.Dnd.Drag_Icon_List_Create {
+function @beta Efl.Dnd.Drag_Icon_List_Create {
    [[Function pointer to create list of icons at the drag side.
      These icons are used for animation on combining selection icons
      to one icon.]]
@@ -40,18 +40,18 @@ function Efl.Dnd.Drag_Icon_List_Create {
    return: list<Efl.Canvas.Object>;
 };
 
-struct Efl.Dnd.Drag_Accept {
+struct @beta Efl.Dnd.Drag_Accept {
    accepted: bool;
 }
 
-struct Efl.Dnd.Drag_Pos {
+struct @beta Efl.Dnd.Drag_Pos {
    pos: Eina.Position2D; [[Evas Coordinate]]
    action: Efl.Ui.Selection_Action; [[The drag action]]
    format: Efl.Ui.Selection_Format; [[The drag format]]
    item: Efl.Canvas.Object; [[The item object. It is only available for container object.]]
 }
 
-struct Efl.Dnd.Drag_Item_Container_Drop {
+struct @beta Efl.Dnd.Drag_Item_Container_Drop {
    item: Efl.Canvas.Object; [[The item object]]
    data: Efl.Ui.Selection_Data; [[The selection data]]
    pos: Eina.Position2D; [[Position relative to item (left (-1), middle (0), right (1)]]
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index e98a982190..fb5a931067 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -1,6 +1,6 @@
 import efl_ui_direction;
 
-enum Efl.Ui.Flip_Mode
+enum @beta Efl.Ui.Flip_Mode
 {
    [[Efl UI flip mode ]]
    rotate_y_center_axis, [[Rotate Y center axis flip mode]]
@@ -18,7 +18,7 @@ enum Efl.Ui.Flip_Mode
    cross_fade, [[Cross fade flip mode]]
 }
 
-enum Efl.Ui.Flip_Interaction
+enum @beta Efl.Ui.Flip_Interaction
 {
    [[Efl UI flip interaction]]
    none, [[No interaction]]
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index ad48c3d76d..7da1f4c771 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -1,4 +1,4 @@
-struct Efl.Ui.Image_Progress
+struct @beta Efl.Ui.Image_Progress
 {
    [[
      Structure associated with smart callback 'download,progress'.
@@ -8,7 +8,7 @@ struct Efl.Ui.Image_Progress
    total: double; [[Total percentage]]
 }
 
-struct Efl.Ui.Image_Error
+struct @beta Efl.Ui.Image_Error
 {
    [[
      Structure associated with smart callback 'download,progress'.
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.eo b/src/lib/elementary/efl_ui_internal_text_scroller.eo
index 4b46694b6b..4e20e9bea7 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.eo
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Text_Scroller_Mode
+enum @beta Efl.Ui.Text_Scroller_Mode
 {
    default = 0,
    singleline = 0,
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index f3a4b33468..9112e6fc78 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-struct Efl.Ui.List_View_Item_Event
+struct @beta Efl.Ui.List_View_Item_Event
 {
    layout: Efl.Ui.Layout;
    child: Efl.Model;
diff --git a/src/lib/elementary/efl_ui_list_view_types.eot b/src/lib/elementary/efl_ui_list_view_types.eot
index b733b28dc7..93a0561c3e 100644
--- a/src/lib/elementary/efl_ui_list_view_types.eot
+++ b/src/lib/elementary/efl_ui_list_view_types.eot
@@ -9,4 +9,4 @@ struct @free(free) Efl.Ui.List_View_Layout_Item {
    pos: Eina.Position2D;
 }
 
-struct Efl_Ui_List_View_Seg_Array;
+struct @beta Efl_Ui_List_View_Seg_Array;
diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo
index a183ba3a92..5a3a974adf 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Pager_Loop
+enum @beta Efl.Ui.Pager_Loop
 {
    [[Efl ui pager loop mode]]
    disabled,
diff --git a/src/lib/elementary/efl_ui_panel.eo b/src/lib/elementary/efl_ui_panel.eo
index 2d93f2b54a..fffe726ccb 100644
--- a/src/lib/elementary/efl_ui_panel.eo
+++ b/src/lib/elementary/efl_ui_panel.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Panel_Orient
+enum @beta Efl.Ui.Panel_Orient
 {
    [[Panel orientation mode]]
 
@@ -8,7 +8,7 @@ enum Efl.Ui.Panel_Orient
    right [[Panel (dis)appears from the right]]
 }
 
-struct Efl.Ui.Panel_Scroll_Info
+struct @beta Efl.Ui.Panel_Scroll_Info
 {
    [[Panel scroll information]]
    rel_x: double; [[content scrolled position (0.0 ~ 1.0) in the panel]]
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index edc408120a..4fc5548e6b 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Popup_Align {
+enum @beta Efl.Ui.Popup_Align {
     [[Popup alignment type]]
     none = 0, [[Popup not aligned]]
     center,   [[Popup aligned to center]]
diff --git a/src/lib/elementary/efl_ui_selection_types.eot b/src/lib/elementary/efl_ui_selection_types.eot
index cab30d8b69..98bbfbdc5a 100644
--- a/src/lib/elementary/efl_ui_selection_types.eot
+++ b/src/lib/elementary/efl_ui_selection_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Ui.Selection_Type
+enum @beta Efl.Ui.Selection_Type
 {
    [[Selection type]]
    primary, [[Primary text selection (highlighted or selected text)]]
@@ -7,7 +7,7 @@ enum Efl.Ui.Selection_Type
    clipboard [[Clipboard selection (ctrl+C)]]
 }
 
-enum Efl.Ui.Selection_Format
+enum @beta Efl.Ui.Selection_Format
 {
    [[Selection format]]
    targets = -1, [[For matching every possible atom]]
@@ -19,7 +19,7 @@ enum Efl.Ui.Selection_Format
    html = 0x10 [[Raw HTML-like data (eg. webkit)]]
 }
 
-enum Efl.Ui.Selection_Action
+enum @beta Efl.Ui.Selection_Action
 {
    [[Defines the kind of action associated with the drop data]]
    unknown, [[Action type is unknown]]
@@ -32,7 +32,7 @@ enum Efl.Ui.Selection_Action
    description [[Describe the data]]
 }
 
-struct Efl.Ui.Selection_Data
+struct @beta Efl.Ui.Selection_Data
 {
    [[Structure holding the info about selected data]]
    pos: Eina.Position2D; [[Coordinates of the drop (DND operations only)]]
@@ -42,7 +42,7 @@ struct Efl.Ui.Selection_Data
    item: Efl.Object; [[Item under the drag position. It is only available for container]]
 }
 
-function Efl.Ui.Selection_Data_Ready {
+function @beta Efl.Ui.Selection_Data_Ready {
    [[Function pointer for getting selection]]
    params {
       @in obj: Efl.Object; [[Object which requested for the selection]]
@@ -50,7 +50,7 @@ function Efl.Ui.Selection_Data_Ready {
    }
 };
 
-struct Efl.Ui.Selection_Changed
+struct @beta Efl.Ui.Selection_Changed
 {
    type: Efl.Ui.Selection_Type; [[Selection type]]
    seat: int; [[The seat on which the selection changed, or NULL for "default"]]
diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo
index 7fa515b38f..be06558691 100644
--- a/src/lib/elementary/efl_ui_spin.eo
+++ b/src/lib/elementary/efl_ui_spin.eo
@@ -1,4 +1,4 @@
-struct Efl.Ui.Spin_Special_Value
+struct @beta Efl.Ui.Spin_Special_Value
 {
    [[Special value]]
    value: double; [[Target value]]
diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo
index 2351a3869b..8fbc2cf2ed 100644
--- a/src/lib/elementary/efl_ui_stack.eo
+++ b/src/lib/elementary/efl_ui_stack.eo
@@ -1,19 +1,19 @@
-struct Efl.Ui.Stack_Event_Loaded {
+struct @beta Efl.Ui.Stack_Event_Loaded {
    [[Information of loaded event.]]
    content: Efl.Canvas.Object; [[Loaded content.]]
 }
 
-struct Efl.Ui.Stack_Event_Unloaded {
+struct @beta Efl.Ui.Stack_Event_Unloaded {
    [[Information of unloaded event.]]
    content: Efl.Canvas.Object; [[Unloaded content.]]
 }
 
-struct Efl.Ui.Stack_Event_Activated {
+struct @beta Efl.Ui.Stack_Event_Activated {
    [[Information of activated event.]]
    content: Efl.Canvas.Object; [[Activated content.]]
 }
 
-struct Efl.Ui.Stack_Event_Deactivated {
+struct @beta Efl.Ui.Stack_Event_Deactivated {
    [[Information of deactivated event.]]
    content: Efl.Canvas.Object; [[Deactivated content.]]
 }
diff --git a/src/lib/elementary/efl_ui_tab_page.eo b/src/lib/elementary/efl_ui_tab_page.eo
index e20a7e6870..818277cfad 100644
--- a/src/lib/elementary/efl_ui_tab_page.eo
+++ b/src/lib/elementary/efl_ui_tab_page.eo
@@ -1,9 +1,9 @@
-enum Efl.Ui.Tab_Page_Tab_Changed {
+enum @beta Efl.Ui.Tab_Page_Tab_Changed {
    label = 0, [[Label changed]]
    icon [[Icon changed]]
 }
 
-struct Efl.Ui.Tab_Page_Tab_Changed_Event {
+struct @beta Efl.Ui.Tab_Page_Tab_Changed_Event {
    [[Information of changed event]]
    changed_info: Efl.Ui.Tab_Page_Tab_Changed;
 }
diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo
index fc4642bb62..b403d149f5 100644
--- a/src/lib/elementary/efl_ui_textpath.eo
+++ b/src/lib/elementary/efl_ui_textpath.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Textpath_Direction {
+enum @beta Efl.Ui.Textpath_Direction {
     [[Textpath direction]]
     cw, [[Clockwise]]
     ccw [[Counter-clockwise]]
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 3d94b504bd..edbdaa5331 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -1,4 +1,4 @@
-function Efl.Ui.Scrollable_On_Show_Region {
+function @beta Efl.Ui.Scrollable_On_Show_Region {
    [[Function pointer for on show region hook]]
    params {
       @in obj: Efl.Canvas.Object; [[Canvas object]]
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 13a3306f72..4143e06629 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -1,4 +1,4 @@
-enum Efl.Ui.Win_Type
+enum @beta Efl.Ui.Win_Type
 {
    [[Defines the types of window that can be created
 
@@ -46,7 +46,7 @@ enum Efl.Ui.Win_Type
                         ]]
 }
 
-enum Efl.Ui.Win_Keyboard_Mode
+enum @beta Efl.Ui.Win_Keyboard_Mode
 {
    [[The different layouts that can be requested for the virtual keyboard.
 
@@ -87,7 +87,7 @@ enum Efl.Ui.Win_Indicator_Mode
             If user flicks the upper side of window, the indicator is shown temporarily.]]
 }
 
-enum Efl.Ui.Win_Modal_Mode
+enum @beta Efl.Ui.Win_Modal_Mode
 {
    [[Defines the mode of a modal window]]
 
@@ -95,7 +95,7 @@ enum Efl.Ui.Win_Modal_Mode
    modal [[The window is modal window.]]
 }
 
-enum Efl.Ui.Win_Urgent_Mode
+enum @beta Efl.Ui.Win_Urgent_Mode
 {
    [[Defines the mode of a urgent window.]]
 
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index c43adfd52b..650913f781 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -1,5 +1,5 @@
 /* FIXME: this widget should just implement a scroller */
-enum Elm.Code_Widget_Scroller_Policy
+enum @beta Elm.Code_Widget_Scroller_Policy
 {
    [[Type that controls when scrollbars should appear.
 
diff --git a/src/lib/evas/canvas/efl_canvas_animation_types.eot b/src/lib/evas/canvas/efl_canvas_animation_types.eot
index ad3aecc637..23e89aef0d 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_types.eot
+++ b/src/lib/evas/canvas/efl_canvas_animation_types.eot
@@ -1,9 +1,9 @@
 // ----------------------------------------------------------------------------
 // All the below types are for Efl Animation
 
-struct Efl.Canvas.Animation_Player_Event_Running; [[Information of event running]]
+struct @beta Efl.Canvas.Animation_Player_Event_Running; [[Information of event running]]
 
-enum Efl.Canvas.Animation_Repeat_Mode
+enum @beta Efl.Canvas.Animation_Repeat_Mode
 {
    [[Animation repeat mode]]
 
diff --git a/src/lib/evas/canvas/efl_canvas_filter_internal.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
index fc8ac18a0e..052c327d9c 100644
--- a/src/lib/evas/canvas/efl_canvas_filter_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
@@ -3,7 +3,7 @@
 /* Everything in this file is internal to Evas. It is not meant to be used
    from outside EFL itself! */
 
-struct Efl.Gfx.Color32
+struct @beta Efl.Gfx.Color32
 {
    [[32 bit color data structure]]
    r: uint8; [[Red component of the color]]
@@ -12,14 +12,14 @@ struct Efl.Gfx.Color32
    a: uint8; [[Translucent component of the color]]
 }
 
-struct Efl.Canvas.Filter.State_Name
+struct @beta Efl.Canvas.Filter.State_Name
 {
    [[Filter state name structure]]
    name: string; [[Filter state name]]
    value: double; [[Filter state value]]
 }
 
-struct Efl.Canvas.Filter.State_Text
+struct @beta Efl.Canvas.Filter.State_Text
 {
    [[Filter state text structure]]
    outline: Efl.Gfx.Color32; [[Text outline color]]
@@ -28,7 +28,7 @@ struct Efl.Canvas.Filter.State_Text
    glow2: Efl.Gfx.Color32; [[Text glow2 color]]
 }
 
-struct Efl.Canvas.Filter.State
+struct @beta Efl.Canvas.Filter.State
 {
    [[Internal structure representing the state of a Gfx Filter]]
    text: Efl.Canvas.Filter.State_Text; [[Text state]]
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index d449c803d8..b43f68bbdf 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,6 +1,6 @@
 import efl_text_types;
 
-struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
+struct @beta Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
 struct Efl.Event_Animator_Tick {
    [[EFL event animator tick data structure]]
    update_area: Eina.Rect; [[Area of the canvas that will be pushed to screen.]]
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
index 6572a8e04f..129429c06e 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
@@ -1,4 +1,4 @@
-struct Efl.Canvas.Surface_X11_Pixmap
+struct @beta Efl.Canvas.Surface_X11_Pixmap
 {
    [[The type used by @Efl.Canvas.Surface.native_buffer.]]
    visual: void_ptr; [[X11 Visual for this Pixmap.]]
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index ef53030272..d6c350eef2 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -1,6 +1,6 @@
 import efl_text_types;
 
-struct Efl.Canvas.Text_Style; [[EFL text style data structure]]
+struct @beta Efl.Canvas.Text_Style; [[EFL text style data structure]]
 
 class @beta Efl.Canvas.Text extends Efl.Canvas.Object implements Efl.Text,
                        Efl.Canvas.Filter.Internal, Efl.Text_Font,
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.eo b/src/lib/evas/canvas/efl_canvas_vg_object.eo
index 56bee06009..b458edf70a 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.eo
@@ -1,4 +1,4 @@
-enum Efl.Canvas.Vg.Fill_Mode
+enum @beta Efl.Canvas.Vg.Fill_Mode
 {
    [[Enumeration that defines how viewbox will be filled int the vg canvs's viewport.
      default Fill_Mode is $none]]
diff --git a/src/lib/evas/canvas/evas_canvas3d_types.eot b/src/lib/evas/canvas/evas_canvas3d_types.eot
index a050af3be9..81e3030e19 100644
--- a/src/lib/evas/canvas/evas_canvas3d_types.eot
+++ b/src/lib/evas/canvas/evas_canvas3d_types.eot
@@ -1,9 +1,9 @@
 // ----------------------------------------------------------------------------
 // All the below types are for Evas 3D
 
-type Evas.Real: double; [[A type for floating value]]
+type @beta Evas.Real: double; [[A type for floating value]]
 
-enum Evas.Canvas3D.Object_Type
+enum @beta Evas.Canvas3D.Object_Type
 {
    [[Type of 3D Object
 
@@ -21,7 +21,7 @@ enum Evas.Canvas3D.Object_Type
                @since 1.15]]
 }
 
-enum Evas.Canvas3D.State
+enum @beta Evas.Canvas3D.State
 {
    [[State of the Evas 3D
 
@@ -94,7 +94,7 @@ enum Evas.Canvas3D.State
               @since 1.18]]
 }
 
-enum Evas.Canvas3D.Space
+enum @beta Evas.Canvas3D.Space
 {
    [[Transform space
 
@@ -104,7 +104,7 @@ enum Evas.Canvas3D.Space
    world      [[World coordinate space]]
 }
 
-enum Evas.Canvas3D.Node_Type
+enum @beta Evas.Canvas3D.Node_Type
 {
    [[Types of a node
 
@@ -116,7 +116,7 @@ enum Evas.Canvas3D.Node_Type
    mesh      [[Node which can contain mesh objects]]
 }
 
-enum Evas.Canvas3D.Node_Orientation_Type
+enum @beta Evas.Canvas3D.Node_Orientation_Type
 {
    [[Types of node orientation
 
@@ -128,7 +128,7 @@ enum Evas.Canvas3D.Node_Orientation_Type
    quaternion  [[Node orientation is given as a quaternion]]
 }
 
-enum Evas.Canvas3D.Index_Format
+enum @beta Evas.Canvas3D.Index_Format
 {
    [[Index formats
 
@@ -138,7 +138,7 @@ enum Evas.Canvas3D.Index_Format
    unsigned_short [[Index is of type unsigned short]]
 }
 
-enum Evas.Canvas3D.Frustum_Mode
+enum @beta Evas.Canvas3D.Frustum_Mode
 {
   [[Frustum modes
 
@@ -148,7 +148,7 @@ enum Evas.Canvas3D.Frustum_Mode
    central_point [[Central point]]
 }
 
-enum Evas.Canvas3D.Vertex_Assembly
+enum @beta Evas.Canvas3D.Vertex_Assembly
 {
    [[Vertex assembly modes. Vertex assembly represents how the vertices are organized into geometric primitives.
 
@@ -162,7 +162,7 @@ enum Evas.Canvas3D.Vertex_Assembly
    triangle_fan    [[Vertices are organized as a triangle fan]]
 }
 
-enum Evas.Canvas3D.Comparison
+enum @beta Evas.Canvas3D.Comparison
 {
   [[Comparsion functions for testing(alpha, depth, stencil) in fragment shader
 
@@ -177,7 +177,7 @@ enum Evas.Canvas3D.Comparison
    always    [[Always passes (initial value)]]
 }
 
-enum Evas.Canvas3D.Wrap_Mode
+enum @beta Evas.Canvas3D.Wrap_Mode
 {
   [[Wrap modes for texture units
 
@@ -187,7 +187,7 @@ enum Evas.Canvas3D.Wrap_Mode
    reflect    [[Values will be repeated in a reflected manner]]
 }
 
-enum Evas.Canvas3D.Texture_Filter
+enum @beta Evas.Canvas3D.Texture_Filter
 {
   [[Filters for texture units
 
@@ -200,7 +200,7 @@ enum Evas.Canvas3D.Texture_Filter
    linear_mipmap_linear    [[Linear sampling in mipmap and interpolate]]
 }
 
-enum Evas.Canvas3D.Mesh_Primitive
+enum @beta Evas.Canvas3D.Mesh_Primitive
 {
    [[Mesh primitive
 
@@ -217,7 +217,7 @@ enum Evas.Canvas3D.Mesh_Primitive
    count     [[Sentinel value to indicate last enum field during iteration]]
 }
 
-enum Evas.Canvas3D.Primitive_Mode
+enum @beta Evas.Canvas3D.Primitive_Mode
 {
    [[Mode of mesh primitive
 
@@ -227,7 +227,7 @@ enum Evas.Canvas3D.Primitive_Mode
    alternative_uv [[Ptimitive with alternative uv (supported for sphere)]]
 }
 
-enum Evas.Canvas3D.Shader_Mode
+enum @beta Evas.Canvas3D.Shader_Mode
 {
    [[Shader shade modes
 
@@ -243,7 +243,7 @@ enum Evas.Canvas3D.Shader_Mode
    post_processing_FXAA [[Render full screen quard]]
 }
 
-enum Evas.Canvas3D.Vertex_Attrib
+enum @beta Evas.Canvas3D.Vertex_Attrib
 {
    [[Vertex attribute IDs
 
@@ -255,7 +255,7 @@ enum Evas.Canvas3D.Vertex_Attrib
    texcoord       [[vertex texture coordinate]]
 }
 
-enum Evas.Canvas3D.Blend_Func
+enum @beta Evas.Canvas3D.Blend_Func
 {
    [[Blending function
 
@@ -278,7 +278,7 @@ enum Evas.Canvas3D.Blend_Func
    src_alpha_saturate        [[The scale factors for color components is (i, i, i, 1) where i = min(as, ka, ad)/ka]]
 }
 
-enum Evas.Canvas3D.Material_Attrib
+enum @beta Evas.Canvas3D.Material_Attrib
 {
   [[Material attributes
 
@@ -290,4 +290,4 @@ enum Evas.Canvas3D.Material_Attrib
    normal       [[Normal map term]]
 }
 
-type Evas.Canvas3D.Surface_Func: __undefined_type; [[Evas 3D canvas surface function type]]
+type @beta Evas.Canvas3D.Surface_Func: __undefined_type; [[Evas 3D canvas surface function type]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_types.eot b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
index 4dbf88c727..8be4528405 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_types.eot
+++ b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
@@ -1,4 +1,4 @@
-enum Efl.Canvas.Gesture_Touch_State
+enum @beta Efl.Canvas.Gesture_Touch_State
 {
    [[ This enum type describes the state of a touch event. ]]
    legacy: efl_gesture_touch;
@@ -8,7 +8,7 @@ enum Efl.Canvas.Gesture_Touch_State
    end,         [[Last fingure touch up]]
 }
 
-enum Efl.Canvas.Gesture_State
+enum @beta Efl.Canvas.Gesture_State
 {
    [[ This enum type describes the state of a gesture. ]]
    legacy: efl_gesture;
@@ -19,7 +19,7 @@ enum Efl.Canvas.Gesture_State
    canceled,    [[A gesture was canceled.]]
 }
 
-enum Efl.Canvas.Gesture_Recognizer_Result
+enum @beta Efl.Canvas.Gesture_Recognizer_Result
 {
    [[ This enum type describes the state of a gesture recognizer. ]]
    legacy: efl_gesture;