Eo: EO_BASE_CLASS->EO_CLASS.

33 files changed, 70 insertions, 70 deletions

diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index 2e8dc3f621..05d025ec97 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -46,5 +46,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL)
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
 
diff --git a/src/examples/eo/evas/evas_evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c
index 01f48a544b..768d3d4ea6 100644
--- a/src/examples/eo/evas/evas_evas_obj.c
+++ b/src/examples/eo/evas/evas_evas_obj.c
@@ -143,4 +143,4 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(evas_object_class_get, &class_desc, EO_BASE_CLASS, NULL)
+EO_DEFINE_CLASS(evas_object_class_get, &class_desc, EO_CLASS, NULL)
diff --git a/src/examples/eo/isa/eo_isa_simple.c b/src/examples/eo/isa/eo_isa_simple.c
index 789c5f4711..67f47fd5f9 100644
--- a/src/examples/eo/isa/eo_isa_simple.c
+++ b/src/examples/eo/isa/eo_isa_simple.c
@@ -75,4 +75,4 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL);
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL);
diff --git a/src/examples/eo/simple/simple_simple.c b/src/examples/eo/simple/simple_simple.c
index a172bce3fc..42eb1f75b2 100644
--- a/src/examples/eo/simple/simple_simple.c
+++ b/src/examples/eo/simple/simple_simple.c
@@ -75,4 +75,4 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL);
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL);
diff --git a/src/lib/ecore_audio/ecore_audio_obj.h b/src/lib/ecore_audio/ecore_audio_obj.h
index b473a55f11..153a638292 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.h
+++ b/src/lib/ecore_audio/ecore_audio_obj.h
@@ -175,7 +175,7 @@ enum Ecore_Audio_Obj_Sub_Ids
  * @param[in] free_func This function takes care to clean up @ref data when
  * the VIO is destroyed. NULL means do nothing.
  */
-#define ecore_audio_obj_vio_set(vio, data, free_func) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VIO_SET), EO_TYPECHECK(Ecore_Audio_Vio *, vio), EO_TYPECHECK(void *, data), EO_TYPECHECK(eo_base_data_free_func, free_func)
+#define ecore_audio_obj_vio_set(vio, data, free_func) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VIO_SET), EO_TYPECHECK(Ecore_Audio_Vio *, vio), EO_TYPECHECK(void *, data), EO_TYPECHECK(eo_key_data_free_func, free_func)
 
 #endif
 /**
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index f77374f551..db88b03e64 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -149,7 +149,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
 }
 
 EOLIAN static void
-_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func)
+_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
 {
   Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
 
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index d18908da79..6860f9dd5a 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -142,7 +142,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
 }
 
 EOLIAN static void
-_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func)
+_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
 {
   Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
   Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index 60f634881f..1be57a426b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -83,26 +83,26 @@ _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_D
 }
 
 EOLIAN static void
-_ecore_audio_in_tone_eo_base_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val, eo_base_data_free_func func)
+_ecore_audio_in_tone_eo_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val, eo_key_data_free_func func)
 {
   if (!key) return;
 
   if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
       obj->freq = *(int *)val;
   } else {
-      eo_do_super(eo_obj, MY_CLASS, eo_base_data_set(key, val, func));
+      eo_do_super(eo_obj, MY_CLASS, eo_key_data_set(key, val, func));
   }
 
 }
 
 EOLIAN static void*
-_ecore_audio_in_tone_eo_base_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
+_ecore_audio_in_tone_eo_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
 {
   if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
       return (void *) (intptr_t) obj->freq;
   } else {
       void *ret = NULL;
-      eo_do_super(eo_obj, MY_CLASS, eo_base_data_get(key, &ret));
+      eo_do_super(eo_obj, MY_CLASS, eo_key_data_get(key, &ret));
       return ret;
   }
 }
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
index 6bfd505a28..738f49a55a 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
@@ -37,7 +37,7 @@ extern "C"
 /**
  * @brief The frequency of the tone in Hz
  *
- * Set with @ref eo_base_data_set()
+ * Set with @ref eo_key_data_set()
  */
 #define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"
 
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 40d16004e9..52e379fa3b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -113,7 +113,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
 }
 
 EOLIAN static void
