diff --git a/src/modules/ecore_imf/scim/scim_imcontext.cpp b/src/modules/ecore_imf/scim/scim_imcontext.cpp
index 88066b9820..5cd96e52d0 100644
--- a/src/modules/ecore_imf/scim/scim_imcontext.cpp
+++ b/src/modules/ecore_imf/scim/scim_imcontext.cpp
@@ -242,7 +242,7 @@ utf8_offset_to_index(const char *str, int offset)
    int i;
    for (i = 0; i < offset; i++)
      {
-        eina_unicode_utf8_get_next(str, &index);
+        eina_unicode_utf8_next_get(str, &index);
      }
 
    return index;
diff --git a/src/modules/ecore_imf/xim/ecore_imf_xim.c b/src/modules/ecore_imf/xim/ecore_imf_xim.c
index a115b90647..224ee1dc92 100644
--- a/src/modules/ecore_imf/xim/ecore_imf_xim.c
+++ b/src/modules/ecore_imf/xim/ecore_imf_xim.c
@@ -137,7 +137,7 @@ _ecore_imf_xim_utf8_offset_to_index(const char *str, int offset)
    int i;
    for (i = 0; i < offset; i++)
      {
-        eina_unicode_utf8_get_next(str, &idx);
+        eina_unicode_utf8_next_get(str, &idx);
      }
 
    return idx;
diff --git a/src/tests/eina/eina_test_ustr.c b/src/tests/eina/eina_test_ustr.c
index 6240dd6719..048baceb63 100644
--- a/src/tests/eina/eina_test_ustr.c
+++ b/src/tests/eina/eina_test_ustr.c
@@ -345,80 +345,80 @@ START_TEST(eina_unicode_utf8)
    /* Valid utf-8 cases */
    /* First possible sequence of a certain length */
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\x00", &ind) != 0x00) ||
+   fail_if((eina_unicode_utf8_next_get("\x00", &ind) != 0x00) ||
            (ind != 0));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\x01", &ind) != 0x01) ||
