diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.c b/legacy/evas/src/lib/engines/common/evas_pipe.c
index 6f6586f5ca..1185d21fb0 100644
--- a/legacy/evas/src/lib/engines/common/evas_pipe.c
+++ b/legacy/evas/src/lib/engines/common/evas_pipe.c
@@ -211,24 +211,24 @@ static void evas_common_pipe_op_free(RGBA_Pipe_Op *op);
 
 /* utils */
 static RGBA_Pipe *
-evas_common_pipe_add(RGBA_Pipe *pipe, RGBA_Pipe_Op **op)
+evas_common_pipe_add(RGBA_Pipe *rpipe, RGBA_Pipe_Op **op)
 {
    RGBA_Pipe *p;
    int first_pipe = 0;
 
-   if (!pipe)
+   if (!rpipe)
      {
         first_pipe = 1;
         p = calloc(1, sizeof(RGBA_Pipe));
         if (!p) return NULL;
-        pipe = (RGBA_Pipe *)eina_inlist_append(EINA_INLIST_GET(pipe), EINA_INLIST_GET(p));
+        rpipe = (RGBA_Pipe *)eina_inlist_append(EINA_INLIST_GET(rpipe), EINA_INLIST_GET(p));
      }
-   p = (RGBA_Pipe *)(EINA_INLIST_GET(pipe))->last;
+   p = (RGBA_Pipe *)(EINA_INLIST_GET(rpipe))->last;
    if (p->op_num == PIPE_LEN)
      {
         p = calloc(1, sizeof(RGBA_Pipe));
         if (!p) return NULL;
-        pipe = (RGBA_Pipe *)eina_inlist_append(EINA_INLIST_GET(pipe), EINA_INLIST_GET(p));
+        rpipe = (RGBA_Pipe *)eina_inlist_append(EINA_INLIST_GET(rpipe), EINA_INLIST_GET(p));
      }
    p->op_num++;
    *op = &(p->op[p->op_num - 1]);
@@ -236,7 +236,7 @@ evas_common_pipe_add(RGBA_Pipe *pipe, RGBA_Pipe_Op **op)
      {
         /* FIXME: PTHREAD init any thread locks etc */
      }
-   return pipe;
+   return rpipe;
 }
 
 static void
@@ -1573,13 +1573,13 @@ static LK(task_mutext);
 static void*
 evas_common_pipe_load(void *data)
 {
-  Thinfo *thinfo;
+  Thinfo *tinfo;
 
-  thinfo = data;
+  tinfo = data;
   for (;;)
     {
       /* wait for start signal */
-      pthread_barrier_wait(&(thinfo->barrier[0]));
+      pthread_barrier_wait(&(tinfo->barrier[0]));
 
       while (task)
 	{
@@ -1601,7 +1601,7 @@ evas_common_pipe_load(void *data)
 	}
 
       /* send finished signal */    
-      pthread_barrier_wait(&(thinfo->barrier[1]));
+      pthread_barrier_wait(&(tinfo->barrier[1]));
     }
 
   return NULL;
diff --git a/legacy/evas/src/lib/engines/common/evas_text_utils.c b/legacy/evas/src/lib/engines/common/evas_text_utils.c
index f12a685f71..6d48f4b263 100644
--- a/legacy/evas/src/lib/engines/common/evas_text_utils.c
+++ b/legacy/evas/src/lib/engines/common/evas_text_utils.c
@@ -360,21 +360,21 @@ evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,
    gl_itr = text_props->info->glyph;
    for ( ; i > 0 ; gl_itr++, text += adv_d, i--)
      {
-        FT_UInt index;
+        FT_UInt idx;
         RGBA_Font_Glyph *fg;
         int _gl, kern;
         Evas_Coord adv;
         _gl = *text;
         if (_gl == 0) break;
 
-        index = evas_common_get_char_index(fi, _gl);
-        if (index == 0)
+        idx = evas_common_get_char_index(fi, _gl);
+        if (idx == 0)
           {
-             index = evas_common_get_char_index(fi, REPLACEMENT_CHAR);
+             idx = evas_common_get_char_index(fi, REPLACEMENT_CHAR);
           }
 
         LKL(fi->ft_mutex);
-        fg = evas_common_font_int_cache_glyph_get(fi, index);
+        fg = evas_common_font_int_cache_glyph_get(fi, idx);
         if (!fg)
           {
              LKU(fi->ft_mutex);
@@ -382,10 +382,10 @@ evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,
           }
         kern = 0;
 
-        if ((use_kerning) && (prev_index) && (index) &&
+        if ((use_kerning) && (prev_index) && (idx) &&
             (pface == fi->src->ft.face))
           {
-             if (evas_common_font_query_kerning(fi, prev_index, index, &kern))
+             if (evas_common_font_query_kerning(fi, prev_index, idx, &kern))
                {
                   pen_x += kern;
                   (gl_itr - 1)->pen_after +=
@@ -396,7 +396,7 @@ evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,
         pface = fi->src->ft.face;
         LKU(fi->ft_mutex);
 
-        gl_itr->index = index;
+        gl_itr->index = idx;
         gl_itr->x_bear = fg->glyph_out->left;
         adv = fg->glyph->advance.x >> 10;
         gl_itr->width = fg->glyph_out->bitmap.width;
@@ -412,7 +412,7 @@ evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,
 
         gl_itr->pen_after = EVAS_FONT_ROUND_26_6_TO_INT(pen_x);
 
-        prev_index = index;
+        prev_index = idx;
      }
    text_props->len = len;
 # if !defined(OT_SUPPORT) && defined(BIDI_SUPPORT)
@@ -424,4 +424,3 @@ evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,
    text_props->info->refcount = 1;
    return EINA_TRUE;
 }
-