-_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func)
+_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func)
 {
   Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
 
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index 8e7fc6d900..4da2d0b77f 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -60,7 +60,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
   eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_volume_set(volume));
 
   EINA_LIST_FOREACH(out_obj->inputs, input, in) {
-      eo_do(in, eo_base_data_get("pulse_data", (void **)&stream));
+      eo_do(in, eo_key_data_get("pulse_data", (void **)&stream));
       idx = pa_stream_get_index(stream);
       pa_operation_unref(pa_context_set_sink_input_volume(class_vars.context, idx, &pa_volume, NULL, NULL));
   }
@@ -95,7 +95,7 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, Eo *eo_obj, const
   eo_do(eo_obj, ecore_audio_obj_in_samplerate_get(&samplerate));
   eo_do(eo_obj, ecore_audio_obj_in_speed_get(&speed));
 
-  eo_do(eo_obj, eo_base_data_get("pulse_data", (void **)&stream));
+  eo_do(eo_obj, eo_key_data_get("pulse_data", (void **)&stream));
 
   pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL));
 
@@ -132,7 +132,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
 
   eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj));
 
-  eo_do(in, eo_base_data_set("pulse_data", stream, NULL));
+  eo_do(in, eo_key_data_set("pulse_data", stream, NULL));
 
 
   pa_stream_set_write_callback(stream, _write_cb, in);
@@ -185,7 +185,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
   if (!ret2)
     return EINA_FALSE;
 
-  eo_do(in, eo_base_data_get("pulse_data", (void **)&stream));
+  eo_do(in, eo_key_data_get("pulse_data", (void **)&stream));
 
   pa_stream_set_write_callback(stream, NULL, NULL);
   pa_operation_unref(pa_stream_drain(stream, _drain_cb, NULL));
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index b997ea8e03..36a06f5f4c 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -94,7 +94,7 @@ struct _Ecore_Audio_Module
 struct _Ecore_Audio_Vio_Internal {
     Ecore_Audio_Vio *vio;
     void *data;
-    eo_base_data_free_func free_func;
+    eo_key_data_free_func free_func;
 };
 typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal;
 
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 57dca7e1ce..6e6979942d 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -931,12 +931,12 @@ EAPI const Eo_Class *eo_class_class_get(void);
  */
 
 /**
- * @def EO_BASE_CLASS
+ * @def EO_CLASS
  * The class type for the Eo base class.
  */
-#define EO_BASE_CLASS eo_base_class_get()
+#define EO_CLASS eo_base_class_get()
 /**
- * @brief Use #EO_BASE_CLASS
+ * @brief Use #EO_CLASS
  * @internal
  * */
 EAPI const Eo_Class *eo_base_class_get(void);
diff --git a/src/lib/eo/eo2_base_class.c b/src/lib/eo/eo2_base_class.c
index 2ed01fcecd..d11d073c14 100644
--- a/src/lib/eo/eo2_base_class.c
+++ b/src/lib/eo/eo2_base_class.c
@@ -121,7 +121,7 @@ _parent_set(Eo *obj, void *class_data, Eo *parent_id)
      {
         Private_Data *old_parent_pd;
 
-        old_parent_pd = eo_data_scope_get(pd->parent, EO_BASE_CLASS);
+        old_parent_pd = eo_data_scope_get(pd->parent, EO_CLASS);
         if (old_parent_pd)
           {
              old_parent_pd->children = eina_list_remove(old_parent_pd->children,
@@ -140,7 +140,7 @@ _parent_set(Eo *obj, void *class_data, Eo *parent_id)
    if (parent_id)
      {
         Private_Data *parent_pd = NULL;
-        parent_pd = eo_data_scope_get(parent_id, EO_BASE_CLASS);
+        parent_pd = eo_data_scope_get(parent_id, EO_CLASS);
 
         if (EINA_LIKELY(parent_pd != NULL))
           {
@@ -909,8 +909,8 @@ EAPI const Eina_Value_Type *EO_DBG_INFO_TYPE = &_EO_DBG_INFO_TYPE;
 /* EOF event callbacks */
 
 
-/* EO_BASE_CLASS stuff */
-#define MY_CLASS EO_BASE_CLASS
+/* EO_CLASS stuff */
+#define MY_CLASS EO_CLASS
 
 /* FIXME: Set proper type descriptions. */
 // FIXME: eo multiple definition
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 2eeb8cc570..6bf44ded70 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -53,5 +53,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL)
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
 
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 8d4756be5b..d880c9823e 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -53,6 +53,6 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(comp_class_get, &class_desc, EO_BASE_CLASS,
+EO_DEFINE_CLASS(comp_class_get, &class_desc, EO_CLASS,
       SIMPLE_CLASS, NULL);
 
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index c4490da8c0..a1dfd4dbd8 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -52,5 +52,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL);
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 3076802143..ca7343ffe0 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -54,5 +54,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_BASE_CLASS, NULL);
+EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index 3441d44451..fa6b3fd820 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -104,6 +104,6 @@ static const Eo_Class_Description class_desc = {
      _class_destructor
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS,
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
       MIXIN_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index 06c9e1d87a..0318a9ff09 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -32,5 +32,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple2_class_get, &class_desc, EO_BASE_CLASS, NULL);
+EO_DEFINE_CLASS(simple2_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index 79ef940c8c..9c720b51eb 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -30,5 +30,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple3_class_get, &class_desc, EO_BASE_CLASS, NULL);
+EO_DEFINE_CLASS(simple3_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index bbfbafd00e..df51e4ae87 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -30,5 +30,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple5_class_get, &class_desc, EO_BASE_CLASS, NULL);
+EO_DEFINE_CLASS(simple5_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 71e29953f4..3f4c70e480 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -32,5 +32,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO_BASE_CLASS, NULL);
+EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index ce6590b143..1ba2382948 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -75,5 +75,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL);
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index e4bd477357..d35e142d3a 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -75,4 +75,4 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE2_CLASS, NULL);
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE2_CLASS, NULL);
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 073ad3b988..d91a04fe11 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -49,5 +49,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_BASE_CLASS, NULL)
+EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL)
 
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 5da36be987..0212939580 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -56,6 +56,6 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS,
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
       MIXIN3_CLASS, MIXIN2_CLASS, NULL);
 
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index eb0784febd..4886d35b5f 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -133,15 +133,15 @@ main(int argc, char *argv[])
    eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1));
    fail_if(pd->cb_count != 1);
 
