diff --git a/src/lib/edje/efl_canvas_layout_signal.eo b/src/lib/edje/efl_canvas_layout_signal.eo
index a7d971bf9a..67e3f3734d 100644
--- a/src/lib/edje/efl_canvas_layout_signal.eo
+++ b/src/lib/edje/efl_canvas_layout_signal.eo
@@ -40,7 +40,7 @@ interface Efl.Canvas.Layout_Signal
          ]]
          params {
             @in id: int; [[A identification number for the message to be sent]]
-            @in msg: const(generic_value); [[The message's payload]]
+            @in msg: const(any_value); [[The message's payload]]
          }
       }
       signal_callback_add {
diff --git a/src/lib/efl/interfaces/efl_config.eo b/src/lib/efl/interfaces/efl_config.eo
index 3f128cdb48..5adf7b25fa 100644
--- a/src/lib/efl/interfaces/efl_config.eo
+++ b/src/lib/efl/interfaces/efl_config.eo
@@ -7,7 +7,7 @@ interface Efl.Config ()
       	 [[Set configuration]]
          params {
             name: string; [[Configuration option name]]
-            val: ptr(const(generic_value)); [[Configuration option value]]
+            val: ptr(const(any_value)); [[Configuration option value]]
          }
          return: bool; [[$false in case of error: value type was invalid, the
                          config can't be changed, config does not exist...]]
@@ -17,14 +17,14 @@ interface Efl.Config ()
          params {
             name: string; [[Configuration option name]]
          }
-         return: ptr(generic_value) @owned; [[Configuration option value]]
+         return: ptr(any_value) @owned; [[Configuration option value]]
       }
       config_list_get @const {
          [[Returns a list of generic values under a given key.]]
          params {
             @in name: string; [[Configuration option name]]
          }
-         return: iterator<ptr(generic_value)> @owned; [[
+         return: iterator<ptr(any_value)> @owned; [[
                  List of configuration option values]]
       }
    }
diff --git a/src/lib/efl/interfaces/efl_model.eo b/src/lib/efl/interfaces/efl_model.eo
index e95a099155..7ff10a1aef 100644
--- a/src/lib/efl/interfaces/efl_model.eo
+++ b/src/lib/efl/interfaces/efl_model.eo
@@ -47,9 +47,9 @@ interface Efl.Model ()
             ]]
            params {
                @in property: string; [[Property name]]
-               @in value: ptr(const(generic_value)); [[New value]]
+               @in value: ptr(const(any_value)); [[New value]]
            }
-           return: future<generic_value>; [[Future returning the recorded value or error]]
+           return: future<any_value>; [[Future returning the recorded value or error]]
         }
         property_get {
            [[Retrieve the value of a given property name.
@@ -65,7 +65,7 @@ interface Efl.Model ()
            params {
                @in property: string; [[Property name]]
            }
-           return: future<generic_value>; [[Future of the value that was got]]
+           return: future<any_value>; [[Future of the value that was got]]
         }
         children_slice_get {
                [[Get children slice OR full range.
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index 51091638dd..32f72cba26 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -93,7 +93,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
          return: bool; [[$true, on success, $false otherwise]]
          params {
             @in name: string; [[The name of the item (as declared in the prefs collection)]]
-            @in value: ptr(const(generic_value)); [[The value to set on the item. It should be typed as the item expects, preferably, or a conversion will take place]]
+            @in value: ptr(const(any_value)); [[The value to set on the item. It should be typed as the item expects, preferably, or a conversion will take place]]
          }
       }
       item_value_get @const {
@@ -106,7 +106,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
 
          params {
             @in name: string; [[The name of the item (as declared in the prefs collection) to get value from]]
-            @out value: generic_value; [[Where to store the value of the item. It will be overwritten and setup with the type the item is bound to]]
+            @out value: any_value; [[Where to store the value of the item. It will be overwritten and setup with the type the item is bound to]]
          }
       }
       item_object_get {
diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c
index 7ef27acdd3..5f9a6b2f71 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -187,7 +187,7 @@ _validate_type(Eolian_Type *tp)
                      case KW_stringshare:
                        tp->freefunc = eina_stringshare_add(eo_strshare_free);
                        break;
-                     case KW_generic_value:
+                     case KW_any_value:
                        tp->freefunc = eina_stringshare_add(eo_value_free);
                        break;
                      default:
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 849cc98efb..2235806e6c 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -52,7 +52,7 @@ enum Tokens
     \
     KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \
     KW(future),                                   \
-    KW(generic_value), \
+    KW(any_value), \
     KW(mstring), KW(string), KW(stringshare), \
     \
     KW(void_ptr), \