diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 2e6501cf6c..86b3de516b 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -238,7 +238,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
            "emoticon/happy" or "href=file://image.jpg" etc.
          ]]
          values {
-            item_factory: Efl.Canvas.Text.Factory; [[Factory to create items]]
+            item_factory: Efl.Canvas.Text_Factory; [[Factory to create items]]
          }
       }
       input_panel_show {
diff --git a/src/lib/elementary/efl_ui_text_factory_emoticons.eo b/src/lib/elementary/efl_ui_text_factory_emoticons.eo
index 64b85aef14..6177cfb9d2 100644
--- a/src/lib/elementary/efl_ui_text_factory_emoticons.eo
+++ b/src/lib/elementary/efl_ui_text_factory_emoticons.eo
@@ -1,10 +1,10 @@
-class Efl.Ui.Text.Factory.Emoticons (Efl.Object, Efl.Canvas.Text.Factory)
+class Efl.Ui.Text.Factory.Emoticons (Efl.Object, Efl.Canvas.Text_Factory)
 {
    [[Factory that creates emoticons from the current theme given a key.
 
      @since 1.21
    ]]
    implements {
-      Efl.Canvas.Text.Factory.create;
+      Efl.Canvas.Text_Factory.create;
    }
 }
diff --git a/src/lib/elementary/efl_ui_text_factory_fallback.eo b/src/lib/elementary/efl_ui_text_factory_fallback.eo
index 830fa5b637..cb88010808 100644
--- a/src/lib/elementary/efl_ui_text_factory_fallback.eo
+++ b/src/lib/elementary/efl_ui_text_factory_fallback.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text.Factory.Fallback (Efl.Object, Efl.Canvas.Text.Factory)
+class Efl.Ui.Text.Factory.Fallback (Efl.Object, Efl.Canvas.Text_Factory)
 {
    [[Internal factory for fallback cases.
 
@@ -11,6 +11,6 @@ class Efl.Ui.Text.Factory.Fallback (Efl.Object, Efl.Canvas.Text.Factory)
    implements {
       Efl.Object.constructor;
       Efl.Object.destructor;
-      Efl.Canvas.Text.Factory.create;
+      Efl.Canvas.Text_Factory.create;
    }
 }
diff --git a/src/lib/elementary/efl_ui_text_factory_images.eo b/src/lib/elementary/efl_ui_text_factory_images.eo
index d682e294a7..d0d44f48d0 100644
--- a/src/lib/elementary/efl_ui_text_factory_images.eo
+++ b/src/lib/elementary/efl_ui_text_factory_images.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text.Factory.Images (Efl.Object, Efl.Canvas.Text.Factory)
+class Efl.Ui.Text.Factory.Images (Efl.Object, Efl.Canvas.Text_Factory)
 {
    [[Factory that creates images given key string
 
@@ -64,6 +64,6 @@ class Efl.Ui.Text.Factory.Images (Efl.Object, Efl.Canvas.Text.Factory)
    implements {
       Efl.Object.constructor;
       Efl.Object.destructor;
-      Efl.Canvas.Text.Factory.create;
+      Efl.Canvas.Text_Factory.create;
    }
 }
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 07f7d81277..13bf191222 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -1,6 +1,6 @@
 import efl_text_types;
 
-struct Efl.Canvas.Text.Style; [[EFL text style data structure]]
+struct Efl.Canvas.Text_Style; [[EFL text style data structure]]
 
 class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
                        Efl.Canvas.Filter.Internal, Efl.Text.Font,
diff --git a/src/lib/evas/canvas/efl_canvas_text_factory.eo b/src/lib/evas/canvas/efl_canvas_text_factory.eo
index 240cfb4669..772521a408 100644
--- a/src/lib/evas/canvas/efl_canvas_text_factory.eo
+++ b/src/lib/evas/canvas/efl_canvas_text_factory.eo
@@ -1,4 +1,4 @@
-interface Efl.Canvas.Text.Factory ()
+interface Efl.Canvas.Text_Factory ()
 {
    [[Object factory that creates Efl.Canvas.Object objects.