-   eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
+   eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
    fail_if(fcount != 0);
 
-   eo_do(EO_BASE_CLASS, eo_event_global_freeze());
-   eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
+   eo_do(EO_CLASS, eo_event_global_freeze());
+   eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
    fail_if(fcount != 1);
 
-   eo_do(EO_BASE_CLASS, eo_event_global_freeze());
-   eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
+   eo_do(EO_CLASS, eo_event_global_freeze());
+   eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
    fail_if(fcount != 2);
 
    eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2));
@@ -149,30 +149,30 @@ main(int argc, char *argv[])
 
    eo_do(obj, simple_a_set(2));
    fail_if(cb_count != 0);
-   eo_do(EO_BASE_CLASS, eo_event_global_thaw());
-   eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
+   eo_do(EO_CLASS, eo_event_global_thaw());
+   eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
    fail_if(fcount != 1);
 
-   eo_do(EO_BASE_CLASS, eo_event_global_thaw());
-   eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
+   eo_do(EO_CLASS, eo_event_global_thaw());
+   eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
    fail_if(fcount != 0);
 
    eo_do(obj, simple_a_set(3));
    fail_if(cb_count != 2);
 
    cb_count = 0;
-   eo_do(EO_BASE_CLASS, eo_event_global_thaw());
-   eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
+   eo_do(EO_CLASS, eo_event_global_thaw());
+   eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
    fail_if(fcount != 0);
 
-   eo_do(EO_BASE_CLASS, eo_event_global_freeze());
-   eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
+   eo_do(EO_CLASS, eo_event_global_freeze());
+   eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
    fail_if(fcount != 1);
 
    eo_do(obj, simple_a_set(2));
    fail_if(cb_count != 0);
-   eo_do(EO_BASE_CLASS, eo_event_global_thaw());
-   eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get());
+   eo_do(EO_CLASS, eo_event_global_thaw());
+   eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
    fail_if(fcount != 0);
 
 
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index f370a2794b..a928cec854 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -96,5 +96,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL);
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
 
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index 36a85151cc..e6fee93cae 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -56,7 +56,7 @@ START_TEST(eo_inherit_errors)
    klass_mixin = eo_class_new(&class_desc_mixin, NULL, NULL);
    fail_if(!klass_mixin);
 
-   klass_simple = eo_class_new(&class_desc_simple, EO_BASE_CLASS, NULL);
+   klass_simple = eo_class_new(&class_desc_simple, EO_CLASS, NULL);
    fail_if(!klass_simple);
 
    TEST_EO_ERROR("eo_class_new", "Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s').");
