diff --git a/src/lib/ecore/efl_app.eo b/src/lib/ecore/efl_app.eo
index 7197c295bf..f38ec8312b 100644
--- a/src/lib/ecore/efl_app.eo
+++ b/src/lib/ecore/efl_app.eo
@@ -8,7 +8,7 @@ abstract Efl.App extends Efl.Loop implements Efl.Core.Command_Line
    ]]
    data: null;
    methods {
-      @property app_main @class {
+      @property app_main @static {
          [[ Returns the app object that is representing this process
 
             Note: This function call only works in the main loop thread of the process.
diff --git a/src/lib/ecore/efl_core_proc_env.eo b/src/lib/ecore/efl_core_proc_env.eo
index 2641105338..63260145e0 100644
--- a/src/lib/ecore/efl_core_proc_env.eo
+++ b/src/lib/ecore/efl_core_proc_env.eo
@@ -2,7 +2,7 @@ class @beta Efl.Core.Proc_Env extends Efl.Core.Env
 {
    c_prefix: efl_env;
    methods {
-    self @class {
+    self @static {
       [[Get a instance of this object
 
         The object will apply the environment operations onto this process.
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo b/src/lib/ecore_con/efl_net_dialer_http.eo
index 3b7c9b2965..a44b50a251 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.eo
+++ b/src/lib/ecore_con/efl_net_dialer_http.eo
@@ -361,7 +361,7 @@ class @beta Efl.Net.Dialer_Http extends Efl.Loop_Consumer implements Efl.Net.Dia
             }
         }
 
-        date_parse @class {
+        date_parse @static {
             [[Parses the given string as time in seconds since 1/1/1970.
 
               This method is useful to parse header values such as
@@ -373,7 +373,7 @@ class @beta Efl.Net.Dialer_Http extends Efl.Loop_Consumer implements Efl.Net.Dia
             return: int64; [[Seconds since 1/1/1970]]
         }
 
-        date_serialize @class {
+        date_serialize @static {
             [[Serializes the given GMT time in seconds since 1/1/1970.
 
               The timezone must be GMT (ie: gmtime()).
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo b/src/lib/ecore_con/efl_net_ip_address.eo
index effdf47274..3d6eaba13b 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -37,7 +37,7 @@ class @beta Efl.Net.Ip_Address extends Efl.Object {
     ]]
 
     methods {
-        create @class {
+        create @static {
             [[Creates an object given family, port and address.
 
               This is a convenience to create an object in a single
@@ -51,7 +51,7 @@ class @beta Efl.Net.Ip_Address extends Efl.Object {
             return: Efl.Net.Ip_Address @owned; [[Newly created object or $NULL if parameters were invalid.]]
         }
 
-        create_sockaddr @class {
+        create_sockaddr @static {
             [[Creates an object given sockaddr
 
               This is a convenient way to create an object in a single call.
@@ -64,7 +64,7 @@ class @beta Efl.Net.Ip_Address extends Efl.Object {
             return: Efl.Net.Ip_Address @owned; [[Newly created object or $NULL if parameter was invalid.]]
         }
 
-        parse @class {
+        parse @static {
             [[Parses a numeric address and return an object representing it.
 
               This parses a numeric IPv4 or IPv6 address and optional
@@ -88,7 +88,7 @@ class @beta Efl.Net.Ip_Address extends Efl.Object {
             return: Efl.Net.Ip_Address @owned; [[The new IP address object or NULL if it failed to parse]]
         }
 
-        resolve @class {
+        resolve @static {
             [[Asynchronously resolves host and port names.
 
               This will resolve the host and port names, returning the
diff --git a/src/lib/ecore_con/efl_net_ssl_context.eo b/src/lib/ecore_con/efl_net_ssl_context.eo
index 26fd68f1de..fb40620dfc 100644
--- a/src/lib/ecore_con/efl_net_ssl_context.eo
+++ b/src/lib/ecore_con/efl_net_ssl_context.eo
@@ -15,7 +15,7 @@ class @beta Efl.Net.Ssl.Context extends Efl.Object {
     ]]
 
     methods {
-        @property default_dialer @class {
+        @property default_dialer @static {
             [[The default context for dialers.
 
               It will start with:
diff --git a/src/lib/efl/interfaces/efl_text_markup_util.eo b/src/lib/efl/interfaces/efl_text_markup_util.eo
index 96237fc740..5b2bd589ee 100644
--- a/src/lib/efl/interfaces/efl_text_markup_util.eo
+++ b/src/lib/efl/interfaces/efl_text_markup_util.eo
@@ -3,7 +3,7 @@ class @beta Efl.Text_Markup_Util {
    ]]
    data: null;
    methods {
-      text_to_markup @class {
+      text_to_markup @static {
          [[Converts a given (UTF-8) text to a markup-compatible string.
            This is used mainly to set a plain text with the $.markup_set
            property.
@@ -13,7 +13,7 @@ class @beta Efl.Text_Markup_Util {
          }
          return: mstring @owned; [[The markup representation of given text]]
       }
-      markup_to_text @class {
+      markup_to_text @static {
          [[Converts a given (UTF-8) text to a markup-compatible string.
            This is used mainly to set a plain text with the $.markup_set
            property.
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index 9e7dc5da0f..8f23a9d995 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -358,7 +358,7 @@ mixin @beta Efl.Access.Object requires Efl.Object
             states: Efl.Access.State_Set; [[Accessible state set]]
          }
       }
-      event_handler_add @class @protected @beta {
+      event_handler_add @static @protected @beta {
          [[Register accessibility event listener]]
          params {
               @in cb: Efl.Event_Cb; [[Callback]]
@@ -366,13 +366,13 @@ mixin @beta Efl.Access.Object requires Efl.Object
          }
          return: ptr(Efl.Access.Event.Handler); [[Event handler]]
       }
-      event_handler_del @class @protected @beta {
+      event_handler_del @static @protected @beta {
          [[Deregister accessibility event listener]]
          params {
               @in handler: ptr(Efl.Access.Event.Handler); [[Event handler]]
          }
       }
-      event_emit @class @protected @beta {
+      event_emit @static @protected @beta {
           [[Emit event]]
          params {
             @in accessible: Efl.Access.Object; [[Accessibility object.]]
@@ -445,7 +445,7 @@ mixin @beta Efl.Access.Object requires Efl.Object
       relationships_clear @beta {
          [[Removes all relationships in accessible object.]]
       }
-      @property access_root @class @beta {
+      @property access_root @static @beta {
          get {
             [[Get root object of accessible object hierarchy]]
             values {
diff --git a/src/lib/elementary/efl_ui_action_connector.eo b/src/lib/elementary/efl_ui_action_connector.eo
index 40fda6a6e6..1c3f4f7ee2 100644
--- a/src/lib/elementary/efl_ui_action_connector.eo
+++ b/src/lib/elementary/efl_ui_action_connector.eo
@@ -4,7 +4,7 @@ class @beta Efl.Ui.Action_Connector {
     For example, this simplifies creating widgets that implement the @Efl.Input.Clickable interface.
   ]]
   methods {
-    bind_clickable_to_theme @class {
+    bind_clickable_to_theme @static {
       [[This will listen to the standard "click" events on a theme and emit the appropriate
         events through the @Efl.Input.Clickable interface.
 
@@ -19,7 +19,7 @@ class @beta Efl.Ui.Action_Connector {
         clickable : Efl.Input.Clickable; [[The object to call the clickable methods on.]]
       }
     }
-    bind_clickable_to_object @class {
+    bind_clickable_to_object @static {
       [[This will listen to the standard "click" events on an object, and emit the appropriate
         events through the @Efl.Input.Clickable interface.
 
diff --git a/src/lib/elementary/efl_ui_focus_util.eo b/src/lib/elementary/efl_ui_focus_util.eo
index c19c05cb18..40b38a540e 100644
--- a/src/lib/elementary/efl_ui_focus_util.eo
+++ b/src/lib/elementary/efl_ui_focus_util.eo
@@ -1,20 +1,20 @@
 class @beta Efl.Ui.Focus.Util extends Efl.Object  {
    [[EFL UI Focus Util class]]
    methods {
-      focus @class {
+      focus @static {
          [[Focus helper method]]
          params {
             focus_elem : Efl.Ui.Focus.Object; [[Focus element]]
          }
       }
-      active_manager @class {
+      active_manager @static {
          [[Get the highest manager in the redirect property]]
          params {
             manager : Efl.Ui.Focus.Manager;
          }
          return: Efl.Ui.Focus.Manager;
       }
-      direction_complement @class {
+      direction_complement @static {
          params {
             dir : Efl.Ui.Focus.Direction;
          }
diff --git a/src/lib/elementary/efl_ui_spotlight_util.eo b/src/lib/elementary/efl_ui_spotlight_util.eo
index 19d446ac61..0f1335bef0 100644
--- a/src/lib/elementary/efl_ui_spotlight_util.eo
+++ b/src/lib/elementary/efl_ui_spotlight_util.eo
@@ -1,6 +1,6 @@
 class @beta Efl.Ui.Spotlight.Util {
   methods {
-     stack_gen @class {
+     stack_gen @static {
        [[Get a preconfigured stack obejct]]
        params {
           parent : Efl.Ui.Widget;
diff --git a/src/lib/elementary/efl_ui_theme.eo b/src/lib/elementary/efl_ui_theme.eo
index f167a23b47..a11381d2c3 100644
--- a/src/lib/elementary/efl_ui_theme.eo
+++ b/src/lib/elementary/efl_ui_theme.eo
@@ -4,7 +4,7 @@ class @beta Efl.Ui.Theme extends Efl.Object
    c_prefix: efl_ui_theme;
    data: Efl_Ui_Theme_Data;
    methods {
-      @property default @class {
+      @property default @static {
          [[This is the default theme.
 
            All widgets use the default theme implicitly unless a specific theme
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 0148f4e214..bf0582d1c9 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -608,7 +608,7 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.W
            This will try and delete all the windows in the stack that
            are above the window.]]
       }
-      @property exit_on_all_windows_closed @class {
+      @property exit_on_all_windows_closed @static {
          [[Enable quitting the main loop when all windows are closed.
 
            When set, the main loop will quit with the passed exit code once all windows have been closed.
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 2548f9d6f3..02557351a6 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -143,7 +143,7 @@ abstract Efl.Object
             @in sb: strbuf; [[A string buffer, must not be $null.]]
          }
       }
-      @property event_global_freeze_count @class {
+      @property event_global_freeze_count @static {
          get {
             [[Return the global count of freeze events.
 
@@ -288,7 +288,7 @@ abstract Efl.Object
            events again using @.event_thaw. Events marked $hot cannot be stopped.
          ]]
       }
-      event_global_thaw @class {
+      event_global_thaw @static {
          [[Gobally thaw events for ALL EFL OBJECTS.
 
            Allows event callbacks to be called for all EFL objects after they have
@@ -296,7 +296,7 @@ abstract Efl.Object
            the amount of freezes for events to be re-enabled.
          ]]
       }
-      event_global_freeze @class {
+      event_global_freeze @static {
          [[Globally freeze events for ALL EFL OBJECTS.
 
            Prevents event callbacks from being called for all EFL objects.
diff --git a/src/lib/eolian/database_function_api.c b/src/lib/eolian/database_function_api.c
index 123b99b4c4..910f2b8462 100644
--- a/src/lib/eolian/database_function_api.c
+++ b/src/lib/eolian/database_function_api.c
@@ -120,7 +120,7 @@ EAPI Eina_Bool
 eolian_function_is_class(const Eolian_Function *fid)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE);
-   return fid->is_class;
+   return fid->is_static;
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index c70b1c9031..805589eddd 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -33,11 +33,11 @@ enum Tokens
     KW(keys), KW(legacy), KW(methods), KW(mixin), KW(params), \
     KW(parse), KW(parts), KW(ptr), KW(set), KW(type), KW(values), KW(var), KW(requires), \
     \
-    KWAT(auto), KWAT(beta), KWAT(c_name), KWAT(class), KWAT(const), KWAT(cref), \
+    KWAT(auto), KWAT(beta), KWAT(c_name), KWAT(const), KWAT(cref), \
     KWAT(empty), KWAT(extern), KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), \
     KWAT(no_unused), KWAT(nullable), KWAT(optional), KWAT(out), KWAT(owned), \
     KWAT(private), KWAT(property), KWAT(protected), KWAT(restart), \
-    KWAT(pure_virtual), \
+    KWAT(pure_virtual), KWAT(static), \
     \
     KWH(version), \
     \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index da606f91ca..cf8a25bc8c 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1318,9 +1318,9 @@ parse_property(Eo_Lexer *ls)
         prop->get_scope = prop->set_scope = EOLIAN_SCOPE_PROTECTED;
         eo_lexer_get(ls);
         break;
-      case KW_at_class:
+      case KW_at_static:
         CASE_LOCK(ls, class, "class qualifier");
-        prop->is_class = EINA_TRUE;
+        prop->is_static = EINA_TRUE;
         eo_lexer_get(ls);
         break;
       case KW_at_beta:
@@ -1514,9 +1514,9 @@ parse_method(Eo_Lexer *ls)
         meth->obj_is_const = EINA_TRUE;
         eo_lexer_get(ls);
         break;
-      case KW_at_class:
+      case KW_at_static:
         CASE_LOCK(ls, class, "class qualifier");
-        meth->is_class = EINA_TRUE;
+        meth->is_static = EINA_TRUE;
         eo_lexer_get(ls);
         break;
       case KW_at_beta:
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 4c08874ab8..1e26e24a38 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -230,7 +230,7 @@ struct _Eolian_Function
    Eina_Bool obj_is_const :1; /* True if the object has to be const. Useful for a few methods. */
    Eina_Bool get_return_no_unused :1; /* also used for methods */
    Eina_Bool set_return_no_unused :1;
-   Eina_Bool is_class :1;
+   Eina_Bool is_static :1;
    Eina_List *ctor_of;
    Eolian_Class *klass;
 };
diff --git a/src/tests/efl_mono/dummy_inherit_helper.eo b/src/tests/efl_mono/dummy_inherit_helper.eo
index 101c759390..f0f9183ebb 100644
--- a/src/tests/efl_mono/dummy_inherit_helper.eo
+++ b/src/tests/efl_mono/dummy_inherit_helper.eo
@@ -1,13 +1,13 @@
 class Dummy.Inherit_Helper extends Efl.Object
 {
   methods {
-    receive_dummy_and_call_int_out @class {
+    receive_dummy_and_call_int_out @static {
       params {
         @in x: Dummy.Test_Object;
       }
       return: int;
     }
-    receive_dummy_and_call_in_stringshare @class {
+    receive_dummy_and_call_in_stringshare @static {
       params {
         @in x: Dummy.Inherit_Iface;
       }
diff --git a/src/tests/efl_mono/dummy_test_object.eo b/src/tests/efl_mono/dummy_test_object.eo
index e25f7b29bb..b6841db788 100644
--- a/src/tests/efl_mono/dummy_test_object.eo
+++ b/src/tests/efl_mono/dummy_test_object.eo
@@ -1569,7 +1569,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
          return: Dummy.MyInt;
       }
 
-      @property klass_prop @class {
+      @property klass_prop @static {
          get {}
          set {}
          values {
@@ -1577,10 +1577,10 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
          }
       }
 
-      create_cmp_array_objects @class {
+      create_cmp_array_objects @static {
       }
 
-      destroy_cmp_array_objects @class {
+      destroy_cmp_array_objects @static {
       }
 
       /* Futures */
diff --git a/src/tests/eolian/data/class_funcs.eo b/src/tests/eolian/data/class_funcs.eo
index 300e110b89..087f380003 100644
--- a/src/tests/eolian/data/class_funcs.eo
+++ b/src/tests/eolian/data/class_funcs.eo
@@ -1,6 +1,6 @@
 class Class_Funcs {
    methods {
-      @property a @class {
+      @property a @static {
          get {
          }
       }
@@ -8,11 +8,11 @@ class Class_Funcs {
          get {
          }
       }
-      foo @class {
+      foo @static {
       }
       bar {
       }
-      baz @protected @class {
+      baz @protected @static {
       }
       bah @protected {
       }