+   fail_if((eina_unicode_utf8_next_get("\x01", &ind) != 0x01) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xC2\x80", &ind) != 0x80) ||
+   fail_if((eina_unicode_utf8_next_get("\xC2\x80", &ind) != 0x80) ||
            (ind != 2));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xE0\xA0\x80", &ind) != 0x800) ||
+   fail_if((eina_unicode_utf8_next_get("\xE0\xA0\x80", &ind) != 0x800) ||
            (ind != 3));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF0\x90\x80\x80", &ind) != 0x10000) ||
+   fail_if((eina_unicode_utf8_next_get("\xF0\x90\x80\x80", &ind) != 0x10000) ||
            (ind != 4));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF8\x88\x80\x80\x80", &ind) != 0x200000) || (ind != 5));
+   fail_if((eina_unicode_utf8_next_get("\xF8\x88\x80\x80\x80", &ind) != 0x200000) || (ind != 5));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xFC\x84\x80\x80\x80\x80", &ind) != 0x4000000) || (ind != 6));
+   fail_if((eina_unicode_utf8_next_get("\xFC\x84\x80\x80\x80\x80", &ind) != 0x4000000) || (ind != 6));
 
    /* Last possible sequence of a certain length */
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\x7F", &ind) != 0x7F) ||
+   fail_if((eina_unicode_utf8_next_get("\x7F", &ind) != 0x7F) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xDF\xBF", &ind) != 0x7FF) ||
+   fail_if((eina_unicode_utf8_next_get("\xDF\xBF", &ind) != 0x7FF) ||
            (ind != 2));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xEF\xBF\xBF", &ind) != 0xFFFF) ||
+   fail_if((eina_unicode_utf8_next_get("\xEF\xBF\xBF", &ind) != 0xFFFF) ||
            (ind != 3));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF7\xBF\xBF\xBF", &ind) != 0x1FFFFF) ||
+   fail_if((eina_unicode_utf8_next_get("\xF7\xBF\xBF\xBF", &ind) != 0x1FFFFF) ||
            (ind != 4));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xFB\xBF\xBF\xBF\xBF", &ind) != 0x3FFFFFF) || (ind != 5));
+   fail_if((eina_unicode_utf8_next_get("\xFB\xBF\xBF\xBF\xBF", &ind) != 0x3FFFFFF) || (ind != 5));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xFD\xBF\xBF\xBF\xBF\xBF", &ind) != 0x7FFFFFFF) || (ind != 6));
+   fail_if((eina_unicode_utf8_next_get("\xFD\xBF\xBF\xBF\xBF\xBF", &ind) != 0x7FFFFFFF) || (ind != 6));
 
    /* Other boundary conditions */
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xED\x9F\xBF", &ind) != 0xD7FF) ||
+   fail_if((eina_unicode_utf8_next_get("\xED\x9F\xBF", &ind) != 0xD7FF) ||
            (ind != 3));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xEE\x80\x80", &ind) != 0xE000) ||
+   fail_if((eina_unicode_utf8_next_get("\xEE\x80\x80", &ind) != 0xE000) ||
            (ind != 3));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xEF\xBF\xBD", &ind) != 0xFFFD) ||
+   fail_if((eina_unicode_utf8_next_get("\xEF\xBF\xBD", &ind) != 0xFFFD) ||
            (ind != 3));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF4\x8F\xBF\xBF", &ind) != 0x10FFFF) ||
+   fail_if((eina_unicode_utf8_next_get("\xF4\x8F\xBF\xBF", &ind) != 0x10FFFF) ||
            (ind != 4));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF4\x90\x80\x80", &ind) != 0x110000) ||
+   fail_if((eina_unicode_utf8_next_get("\xF4\x90\x80\x80", &ind) != 0x110000) ||
            (ind != 4));
 
    /* Error cases */
    /* Standalone continuation bytes */
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\x80", &ind) != 0xDC80) ||
+   fail_if((eina_unicode_utf8_next_get("\x80", &ind) != 0xDC80) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xBF", &ind) != 0xDCBF) ||
+   fail_if((eina_unicode_utf8_next_get("\xBF", &ind) != 0xDCBF) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\x80\xBF", &ind) != 0xDC80) ||
+   fail_if((eina_unicode_utf8_next_get("\x80\xBF", &ind) != 0xDC80) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xBF\x80", &ind) != 0xDCBF) ||
+   fail_if((eina_unicode_utf8_next_get("\xBF\x80", &ind) != 0xDCBF) ||
            (ind != 1));
    /* All possible continuation bytes */
    for (ch = 0x80 ; ch <= 0xBF ; ch++)
      {
         char buf[] = {ch, 0};
         ind = 0;
-        fail_if((eina_unicode_utf8_get_next(buf, &ind) != (0xDC00 | ch)) ||
+        fail_if((eina_unicode_utf8_next_get(buf, &ind) != (0xDC00 | ch)) ||
                 (ind != 1));
      }
 
@@ -436,9 +436,9 @@ START_TEST(eina_unicode_utf8)
         ind = 0; \
         for (i = 0, ch = start ; ch <= end ; ch++) \
           { \
-             fail_if((eina_unicode_utf8_get_next(buf, &ind) != (0xDC00 | ch)) || \
+             fail_if((eina_unicode_utf8_next_get(buf, &ind) != (0xDC00 | ch)) || \
                      (ind != ++i)); \
-             fail_if((eina_unicode_utf8_get_next(buf, &ind) != 0x20) || \
+             fail_if((eina_unicode_utf8_next_get(buf, &ind) != 0x20) || \
                      (ind != ++i)); \
           } \
      } \
@@ -473,8 +473,8 @@ START_TEST(eina_unicode_utf8)
              buf[j] = 0; \
              ind = 0; \
              fail_if( \
-                (eina_unicode_utf8_get_next(buf, &ind) != (0xDC00 | first))); \
-             while ((val = eina_unicode_utf8_get_next(buf, &ind))) \
+                (eina_unicode_utf8_next_get(buf, &ind) != (0xDC00 | first))); \
+             while ((val = eina_unicode_utf8_next_get(buf, &ind))) \
                { \
                   fail_if(val != (0xDC00 | conti)); \
                } \
@@ -497,44 +497,44 @@ START_TEST(eina_unicode_utf8)
 
    /* Impossible bytes */
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xFE", &ind) != 0xDCFE) ||
+   fail_if((eina_unicode_utf8_next_get("\xFE", &ind) != 0xDCFE) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xFF", &ind) != 0xDCFF) ||
+   fail_if((eina_unicode_utf8_next_get("\xFF", &ind) != 0xDCFF) ||
            (ind != 1));
 
    /* Overlong sequences */
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xC0\xAF", &ind) != 0xDCC0) ||
+   fail_if((eina_unicode_utf8_next_get("\xC0\xAF", &ind) != 0xDCC0) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xE0\x80\xAF", &ind) != 0xDCE0) ||
+   fail_if((eina_unicode_utf8_next_get("\xE0\x80\xAF", &ind) != 0xDCE0) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF0\x80\x80\xAF", &ind) != 0xDCF0) ||
+   fail_if((eina_unicode_utf8_next_get("\xF0\x80\x80\xAF", &ind) != 0xDCF0) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF8\x80\x80\x80\xAF", &ind) != 0xDCF8) ||
+   fail_if((eina_unicode_utf8_next_get("\xF8\x80\x80\x80\xAF", &ind) != 0xDCF8) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xFC\x80\x80\x80\x80\xAF", &ind) != 0xDCFC) ||
+   fail_if((eina_unicode_utf8_next_get("\xFC\x80\x80\x80\x80\xAF", &ind) != 0xDCFC) ||
            (ind != 1));
 
    /* Maximum overlong sequences */
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xC1\xBF", &ind) != 0xDCC1) ||
+   fail_if((eina_unicode_utf8_next_get("\xC1\xBF", &ind) != 0xDCC1) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xE0\x9F\xBF", &ind) != 0xDCE0) ||
+   fail_if((eina_unicode_utf8_next_get("\xE0\x9F\xBF", &ind) != 0xDCE0) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF0\x8F\xBF\xBF", &ind) != 0xDCF0) ||
+   fail_if((eina_unicode_utf8_next_get("\xF0\x8F\xBF\xBF", &ind) != 0xDCF0) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xF8\x87\xBF\xBF\xBF", &ind) != 0xDCF8) ||
+   fail_if((eina_unicode_utf8_next_get("\xF8\x87\xBF\xBF\xBF", &ind) != 0xDCF8) ||
            (ind != 1));
    ind = 0;
-   fail_if((eina_unicode_utf8_get_next("\xFC\x83\xBF\xBF\xBF\xBF", &ind) != 0xDCFC) ||
+   fail_if((eina_unicode_utf8_next_get("\xFC\x83\xBF\xBF\xBF\xBF", &ind) != 0xDCFC) ||
            (ind != 1));
    /* Add some more error cases here */