@@ -142,14 +142,14 @@ START_TEST(eo_inconsistent_mro)
    fail_if(!klass_mixin3);
 
    TEST_EO_ERROR("_eo_class_mro_init", "Cannot create a consistent method resolution order for class '%s' because of '%s'.");
-   klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin, klass_mixin2, NULL);
+   klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin, klass_mixin2, NULL);
    fail_if(klass);
    fail_unless(ctx.did);
 
-   klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin2, klass_mixin, NULL);
+   klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin2, klass_mixin, NULL);
    fail_if(!klass);
 
-   klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin2, klass_mixin3, NULL);
+   klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin2, klass_mixin3, NULL);
    fail_if(!klass);
 
    eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 5b8c2e06ac..cbefee7d1d 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -98,5 +98,5 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL)
+EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
 
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 2f6d79e4cc..cf2bd1bb36 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -11,7 +11,7 @@
 START_TEST(eo_simple)
 {
    eo_init();
-   Eo *obj = eo_add(EO_BASE_CLASS, NULL);
+   Eo *obj = eo_add(EO_CLASS, NULL);
    fail_if(obj);
 
    obj = eo_add(SIMPLE_CLASS, NULL);
@@ -135,7 +135,7 @@ START_TEST(eo_data_fetch)
         NULL
    };
 
-   const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
+   const Eo_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
    Eo *obj = eo_add(klass, NULL);
@@ -146,7 +146,7 @@ START_TEST(eo_data_fetch)
    eo_unref(obj);
 
    class_desc.data_size = 0;
-   klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
+   klass = eo_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
    obj = eo_add(klass, NULL);
@@ -211,7 +211,7 @@ START_TEST(eo_isa_tests)
              NULL
         };
 
-        klass = eo_class_new(&class_desc, EO_BASE_CLASS, iface, mixin, NULL);
+        klass = eo_class_new(&class_desc, EO_CLASS, iface, mixin, NULL);
         fail_if(!klass);
      }
 
@@ -221,7 +221,7 @@ START_TEST(eo_isa_tests)
    fail_if(!eo_isa(obj, iface));
    fail_if(!eo_isa(obj, mixin));
    fail_if(!eo_isa(obj, klass));
-   fail_if(!eo_isa(obj, EO_BASE_CLASS));
+   fail_if(!eo_isa(obj, EO_CLASS));
    eo_unref(obj);
 
    obj = eo_add(SIMPLE_CLASS, NULL);
@@ -230,7 +230,7 @@ START_TEST(eo_isa_tests)
    fail_if(eo_isa(obj, iface));
    fail_if(eo_isa(obj, mixin));
    fail_if(!eo_isa(obj, SIMPLE_CLASS));
-   fail_if(!eo_isa(obj, EO_BASE_CLASS));
+   fail_if(!eo_isa(obj, EO_CLASS));
    eo_unref(obj);
 
    eo_shutdown();
@@ -300,7 +300,7 @@ START_TEST(eo_man_free)
         NULL
    };
 
-   const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
+   const Eo_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
    cur_klass = klass;
 
@@ -314,7 +314,7 @@ START_TEST(eo_man_free)
    eo_unref(obj);
 
    _man_should_des = EINA_FALSE;
-   klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
+   klass = eo_class_new(&class_desc, EO_CLASS, NULL);
    cur_klass = klass;
    fail_if(!klass);
 
@@ -333,7 +333,7 @@ START_TEST(eo_man_free)
    fail_if(!eo_manual_free(obj));
 
    _man_should_con = EINA_FALSE;
-   klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
+   klass = eo_class_new(&class_desc, EO_CLASS, NULL);
    cur_klass = klass;
    fail_if(!klass);
 
@@ -781,7 +781,7 @@ START_TEST(eo_pointers_indirection)
         NULL
    };
 
-   const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL);
+   const Eo_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
    fail_if(!klass);
 
    /* Check simple id validity */
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 951b6551b4..ee7b70f526 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -76,7 +76,7 @@ static const Eo_Class_Description class_desc = {
      NULL
 };
 
-EO_DEFINE_CLASS(thread_test_class_get, &class_desc, EO_BASE_CLASS, NULL)
+EO_DEFINE_CLASS(thread_test_class_get, &class_desc, EO_CLASS, NULL)
 
 static void *
 _thread_job(void *data, Eina_Thread t EINA_UNUSED)