diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo
index 05d5226407..79e62883da 100644
--- a/src/lib/efl/interfaces/efl_text_format.eo
+++ b/src/lib/efl/interfaces/efl_text_format.eo
@@ -54,14 +54,14 @@ interface @beta Efl.Text_Format {
          }
       }
 
-      @property horizontal_align_auto_type {
+      @property text_horizontal_align_auto_type {
          [[Horizontal alignment of text.]]
          values {
             value: Efl.Text_Format_Horizontal_Alignment_Auto_Type; [[Alignment type.]]
          }
       }
 
-      @property horizontal_align {
+      @property text_horizontal_align {
          [[Horizontal alignment of text. $[0.0] means "left"
            and $[1.0] means "right".]]
          values {
@@ -69,7 +69,7 @@ interface @beta Efl.Text_Format {
          }
       }
 
-      @property vertical_align {
+      @property text_vertical_align {
          [[Vertical alignment of text.$[0.0] means "top"
            and $[1.0] means "bottom"]]
          values {
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo
index 3b686918ee..d183574817 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock.eo
@@ -194,7 +194,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
              $right (Puts the text at the right of the line), $start (Alias for $auto), $end (Puts the text at the
              opposite side of LTR/RTL settings).
              Default value is $auto.
-             See @Efl.Text_Format.horizontal_align.
+             See @Efl.Text_Format.text_horizontal_align.
 
            - $valign: Vertical alignment of the text. The value can either be a decimal number ($[0.0] means "top"
              and $[1.0] means "bottom"), a percentage ($[0%] means "top" and $[100%] means "bottom") or one of:
@@ -202,7 +202,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
              $middle (Alias for $center), $bottom (Puts the text at the bottom of the text box),
              $baseline (Puts the text's baseline at the middle of the text box), $base (Alias for $baseline).
              Default value is $baseline.
-             See @Efl.Text_Format.vertical_align.
+             See @Efl.Text_Format.text_vertical_align.
 
            - $wrap: Wrapping policy of the text. The value must be one of the following: $word (Only wraps lines at
              word boundaries), $char (Wraps at any character), $mixed (Wraps at word boundaries if possible,
@@ -479,9 +479,9 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
       Efl.Text_Format.ellipsis { get; set; }
       Efl.Text_Format.wrap { get; set; }
       Efl.Text_Format.multiline { get; set; }
-      Efl.Text_Format.horizontal_align { get; set; }
-      Efl.Text_Format.horizontal_align_auto_type { get; set; }
-      Efl.Text_Format.vertical_align { get; set; }
+      Efl.Text_Format.text_horizontal_align { get; set; }
+      Efl.Text_Format.text_horizontal_align_auto_type { get; set; }
+      Efl.Text_Format.text_vertical_align { get; set; }
       Efl.Text_Format.linegap { get; set; }
       Efl.Text_Format.linerelgap { get; set; }
       Efl.Text_Format.tabstops { get; set; }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 63f725f00c..3af3fb2897 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -16750,7 +16750,7 @@ _efl_canvas_textblock_efl_text_format_multiline_get(const Eo *obj EINA_UNUSED, E
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type)
+_efl_canvas_textblock_efl_text_format_text_horizontal_align_auto_type_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type)
 {
    ASYNC_BLOCK;
    if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE)
@@ -16772,7 +16772,7 @@ _efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_set(Eo *obj, Ef
 }
 
 static Efl_Text_Format_Horizontal_Alignment_Auto_Type
-_efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
+_efl_canvas_textblock_efl_text_format_text_horizontal_align_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
 {
    Efl_Text_Format_Horizontal_Alignment_Auto_Type ret =
       EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE;
@@ -16793,7 +16793,7 @@ _efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_get(const Eo *o
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_horizontal_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o,
+_efl_canvas_textblock_efl_text_format_text_horizontal_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o,
       double value)
 {
    ASYNC_BLOCK;
@@ -16803,13 +16803,13 @@ _efl_canvas_textblock_efl_text_format_horizontal_align_set(Eo *obj, Efl_Canvas_T
 }
 
 static double
-_efl_canvas_textblock_efl_text_format_horizontal_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_efl_canvas_textblock_efl_text_format_text_horizontal_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
 {
    return _FMT(halign);
 }
 
 static void
-_efl_canvas_textblock_efl_text_format_vertical_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o,
+_efl_canvas_textblock_efl_text_format_text_vertical_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o,
       double value)
 {
    ASYNC_BLOCK;
@@ -16821,7 +16821,7 @@ _efl_canvas_textblock_efl_text_format_vertical_align_set(Eo *obj, Efl_Canvas_Tex
 }
 
 static double
-_efl_canvas_textblock_efl_text_format_vertical_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
+_efl_canvas_textblock_efl_text_format_text_vertical_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
 {
    return o->valign;
 }