87 files changed, 95 insertions, 95 deletions
diff --git a/src/lib/ecore/efl_core_proc_env.eo b/src/lib/ecore/efl_core_proc_env.eo
index 07840548dd..2641105338 100644
--- a/src/lib/ecore/efl_core_proc_env.eo
+++ b/src/lib/ecore/efl_core_proc_env.eo
@@ -1,6 +1,6 @@
 class @beta Efl.Core.Proc_Env extends Efl.Core.Env
 {
-   eo_prefix : efl_env;
+   c_prefix: efl_env;
   methods {
    self @class {
      [[Get a instance of this object
diff --git a/src/lib/ecore/efl_loop_consumer.eo b/src/lib/ecore/efl_loop_consumer.eo
index c5828648b6..c391d29f03 100644
--- a/src/lib/ecore/efl_loop_consumer.eo
+++ b/src/lib/ecore/efl_loop_consumer.eo
@@ -6,7 +6,7 @@ abstract Efl.Loop_Consumer extends Efl.Object
     @since 1.22
   ]]
-   eo_prefix: efl_loop;
+   c_prefix: efl_loop;
   methods {
      @property loop {
         [[The loop to which this object belongs to.]]
diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo
index 93409d21cb..df76e70bbd 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -16,7 +16,7 @@ abstract @beta Ecore.Audio extends Efl.Object
 {
   [[Convenience audio class.]]
-   eo_prefix: ecore_audio_obj;
+   c_prefix: ecore_audio_obj;
   data: Ecore_Audio_Object;
   methods {
      @property paused {
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index bbee8e1910..4411cc8c45 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -1,7 +1,7 @@
 class @beta Ecore.Audio.In extends Ecore.Audio
 {
   [[Ecore Audio input object.]]
-   eo_prefix: ecore_audio_obj_in;
+   c_prefix: ecore_audio_obj_in;
   event_prefix: ecore_audio_in;
   data: Ecore_Audio_Input;
   methods {
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
index cb1476029c..10113a4235 100644
--- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -1,7 +1,7 @@
 class @beta Ecore.Audio.In.Sndfile extends Ecore.Audio.In
 {
   [[Ecore Audio sndfile input.]]
-   eo_prefix: ecore_audio_obj_in_sndfile;
+   c_prefix: ecore_audio_obj_in_sndfile;
   implements {
      Efl.Object.destructor;
      Ecore.Audio.source { get; set; }
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo
index 0fc51c13c5..7844065e6a 100644
--- a/src/lib/ecore_audio/ecore_audio_in_tone.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -1,7 +1,7 @@
 class @beta Ecore.Audio.In.Tone extends Ecore.Audio.In
 {
   [[Ecore Audio tone input.]]
-   eo_prefix: ecore_audio_obj_in_tone;
+   c_prefix: ecore_audio_obj_in_tone;
   implements {
      Efl.Object.constructor;
      Ecore.Audio.In.length { set; }
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo
index f18dd8dc0e..07fb7b181f 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -2,7 +2,7 @@ abstract @beta Ecore.Audio.Out extends Ecore.Audio
 {
   [[Ecore Audio output object.]]
-   eo_prefix: ecore_audio_obj_out;
+   c_prefix: ecore_audio_obj_out;
   data: Ecore_Audio_Output;
   methods {
      input_attach {
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index 0729a752e8..d065d2d776 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -1,7 +1,7 @@
 class @beta Ecore.Audio.Out.Pulse extends Ecore.Audio.Out
 {
   [[Ecore audio ouput for PulseAudio.]]
-   eo_prefix: ecore_audio_obj_out_pulse;
+   c_prefix: ecore_audio_obj_out_pulse;
   event_prefix: ecore_audio_out_pulse;
   implements {
      Efl.Object.constructor;
diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
index 9b57d83fa4..46e67dc493 100644
--- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
@@ -1,7 +1,7 @@
 class @beta Ecore.Audio.Out.Sndfile extends Ecore.Audio.Out
 {
   [[Ecore audio output to the sndfile library.]]
-   eo_prefix: ecore_audio_obj_out_sndfile;
+   c_prefix: ecore_audio_obj_out_sndfile;
   implements {
      Efl.Object.constructor;
      Efl.Object.destructor;
diff --git a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo
index ab50a980b8..2f19880b20 100644
--- a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo
@@ -1,7 +1,7 @@
 class @beta Ecore.Audio.Out.Wasapi extends Ecore.Audio.Out
 {
   [[Ecore audio ouput for WasapiAudio.]]
-   eo_prefix: ecore_audio_obj_out_wasapi;
+   c_prefix: ecore_audio_obj_out_wasapi;
   event_prefix: ecore_audio_out_wasapi;
   implements {
      Efl.Object.constructor;
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.eo b/src/lib/ector/cairo/ector_cairo_software_surface.eo
index 05ad18e37d..9cd23e5cf5 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.eo
@@ -4,7 +4,7 @@ class @beta Ector.Cairo.Software.Surface extends Ector.Cairo.Surface implements
   Used to render ector content into a cairo software backend.
   ]]
-   eo_prefix: ector_cairo_software_surface;
+   c_prefix: ector_cairo_software_surface;
   methods {}
   implements {
      Ector.Buffer.pixels_set;
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo b/src/lib/ector/cairo/ector_cairo_surface.eo
index 981d2404d2..96abd0f082 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -6,7 +6,7 @@ class @beta Ector.Cairo.Surface extends Efl.Object implements Ector.Surface
   Used to render ector content into a cairo backend.
   ]]
-   eo_prefix: ector_cairo_surface;
+   c_prefix: ector_cairo_surface;
   methods {
      @property context {
         [[Cairo context]]
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
index 9c5c4ff563..c6f2c4fe8d 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.Cairo.Gradient.Linear extends Ector.Renderer.Cairo implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear, Efl.Gfx.Path
 {
   [[Ector cairo renderer gradient linear]]
-   eo_prefix: ector_renderer_cairo_gradient_linear;
+   c_prefix: ector_renderer_cairo_gradient_linear;
   implements {
      Ector.Renderer.prepare;
      Ector.Renderer.draw;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
index 7c3a60caf8..bdf0059b3c 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.Cairo.Gradient.Radial extends Ector.Renderer.Cairo implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial, Efl.Gfx.Path
 {
   [[Ector cairo renderer gradient radial]]
-   eo_prefix: ector_renderer_cairo_gradient_radial;
+   c_prefix: ector_renderer_cairo_gradient_radial;
   implements {
      Ector.Renderer.prepare;
      Ector.Renderer.draw;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index 6f08776591..b2d41c6842 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.Cairo.Shape extends Ector.Renderer.Cairo implements Ector.Renderer.Shape, Efl.Gfx.Path
 {
   [[Ector cairo renderer shape class]]
-   eo_prefix: ector_renderer_cairo_shape;
+   c_prefix: ector_renderer_cairo_shape;
   implements {
      Ector.Renderer.prepare;
      Ector.Renderer.draw;
diff --git a/src/lib/ector/ector_buffer.eo b/src/lib/ector/ector_buffer.eo
index c53ecc8962..baa107159b 100644
--- a/src/lib/ector/ector_buffer.eo
+++ b/src/lib/ector/ector_buffer.eo
@@ -25,7 +25,7 @@ mixin @beta Ector.Buffer
 {
   [[2D pixel buffer interface for Ector
   ]]
-   eo_prefix: ector_buffer;
+   c_prefix: ector_buffer;
   methods {
      @property size {
         [[The (rectangular) size of the pixel buffer.]]
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo
index 53560d17d5..57726f3df1 100644
--- a/src/lib/ector/ector_renderer.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -4,7 +4,7 @@ abstract @beta Ector.Renderer extends Efl.Object
 {
   [[Ector renderer abstract interface]]
-   eo_prefix: ector_renderer;
+   c_prefix: ector_renderer;
   methods {
      @property surface {
         [[Surface associated with this renderer]]
diff --git a/src/lib/ector/ector_renderer_gradient.eo b/src/lib/ector/ector_renderer_gradient.eo
index 70be8823a6..fda0e33261 100644
--- a/src/lib/ector/ector_renderer_gradient.eo
+++ b/src/lib/ector/ector_renderer_gradient.eo
@@ -1,7 +1,7 @@
 mixin @beta Ector.Renderer.Gradient requires Efl.Object extends Efl.Gfx.Gradient
 {
   [[Ector gradient renderer mixin]]
-   eo_prefix: ector_renderer_gradient;
+   c_prefix: ector_renderer_gradient;
   implements {
      Efl.Gfx.Gradient.stop { get; set; }
      Efl.Gfx.Gradient.spread { get; set; }
diff --git a/src/lib/ector/ector_renderer_gradient_linear.eo b/src/lib/ector/ector_renderer_gradient_linear.eo
index db2cde4cbb..2cd05a1101 100644
--- a/src/lib/ector/ector_renderer_gradient_linear.eo
+++ b/src/lib/ector/ector_renderer_gradient_linear.eo
@@ -1,7 +1,7 @@
 mixin @beta Ector.Renderer.Gradient.Linear extends Efl.Gfx.Gradient_Linear
 {
   [[Ector gradient linear renderer mixin]]
-   eo_prefix: ector_renderer_gradient_linear;
+   c_prefix: ector_renderer_gradient_linear;
   implements {
      Efl.Gfx.Gradient_Linear.start { get; set; }
      Efl.Gfx.Gradient_Linear.end { get; set; }
diff --git a/src/lib/ector/ector_renderer_gradient_radial.eo b/src/lib/ector/ector_renderer_gradient_radial.eo
index 369db43480..3b05e4ed03 100644
--- a/src/lib/ector/ector_renderer_gradient_radial.eo
+++ b/src/lib/ector/ector_renderer_gradient_radial.eo
@@ -1,7 +1,7 @@
 mixin @beta Ector.Renderer.Gradient.Radial extends Efl.Gfx.Gradient_Radial
 {
   [[Ector gradient radial renderer mixin]]
-   eo_prefix: ector_renderer_gradient_radial;
+   c_prefix: ector_renderer_gradient_radial;
   implements {
      Efl.Gfx.Gradient_Radial.center { get; set; }
      Efl.Gfx.Gradient_Radial.radius { get; set; }
diff --git a/src/lib/ector/ector_renderer_shape.eo b/src/lib/ector/ector_renderer_shape.eo
index 67876ca108..c6038ad859 100644
--- a/src/lib/ector/ector_renderer_shape.eo
+++ b/src/lib/ector/ector_renderer_shape.eo
@@ -3,7 +3,7 @@ import ector_renderer;
 mixin @beta Ector.Renderer.Shape requires Efl.Object extends Efl.Gfx.Shape
 {
   [[Ector shape renderer mixin]]
-   eo_prefix: ector_renderer_shape;
+   c_prefix: ector_renderer_shape;
   methods {
      @property fill {
         [[Fill property]]
diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_surface.eo
index 159033995d..f29cf070fa 100644
--- a/src/lib/ector/ector_surface.eo
+++ b/src/lib/ector/ector_surface.eo
@@ -2,7 +2,7 @@ mixin @beta Ector.Surface extends Ector.Buffer
 {
   [[Surface interface for Ector]]
-   eo_prefix: ector_surface;
+   c_prefix: ector_surface;
   data: null;
   methods {
      @property reference_point {
diff --git a/src/lib/ector/gl/ector_gl_surface.eo b/src/lib/ector/gl/ector_gl_surface.eo
index 19e919c0b8..62aefb4291 100644
--- a/src/lib/ector/gl/ector_gl_surface.eo
+++ b/src/lib/ector/gl/ector_gl_surface.eo
@@ -3,7 +3,7 @@ import ector_types;
 class @beta Ector.GL.Surface extends Ector.GL.Buffer implements Ector.Surface
 {
   [[Ector GL surface class]]
-   eo_prefix: ector_gl_surface;
+   c_prefix: ector_gl_surface;
   methods {
      shader_get {
         [[Get shader]]
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
index 2e7621d905..bbb3152b9b 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.GL.Gradient.Linear extends Ector.Renderer.GL implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear, Efl.Gfx.Path
 {
   [[Ector GL renderer gradient linear]]
-   eo_prefix: ector_renderer_gl_gradient_linear;
+   c_prefix: ector_renderer_gl_gradient_linear;
   implements {
      Ector.Renderer.prepare;
      Ector.Renderer.draw;
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
index 3f3cbdd72c..a4c42b490a 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.GL.Gradient.Radial extends Ector.Renderer.GL implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial, Efl.Gfx.Path
 {
   [[Ector GL renderer gradient radial]]
-   eo_prefix: ector_renderer_gl_gradient_radial;
+   c_prefix: ector_renderer_gl_gradient_radial;
   implements {
      Ector.Renderer.prepare;
      Ector.Renderer.draw;
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index ba9043625e..0a938e9974 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.GL.Shape extends Ector.Renderer.GL implements Ector.Renderer.Shape, Efl.Gfx.Path
 {
   [[Ector GL renderer shape class]]
-   eo_prefix: ector_renderer_gl_shape;
+   c_prefix: ector_renderer_gl_shape;
   implements {
      Ector.Renderer.prepare;
      Ector.Renderer.draw;
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
index 132a4dfdb1..5f4f53944e 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.Software.Gradient.Linear extends Ector.Renderer.Software implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear
 {
   [[Ector software renderer gradient linear class]]
-   eo_prefix: ector_renderer_software_gradient_linear;
+   c_prefix: ector_renderer_software_gradient_linear;
   data: Ector_Renderer_Software_Gradient_Data;
   implements {
      Ector.Renderer.prepare;
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
index 31bf1d568c..b0a36d3c32 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.Software.Gradient.Radial extends Ector.Renderer.Software implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial
 {
   [[Ector software renderer gradient radial]]
-   eo_prefix: ector_renderer_software_gradient_radial;
+   c_prefix: ector_renderer_software_gradient_radial;
   data: Ector_Renderer_Software_Gradient_Data;
   implements {
      Ector.Renderer.prepare;
diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo
index 41f2b7e658..4ea56f9260 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.eo
+++ b/src/lib/ector/software/ector_renderer_software_shape.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Renderer.Software.Shape extends Ector.Renderer.Software implements Ector.Renderer.Shape
 {
   [[Ector software renderer shape class]]
-   eo_prefix: ector_renderer_software_shape;
+   c_prefix: ector_renderer_software_shape;
   implements {
      Ector.Renderer.prepare;
      Ector.Renderer.draw;
diff --git a/src/lib/ector/software/ector_software_buffer_base.eo b/src/lib/ector/software/ector_software_buffer_base.eo
index be6539973f..8cb576ef0a 100644
--- a/src/lib/ector/software/ector_software_buffer_base.eo
+++ b/src/lib/ector/software/ector_software_buffer_base.eo
@@ -1,7 +1,7 @@
 mixin @beta Ector.Software.Buffer.Base extends Ector.Buffer
 {
   [[A buffer in Ector Software is a readable & optionally writable image]]
-   eo_prefix: ector_software_buffer;
+   c_prefix: ector_software_buffer;
   methods {
      pixels_clear @protected {
        [[Clear internal pixel buffer]]
diff --git a/src/lib/ector/software/ector_software_surface.eo b/src/lib/ector/software/ector_software_surface.eo
index c0f851f0e2..77d6db28a3 100644
--- a/src/lib/ector/software/ector_software_surface.eo
+++ b/src/lib/ector/software/ector_software_surface.eo
@@ -1,7 +1,7 @@
 class @beta Ector.Software.Surface extends Ector.Software.Buffer implements Ector.Surface
 {
   [[Ector surface software class]]
-   eo_prefix: ector_software_surface;
+   c_prefix: ector_software_surface;
   methods {}
   implements {
      Ector.Surface.renderer_factory_new;
diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index e308e2e51f..26883129cb 100644
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -7,7 +7,7 @@ interface Efl.Container
     @since 1.22
   ]]
-   eo_prefix: efl_content;
+   c_prefix: efl_content;
   event_prefix: efl_container;
   methods {
      content_iterate {
diff --git a/src/lib/efl/interfaces/efl_gfx_entity.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo
index 358228c5ce..115fb2a782 100644
--- a/src/lib/efl/interfaces/efl_gfx_entity.eo
+++ b/src/lib/efl/interfaces/efl_gfx_entity.eo
@@ -5,7 +5,7 @@ interface Efl.Gfx.Entity {
     @since 1.22
   ]]
-   eo_prefix: efl_gfx_entity;
+   c_prefix: efl_gfx_entity;
   methods {
      @property position {
         [[The 2D position of a canvas object.
diff --git a/src/lib/efl/interfaces/efl_gfx_filter.eo b/src/lib/efl/interfaces/efl_gfx_filter.eo
index 5e8e0e982b..0ebd1e5294 100644
--- a/src/lib/efl/interfaces/efl_gfx_filter.eo
+++ b/src/lib/efl/interfaces/efl_gfx_filter.eo
@@ -8,7 +8,7 @@ interface @beta Efl.Gfx.Filter
     This was a beta feature since 1.15.
   ]]
-   eo_prefix: efl_gfx;
+   c_prefix: efl_gfx;
   methods {
      @property filter_program {
         set {
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient.eo b/src/lib/efl/interfaces/efl_gfx_gradient.eo
index 3622034a45..81f18a15e1 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient.eo
@@ -3,7 +3,7 @@ import efl_gfx_types;
 interface @beta Efl.Gfx.Gradient
 {
   [[Efl graphics gradient interface]]
-   eo_prefix: efl_gfx_gradient;
+   c_prefix: efl_gfx_gradient;
   methods {
      @property stop {
         set {
diff --git a/src/lib/efl/interfaces/efl_gfx_view.eo b/src/lib/efl/interfaces/efl_gfx_view.eo
index f18d0dc52a..bf29419c60 100644
--- a/src/lib/efl/interfaces/efl_gfx_view.eo
+++ b/src/lib/efl/interfaces/efl_gfx_view.eo
@@ -3,7 +3,7 @@ import eina_types;
 interface @beta Efl.Gfx.View
 {
   [[Efl graphics view interface]]
-   eo_prefix: efl_gfx;
+   c_prefix: efl_gfx;
   methods {
      @property view_size {
         [[The dimensions of this object's viewport.
diff --git a/src/lib/efl/interfaces/efl_model.eo b/src/lib/efl/interfaces/efl_model.eo
index d9d789d556..40790a5153 100644
--- a/src/lib/efl/interfaces/efl_model.eo
+++ b/src/lib/efl/interfaces/efl_model.eo
@@ -16,7 +16,7 @@ struct @beta Efl.Model_Children_Event {
 interface @beta Efl.Model
 {
   [[Efl model interface]]
-   eo_prefix: efl_model;
+   c_prefix: efl_model;
      methods {
         @property properties {
            get {
diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo
index 19bda9a6b8..49b7982269 100644
--- a/src/lib/efl/interfaces/efl_pack_layout.eo
+++ b/src/lib/efl/interfaces/efl_pack_layout.eo
@@ -4,7 +4,7 @@ interface @beta Efl.Pack_Layout
     Used for containers (box, grid).
   ]]
-   eo_prefix: efl_pack;
+   c_prefix: efl_pack;
   methods {
      // Note: Do we need a layout_force or a sync flag in layout_request?
      layout_request {
diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo
index b98d3ec08a..79ea27c5d9 100644
--- a/src/lib/efl/interfaces/efl_pack_linear.eo
+++ b/src/lib/efl/interfaces/efl_pack_linear.eo
@@ -5,7 +5,7 @@ interface @beta Efl.Pack_Linear extends Efl.Pack
     This means the sub-objects are internally organized in an ordered list.
   ]]
-   eo_prefix: efl_pack;
+   c_prefix: efl_pack;
   methods {
      pack_begin {
         [[Prepend an object at the beginning of this container.
diff --git a/src/lib/efl/interfaces/efl_pack_table.eo b/src/lib/efl/interfaces/efl_pack_table.eo
index 9472b52ed4..c94bd334d3 100644
--- a/src/lib/efl/interfaces/efl_pack_table.eo
+++ b/src/lib/efl/interfaces/efl_pack_table.eo
@@ -3,7 +3,7 @@ import efl_ui_direction;
 interface @beta Efl.Pack_Table extends Efl.Pack
 {
   [[2D containers aligned on a table with rows and columns]]
-   eo_prefix: efl_pack;
+   c_prefix: efl_pack;
   methods {
      pack_table {
         [[Pack object at a given location in the table.
diff --git a/src/lib/efl/interfaces/efl_text_annotate.eo b/src/lib/efl/interfaces/efl_text_annotate.eo
index f9f52a4bb0..724faeb0a3 100644
--- a/src/lib/efl/interfaces/efl_text_annotate.eo
+++ b/src/lib/efl/interfaces/efl_text_annotate.eo
@@ -3,7 +3,7 @@ import efl_text_types;
 interface @beta Efl.Text_Annotate {
   [[Cursor API
   ]]
-   eo_prefix: efl_text;
+   c_prefix: efl_text;
   methods {
      // Annotation
      @property annotation {
diff --git a/src/lib/efl/interfaces/efl_text_font.eo b/src/lib/efl/interfaces/efl_text_font.eo
index 32f15c2a55..27d32d6433 100644
--- a/src/lib/efl/interfaces/efl_text_font.eo
+++ b/src/lib/efl/interfaces/efl_text_font.eo
@@ -50,7 +50,7 @@ enum @beta Efl.Text_Font_Bitmap_Scalable {
 interface @beta Efl.Text_Font {
   [[Font settings of the text
   ]]
-   eo_prefix: efl_text;
+   c_prefix: efl_text;
   methods {
      @property font {
         set {
diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo
index 6d0125c55d..25c17f19a3 100644
--- a/src/lib/efl/interfaces/efl_text_format.eo
+++ b/src/lib/efl/interfaces/efl_text_format.eo
@@ -21,7 +21,7 @@ interface @beta Efl.Text_Format {
     The text format can affect the geometry of the text object, as well as
     how characters are presented.
   ]]
-   eo_prefix: efl_text;
+   c_prefix: efl_text;
   methods {
      @property ellipsis {
         [[Ellipsis value (number from -1.0 to 1.0)]]
diff --git a/src/lib/efl/interfaces/efl_text_style.eo b/src/lib/efl/interfaces/efl_text_style.eo
index 362a56f223..c42433b317 100644
--- a/src/lib/efl/interfaces/efl_text_style.eo
+++ b/src/lib/efl/interfaces/efl_text_style.eo
@@ -60,7 +60,7 @@ interface @beta Efl.Text_Style {
     A style can be coloring, effects, underline, strikethrough etc.
   ]]
-   eo_prefix: efl_text;
+   c_prefix: efl_text;
   methods {
      @property normal_color {
         [[Color of text, excluding style]]
diff --git a/src/lib/efl/interfaces/efl_ui_i18n.eo b/src/lib/efl/interfaces/efl_ui_i18n.eo
index ece81f6314..af37b13f8f 100644
--- a/src/lib/efl/interfaces/efl_ui_i18n.eo
+++ b/src/lib/efl/interfaces/efl_ui_i18n.eo
@@ -1,7 +1,7 @@
 interface @beta Efl.Ui.I18n
 {
   [[A common Internationalization interface for UI objects.]]
-   eo_prefix: efl_ui;
+   c_prefix: efl_ui;
   methods {
      @property mirrored {
         [[Whether this object should be mirrored.
diff --git a/src/lib/efl/interfaces/efl_ui_multi_selectable.eo b/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
index a99ff458f4..2f7eac4788 100644
--- a/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_multi_selectable.eo
@@ -12,7 +12,7 @@ interface @beta Efl.Ui.Multi_Selectable
 {
   [[Efl UI Multi selectable interface.
     The container have to control select property of multiple chidren.]]
-   eo_prefix: efl_ui;
+   c_prefix: efl_ui;
   methods
   {
      @property select_mode {
diff --git a/src/lib/efl/interfaces/efl_ui_range_display.eo b/src/lib/efl/interfaces/efl_ui_range_display.eo
index ca9d2c1e1b..c71f6d01de 100644
--- a/src/lib/efl/interfaces/efl_ui_range_display.eo
+++ b/src/lib/efl/interfaces/efl_ui_range_display.eo
@@ -1,7 +1,7 @@
 interface @beta Efl.Ui.Range_Display
 {
   [[Interface that contains properties regarding the displaying of a range.]]
-   eo_prefix: efl_ui_range;
+   c_prefix: efl_ui_range;
   methods {
      @property range_value {
         [[Control the range value (in percentage) on a given range widget
diff --git a/src/lib/efl/interfaces/efl_ui_range_interactive.eo b/src/lib/efl/interfaces/efl_ui_range_interactive.eo
index a7af8c8c8f..817178c7b2 100644
--- a/src/lib/efl/interfaces/efl_ui_range_interactive.eo
+++ b/src/lib/efl/interfaces/efl_ui_range_interactive.eo
@@ -4,7 +4,7 @@ interface @beta Efl.Ui.Range_Interactive extends Efl.Ui.Range_Display
     The properties defined here are used to manipulate the way a user interacts with a displayed range.
   ]]
-   eo_prefix: efl_ui_range;
+   c_prefix: efl_ui_range;
   methods {
      @property range_step {
         [[Control the step used to increment or decrement values for given widget.
diff --git a/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo b/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
index 906c43982e..98423c7349 100644
--- a/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
@@ -2,7 +2,7 @@ import eina_types;
 interface @beta Efl.Ui.Scrollable_Interactive extends Efl.Ui.Scrollable
 {
-   eo_prefix: efl_ui_scrollable;
+   c_prefix: efl_ui_scrollable;
   methods {
      @property content_pos {
         [[The content position]]
diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo
index b3d949aa5f..9cf90d6ea5 100644
--- a/src/lib/efl/interfaces/efl_ui_zoom.eo
+++ b/src/lib/efl/interfaces/efl_ui_zoom.eo
@@ -12,7 +12,7 @@ interface @beta Efl.Ui.Zoom
 {
   [[Efl UI zoom interface]]
   event_prefix: efl_ui;
-   eo_prefix: efl_ui;
+   c_prefix: efl_ui;
   methods {
      @property zoom_animation {
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index 37b021e0ca..9e7dc5da0f 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -240,7 +240,7 @@ struct @beta Efl.Access.Relation
 mixin @beta Efl.Access.Object requires Efl.Object
 {
   [[Accessibility accessible mixin]]
-   eo_prefix: efl_access_object;
+   c_prefix: efl_access_object;
   data: Efl_Access_Object_Data;
   methods {
      @property localized_role_name @protected @beta {
diff --git a/src/lib/elementary/efl_config_global.eo b/src/lib/elementary/efl_config_global.eo
index 77a04ae928..db437901e7 100644
--- a/src/lib/elementary/efl_config_global.eo
+++ b/src/lib/elementary/efl_config_global.eo
@@ -4,7 +4,7 @@ class @beta Efl.Config_Global extends Efl.Object implements Efl.Config
     running application.
   ]]
   data: null;
-   eo_prefix: efl_config;
+   c_prefix: efl_config;
   methods {
      save @protected {
         [[Saves Elementary configuration to disk.
diff --git a/src/lib/elementary/efl_ui_layout_base.eo b/src/lib/elementary/efl_ui_layout_base.eo
index a3401c865e..1923bddefa 100644
--- a/src/lib/elementary/efl_ui_layout_base.eo
+++ b/src/lib/elementary/efl_ui_layout_base.eo
@@ -10,7 +10,7 @@ abstract Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container,
     @since 1.22
   ]]
-   eo_prefix: efl_ui_layout;
+   c_prefix: efl_ui_layout;
   data: Efl_Ui_Layout_Data;
   methods {
      @property theme {
diff --git a/src/lib/elementary/efl_ui_scroll_manager.eo b/src/lib/elementary/efl_ui_scroll_manager.eo
index 93cd7e99bc..e948fe6bc9 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.eo
+++ b/src/lib/elementary/efl_ui_scroll_manager.eo
@@ -5,7 +5,7 @@ class @beta Efl.Ui.Scroll.Manager extends Efl.Object implements
 {
   [[Efl ui scroll manager class]]
   event_prefix: efl_ui;
-   eo_prefix: efl_ui_scroll_manager;
+   c_prefix: efl_ui_scroll_manager;
   methods {
      @property pan @protected {
    [[This is the internal pan object managed by scroll manager.
diff --git a/src/lib/elementary/efl_ui_theme.eo b/src/lib/elementary/efl_ui_theme.eo
index 73805a90a5..f167a23b47 100644
--- a/src/lib/elementary/efl_ui_theme.eo
+++ b/src/lib/elementary/efl_ui_theme.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Ui.Theme extends Efl.Object
 {
   [[Efl Ui Theme class]]
-   eo_prefix: efl_ui_theme;
+   c_prefix: efl_ui_theme;
   data: Efl_Ui_Theme_Data;
   methods {
      @property default @class {
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 40e51aed92..ece49ef4f6 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -25,7 +25,7 @@ abstract Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Object,
     @since 1.22
   ]]
-   //eo_prefix: efl_ui_widget;
+   //c_prefix: efl_ui_widget;
   event_prefix: efl_ui_widget;
   data: Efl_Ui_Widget_Data;
   methods {
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 0764506604..a9d561423d 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -18,7 +18,7 @@ struct @extern Elm.Code_Line; [[Elementary code line data structure]] /* Parts o
 class @beta Elm.Code_Widget extends Efl.Ui.Layout_Base
 {
   [[Elementary code widget]]
-   eo_prefix: efl_ui_code_widget;
+   c_prefix: efl_ui_code_widget;
   methods {
      @property code {
         set {
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index 6fc578882d..f8c2a2dbfd 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -30,7 +30,7 @@ enum Elm.Scroller.Single_Direction
 mixin @beta Elm.Interface_Scrollable requires Efl.Ui.Widget extends Efl.Ui.Scrollable, Efl.Ui.Focus.Manager_Sub, Efl.Ui.Widget_Focus_Manager
 {
   [[Elm scrollable mixin]]
-   eo_prefix: elm_interface_scrollable;
+   c_prefix: elm_interface_scrollable;
   data: Elm_Scrollable_Smart_Interface_Data;
   methods {
      @property gravity {
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index cb0a92e70c..a63343ac9a 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -63,7 +63,7 @@ abstract Efl.Object
     @since 1.22
   ]]
-   eo_prefix: efl;
+   c_prefix: efl;
   methods {
      @property parent {
diff --git a/src/lib/eolian/database_class.c b/src/lib/eolian/database_class.c
index 34551d3c80..4c8c45d400 100644
--- a/src/lib/eolian/database_class.c
+++ b/src/lib/eolian/database_class.c
@@ -33,7 +33,7 @@ database_class_del(Eolian_Class *cl)
   eina_list_free(cl->callables);
   eina_list_free(cl->composite);
-   if (cl->eo_prefix) eina_stringshare_del(cl->eo_prefix);
+   if (cl->c_prefix)  eina_stringshare_del(cl->c_prefix);
   if (cl->ev_prefix) eina_stringshare_del(cl->ev_prefix);
   if (cl->data_type) eina_stringshare_del(cl->data_type);
diff --git a/src/lib/eolian/database_class_api.c b/src/lib/eolian/database_class_api.c
index fa7d36b541..3e3b0d78d5 100644
--- a/src/lib/eolian/database_class_api.c
+++ b/src/lib/eolian/database_class_api.c
@@ -24,7 +24,7 @@ EAPI Eina_Stringshare*
 eolian_class_eo_prefix_get(const Eolian_Class *cl)
 {
   EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL);
-   return cl->eo_prefix;
+   return cl->c_prefix;
 }
 EAPI Eina_Stringshare*
diff --git a/src/lib/eolian/database_event_api.c b/src/lib/eolian/database_event_api.c
index 74f69cd411..4142c5048d 100644
--- a/src/lib/eolian/database_event_api.c
+++ b/src/lib/eolian/database_event_api.c
@@ -55,7 +55,7 @@ eolian_event_c_name_get(const Eolian_Event *event)
    char  buf[512];
    char *tmp = buf;
    const char *pfx = event->klass->ev_prefix;
-    if (!pfx) pfx = event->klass->eo_prefix;
+    if (!pfx) pfx = event->klass->c_prefix;
    if (!pfx) pfx = event->klass->base.name;
    snprintf(buf, sizeof(buf), "%s_EVENT_%s", pfx, event->base.name);
    eina_str_toupper(&tmp);
diff --git a/src/lib/eolian/database_function_api.c b/src/lib/eolian/database_function_api.c
index 8a38443359..60c4f6b8f5 100644
--- a/src/lib/eolian/database_function_api.c
+++ b/src/lib/eolian/database_function_api.c
@@ -38,11 +38,11 @@ eolian_function_type_get(const Eolian_Function *fid)
 }
 static const char *
-_get_eo_prefix(const Eolian_Function *foo_id, char *buf)
+_get_c_prefix(const Eolian_Function *foo_id, char *buf)
 {
    char *tmp = buf;
-    if (foo_id->klass->eo_prefix)
+    if (foo_id->klass->c_prefix)
-      return foo_id->klass->eo_prefix;
+      return foo_id->klass->c_prefix;
    strcpy(buf, foo_id->klass->base.name);
    eina_str_tolower(&buf);
    while ((tmp = strchr(tmp, '.'))) *tmp = '_';
@@ -88,7 +88,7 @@ eolian_function_full_c_name_get(const Eolian_Function *foo_id,
 {
   char tbuf[512];
   tbuf[0] = '\0';
-   const char *prefix = (ftype != EOLIAN_FUNCTION_POINTER) ? _get_eo_prefix(foo_id, tbuf): tbuf;
+   const char *prefix = (ftype != EOLIAN_FUNCTION_POINTER) ? _get_c_prefix(foo_id, tbuf): tbuf;
   if (!prefix)
     return NULL;
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 9a510e1894..4fec039de2 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -24,9 +24,9 @@ enum Tokens
 * they just fill in the "kw" field of the token */
 #define KEYWORDS KW(class), KW(const), KW(enum), KW(return), KW(struct), \
    \
-    KW(abstract), KW(composite), KW(constructor), KW(constructors), KW(data), \
+    KW(abstract), KW(c_prefix), KW(composite), KW(constructor), KW(constructors), \
-    KW(destructor), KW(eo_prefix), KW(event_prefix), KW(events), \
+    KW(data), KW(destructor), KW(event_prefix), KW(events), KW(extends), \
-    KW(extends), KW(free), KW(get), KW(implements), KW(import), KW(interface), \
+    KW(free), KW(get), KW(implements), KW(import), KW(interface), \
    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), \
    \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index ebf3b1c038..65a28dfd58 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1864,7 +1864,7 @@ error:
 static void
 parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type)
 {
-   Eina_Bool has_eo_prefix     = EINA_FALSE,
+   Eina_Bool has_c_prefix     = EINA_FALSE,
             has_event_prefix  = EINA_FALSE,
             has_data          = EINA_FALSE,
             has_methods       = EINA_FALSE,
@@ -1880,12 +1880,12 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type)
     }
   for (;;) switch (ls->t.kw)
     {
-      case KW_eo_prefix:
+      case KW_c_prefix:
-        CASE_LOCK(ls, eo_prefix, "eo prefix definition")
+        CASE_LOCK(ls, c_prefix, "c prefix definition")
        eo_lexer_get(ls);
        check_next(ls, ':');
        _validate_pfx(ls);
-        ls->klass->eo_prefix = eina_stringshare_ref(ls->t.value.s);
+        ls->klass->c_prefix = eina_stringshare_ref(ls->t.value.s);
        eo_lexer_get(ls);
        check_next(ls, ';');
        break;
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 8c1b02bd2a..baf2fde640 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -177,7 +177,7 @@ struct _Eolian_Class
   Eolian_Object base;
   Eolian_Class_Type type;
   Eolian_Documentation *doc;
-   Eina_Stringshare *eo_prefix;
+   Eina_Stringshare *c_prefix;
   Eina_Stringshare *ev_prefix;
   Eina_Stringshare *data_type;
   union {
diff --git a/src/lib/evas/canvas/efl_canvas_animation.eo b/src/lib/evas/canvas/efl_canvas_animation.eo
index 4198ccf592..a118d89661 100644
--- a/src/lib/evas/canvas/efl_canvas_animation.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation.eo
@@ -3,7 +3,7 @@ import efl_canvas_animation_types;
 class @beta Efl.Canvas.Animation extends Efl.Object implements Efl.Playable
 {
   [[Efl animation class]]
-   eo_prefix: efl_animation;
+   c_prefix: efl_animation;
   methods {
      @property final_state_keep {
         [[Keep final state property]]
diff --git a/src/lib/evas/canvas/efl_canvas_animation_alpha.eo b/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
index 667e3c3f55..1ff9720c3e 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Animation_Alpha extends Efl.Canvas.Animation
 {
   [[Efl alpha animation class]]
-   eo_prefix: efl_animation_alpha;
+   c_prefix: efl_animation_alpha;
   data: Efl_Canvas_Animation_Alpha_Data;
   methods {
      @property alpha {
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group.eo b/src/lib/evas/canvas/efl_canvas_animation_group.eo
index 6f8f77613b..fdf42e2d88 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_group.eo
@@ -1,7 +1,7 @@
 abstract @beta Efl.Canvas.Animation_Group extends Efl.Canvas.Animation
 {
   [[Efl group animation abstract class]]
-   eo_prefix: efl_animation_group;
+   c_prefix: efl_animation_group;
   data: Efl_Canvas_Animation_Group_Data;
   methods {
      animation_add {
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
index c404323c18..63773ddac3 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Animation_Group_Parallel extends Efl.Canvas.Animation_Group
 {
   [[Efl group parallel animation class]]
-   eo_prefix: efl_animation_group_parallel;
+   c_prefix: efl_animation_group_parallel;
   data: null;
   methods {
   }
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index 7e1ce30fc2..53cdf59cb6 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Animation_Player extends Efl.Object implements Efl.Player
 {
   [[Efl animation object class]]
-   eo_prefix: efl_animation_player;
+   c_prefix: efl_animation_player;
   methods {
      @property animation {
         set {}
diff --git a/src/lib/evas/canvas/efl_canvas_animation_rotate.eo b/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
index 0dabb21b7b..818058aa4d 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Animation_Rotate extends Efl.Canvas.Animation
 {
   [[Efl rotate animation class]]
-   eo_prefix: efl_animation_rotate;
+   c_prefix: efl_animation_rotate;
   data: Efl_Canvas_Animation_Rotate_Data;
   methods {
      @property rotate {
diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale.eo b/src/lib/evas/canvas/efl_canvas_animation_scale.eo
index 5276371990..b4da878f9d 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_scale.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_scale.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Animation_Scale extends Efl.Canvas.Animation
 {
   [[Efl scale animation class]]
-   eo_prefix: efl_animation_scale;
+   c_prefix: efl_animation_scale;
   data: Efl_Canvas_Animation_Scale_Data;
   methods {
      @property scale {
diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate.eo b/src/lib/evas/canvas/efl_canvas_animation_translate.eo
index 09204a8c52..3d74cbd0cd 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_translate.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_translate.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Animation_Translate extends Efl.Canvas.Animation
 {
   [[Efl translate animation class]]
-   eo_prefix: efl_animation_translate;
+   c_prefix: efl_animation_translate;
   data: Efl_Canvas_Animation_Translate_Data;
   methods {
      @property translate {
diff --git a/src/lib/evas/canvas/efl_canvas_filter_internal.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
index 052c327d9c..426cd44b09 100644
--- a/src/lib/evas/canvas/efl_canvas_filter_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
@@ -45,7 +45,7 @@ mixin @beta Efl.Canvas.Filter.Internal requires Efl.Object extends Efl.Gfx.Filte
 {
   [[Evas internal implementation of filters.]]
-   eo_prefix: evas;
+   c_prefix: evas;
   data: Evas_Filter_Data;
   methods {
diff --git a/src/lib/evas/canvas/efl_input_event.eo b/src/lib/evas/canvas/efl_input_event.eo
index 95f2db6575..04bc589a86 100644
--- a/src/lib/evas/canvas/efl_input_event.eo
+++ b/src/lib/evas/canvas/efl_input_event.eo
@@ -8,7 +8,7 @@ mixin @beta Efl.Input.Event requires Efl.Object extends Efl.Duplicate
           structures. This class is intended to carry more complex event
           data, such as pointer events.
   ]]
-   eo_prefix: efl_input;
+   c_prefix: efl_input;
   data: null;
   methods {
      @property timestamp @pure_virtual {
diff --git a/src/lib/evas/canvas/efl_input_interface.eo b/src/lib/evas/canvas/efl_input_interface.eo
index 8d64f406f7..e232ec169a 100644
--- a/src/lib/evas/canvas/efl_input_interface.eo
+++ b/src/lib/evas/canvas/efl_input_interface.eo
@@ -19,7 +19,7 @@ interface @beta Efl.Input.Interface
     Long, repeated, key presses will always happen like this:
     down...up,down...up,down...up (not down...up or down...down...down...up).
   ]]
-   eo_prefix: efl_input;
+   c_prefix: efl_input;
   event_prefix: efl;
   methods {
      @property seat_event_filter @beta {
diff --git a/src/lib/evas/canvas/efl_input_state.eo b/src/lib/evas/canvas/efl_input_state.eo
index 08f0623608..bc235158de 100644
--- a/src/lib/evas/canvas/efl_input_state.eo
+++ b/src/lib/evas/canvas/efl_input_state.eo
@@ -6,7 +6,7 @@ interface Efl.Input.State
     @since 1.22
   ]]
-   eo_prefix: efl_input;
+   c_prefix: efl_input;
   methods {
      /* FIXME Efl.Input.Device is not stable yet*/
      @property modifier_enabled @beta {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo b/src/lib/evas/gesture/efl_canvas_gesture.eo
index 86fa775770..eafb1d983a 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -3,7 +3,7 @@ import efl_canvas_gesture_types;
 abstract @beta Efl.Canvas.Gesture extends Efl.Object
 {
   [[EFL Gesture abstract class]]
-   eo_prefix: efl_gesture;
+   c_prefix: efl_gesture;
   methods {
      @property type {
         [[This property holds the type of the gesture.]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
index 12473d6761..1a690b0d65 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Gesture_Long_Tap extends Efl.Canvas.Gesture
 {
   [[EFL Gesture Long Tap class]]
-   eo_prefix: efl_gesture_long_tap;
+   c_prefix: efl_gesture_long_tap;
   event_prefix: efl;
   events {
      gesture,long_tap: Efl.Canvas.Gesture; [[Event for tap gesture]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
index f42c2dccb3..a39318aea0 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Gesture_Manager extends Efl.Object
 {
   [[EFL Gesture Manager class]]
-   eo_prefix: efl_gesture_manager;
+   c_prefix: efl_gesture_manager;
   methods {
      recognizer_register {
         [[This function is called to register a new Efl.Canvas.Gesture_Recognizer]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
index a3a11c3a1c..857408913b 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
@@ -3,7 +3,7 @@ import efl_canvas_gesture_types;
 abstract @beta Efl.Canvas.Gesture_Recognizer extends Efl.Object
 {
   [[EFL Gesture Recognizer abstract class]]
-   eo_prefix: efl_gesture_recognizer;
+   c_prefix: efl_gesture_recognizer;
   methods {
      create @pure_virtual {
         [[This function is called to create a new Efl.Canvas.Gesture object for the given target]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
index 025cc4e19b..8094655f13 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
@@ -2,7 +2,7 @@ class @beta Efl.Canvas.Gesture_Recognizer_Long_Tap extends Efl.Canvas.Gesture_Re
 {
   [[EFL Gesture Recognizer Long Tap class]]
   data: null;
-   eo_prefix: efl_gesture_recognizer_long_tap;
+   c_prefix: efl_gesture_recognizer_long_tap;
   implements {
      Efl.Canvas.Gesture_Recognizer.create;
      Efl.Canvas.Gesture_Recognizer.recognize;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo
index 43fe77a654..65ae8c0c10 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo
@@ -2,7 +2,7 @@ class @beta Efl.Canvas.Gesture_Recognizer_Tap extends Efl.Canvas.Gesture_Recogni
 {
   [[EFL Gesture Recognizer Tap class]]
   data: null;
-   eo_prefix: efl_gesture_recognizer_tap;
+   c_prefix: efl_gesture_recognizer_tap;
   implements {
      Efl.Canvas.Gesture_Recognizer.create;
      Efl.Canvas.Gesture_Recognizer.recognize;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
index 88e6e5c18e..a994b90abe 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
@@ -1,7 +1,7 @@
 class @beta Efl.Canvas.Gesture_Tap extends Efl.Canvas.Gesture
 {
   [[EFL Gesture Tap class]]
-   eo_prefix: efl_gesture_tap;
+   c_prefix: efl_gesture_tap;
   event_prefix: efl;
   events {
      gesture,tap: Efl.Canvas.Gesture; [[Event for tap gesture]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
index 7d773b56c5..4109b47de4 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
@@ -6,7 +6,7 @@ import efl_input_types;
 class @beta Efl.Canvas.Gesture_Touch extends Efl.Object
 {
   [[EFL Gesture Touch class]]
-   eo_prefix: efl_gesture_touch;
+   c_prefix: efl_gesture_touch;
   methods {
      point_record {
         [[Touch point record method]]
diff --git a/src/tests/eolian/data/class_simple.eo b/src/tests/eolian/data/class_simple.eo
index 0a89c5eea7..c6aa05b00b 100644
--- a/src/tests/eolian/data/class_simple.eo
+++ b/src/tests/eolian/data/class_simple.eo
@@ -8,7 +8,7 @@ var @extern Bah: double; // not generated
 class Class_Simple {
   [[Class Desc Simple]]
-   eo_prefix: efl_canvas_object_simple;
+   c_prefix: efl_canvas_object_simple;
   data: Evas_Simple_Data;
   methods {
      @property a @beta {