diff --git a/legacy/eina/doc/Doxyfile b/legacy/eina/doc/Doxyfile
index a6a60c1a9f..e5f01fe155 100644
--- a/legacy/eina/doc/Doxyfile
+++ b/legacy/eina/doc/Doxyfile
@@ -1115,7 +1115,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = 
+PREDEFINED             = __UNUSED__=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
diff --git a/legacy/eina/src/include/Eina.h b/legacy/eina/src/include/Eina.h
index 6a40af8683..ca13692ca8 100644
--- a/legacy/eina/src/include/Eina.h
+++ b/legacy/eina/src/include/Eina.h
@@ -35,12 +35,12 @@
  * Linux and Windows (XP and CE).
  *
  * The data types that are available are
- * @li hash table
- * @li list
- * @li inlined list
  * @li array
- * @li shared string
+ * @li hash table
+ * @li inlined list
  * @li inlined red black tree
+ * @li list
+ * @li shared string
  *
  * This document describes each data type by providing the algorithms
  * used in the implementation, the performance, a short tutorial and
@@ -48,23 +48,29 @@
  *
  * @section eina_data_types_sec Eina Data Types
  *
- * @subsection hashtable Hash Table
+ * @subsection eina_array Array
  *
- * give a small description here : what it is for, what it does
- * , etc...
+ * @subsection eina_hash Hash Table
  *
- * To look at documentation of our hash tables, follow the link @ref
- * Eina_Hash_Group.
+ * @subsection eina_inlist Inlined List
  *
- * @subsection list List
+ * @subsection eina_rbtree Inlined Red Black Tree
  *
- * @subsection inlist Inlined List
+ * @subsection eina_list List
  *
- * @subsection array Array
+ * @subsection eina_stringshare Shared String
  *
- * @subsection stringshare Shared String
+ * @section eina_tools_sec Eina Tools
  *
- * @subsection rbtree Inlined Red Black Tree
+ * @subsection eina_convert Convert Functions
+ *
+ * @subsection eina_counter Timing Functions
+ *
+ * @subsection eina_error Error Functions
+ *
+ * Take a look at the API of @ref Eina_Error_Group.
+ *
+ * Take a look at the @ref tutorial_error_page.
  *
  * @todo add debug function
  * @todo add magic function
diff --git a/legacy/eina/src/include/eina_error.h b/legacy/eina/src/include/eina_error.h
index e63ff452a6..72b0f93ad2 100644
--- a/legacy/eina/src/include/eina_error.h
+++ b/legacy/eina/src/include/eina_error.h
@@ -23,37 +23,89 @@
 
 #include "eina_types.h"
 
+/**
+ * @defgroup Eina_Error_Group Error Functions
+ *
+ * @{
+ */
+
+/**
+ * @def EINA_ERROR_PERR(fmt, ...)
+ * Print the error message described with the formatted string @a fmt
+ * using the current print callback, file function and line, with the
+ * error level EINA_ERROR_LEVEL_ERR.
+ */
 #define EINA_ERROR_PERR(fmt, ...) \
 	eina_error_print(EINA_ERROR_LEVEL_ERR, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
 
+/**
+ * @def EINA_ERROR_PINFO(fmt, ...)
+ * Print the error message described with the formatted string @a fmt
+ * using the current print callback, file function and line, with the
+ * error level EINA_ERROR_LEVEL_INFO.
+ */
 #define EINA_ERROR_PINFO(fmt, ...) \
 	eina_error_print(EINA_ERROR_LEVEL_INFO, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
 
+/**
+ * @def EINA_ERROR_PWARN(fmt, ...)
+ * Print the error message described with the formatted string @a fmt
+ * using the current print callback, file function and line, with the
+ * error level EINA_ERROR_LEVEL_WARN.
+ */
 #define EINA_ERROR_PWARN(fmt, ...) \
 	eina_error_print(EINA_ERROR_LEVEL_WARN, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
 
+/**
+ * @def EINA_ERROR_PDBG(fmt, ...)
+ * Print the error message described with the formatted string @a fmt
+ * using the current print callback, file function and line, with the
+ * error level EINA_ERROR_LEVEL_DBG.
+ */
 #define EINA_ERROR_PDBG(fmt, ...) \
 	eina_error_print(EINA_ERROR_LEVEL_DBG, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
 
+/**
+ * @typedef Eina_Error_Level
+ * List of available error levels.
+ */
+
+/**
+ * @enum _Eina_Error_Level
+ * List of available error levels.
+ */
 typedef enum _Eina_Error_Level
 {
-	EINA_ERROR_LEVEL_ERR,
-	EINA_ERROR_LEVEL_WARN,
-	EINA_ERROR_LEVEL_INFO,
-	EINA_ERROR_LEVEL_DBG,
-	EINA_ERROR_LEVELS
+	EINA_ERROR_LEVEL_ERR,   /**< Error error level */
+	EINA_ERROR_LEVEL_WARN,  /**< Warning error level */
+	EINA_ERROR_LEVEL_INFO,  /**< Information error level */
+	EINA_ERROR_LEVEL_DBG,   /**< Debug error level */
+	EINA_ERROR_LEVELS       /**< Count of error level */
 } Eina_Error_Level;
 
+/**
+ * @typedef Eina_Error
+ * Error type.
+ */
 typedef int Eina_Error;
+
+/**
+ * @typedef Eina_Error_Print_Cb
+ * Type for print callbacks.
+ */
 typedef void (*Eina_Error_Print_Cb)(Eina_Error_Level level, const char *file,
                 const char *fnc, int line, const char *fmt, void *data,
 		va_list args);
 
+/**
+ * @var EINA_ERROR_OUT_OF_MEMORY
+ * Error identifier corresponding to a lack of memory.
+ */
 EAPI extern Eina_Error EINA_ERROR_OUT_OF_MEMORY;
 
 EAPI int eina_error_init(void);
 EAPI int eina_error_shutdown(void);
-EAPI Eina_Error eina_error_register(const char *msg);
+EAPI Eina_Error eina_error_msg_register(const char *msg);
 EAPI Eina_Error eina_error_get(void);
 EAPI void eina_error_set(Eina_Error err);
 EAPI const char * eina_error_msg_get(Eina_Error error);
@@ -68,4 +120,8 @@ EAPI void eina_error_print_cb_file(Eina_Error_Level level, const char *file,
 EAPI void eina_error_print_cb_set(Eina_Error_Print_Cb cb, void *data);
 EAPI void eina_error_log_level_set(Eina_Error_Level level);
 
-#endif /*EINA_ERROR_H_*/
+/**
+ * @}
+ */
+
+#endif /* EINA_ERROR_H_ */
diff --git a/legacy/eina/src/lib/eina_convert.c b/legacy/eina/src/lib/eina_convert.c
index 1a13396822..b19c17e2ed 100644
--- a/legacy/eina/src/lib/eina_convert.c
+++ b/legacy/eina/src/lib/eina_convert.c
@@ -117,9 +117,9 @@ eina_convert_init(void)
    if (_init_count > 1) goto init_out;
 
    eina_error_init();
-   EINA_ERROR_CONVERT_0X_NOT_FOUND = eina_error_register("Error during string convertion to float, First '0x' was not found.");
-   EINA_ERROR_CONVERT_P_NOT_FOUND = eina_error_register("Error during string convertion to float, First 'p' was not found.");
-   EINA_ERROR_CONVERT_OUTRUN_STRING_LENGTH = eina_error_register("Error outrun string limit during convertion string convertion to float.");
+   EINA_ERROR_CONVERT_0X_NOT_FOUND = eina_error_msg_register("Error during string convertion to float, First '0x' was not found.");
+   EINA_ERROR_CONVERT_P_NOT_FOUND = eina_error_msg_register("Error during string convertion to float, First 'p' was not found.");
+   EINA_ERROR_CONVERT_OUTRUN_STRING_LENGTH = eina_error_msg_register("Error outrun string limit during convertion string convertion to float.");
 
  init_out:
    return _init_count;
diff --git a/legacy/eina/src/lib/eina_counter.c b/legacy/eina/src/lib/eina_counter.c
index 3139f968e7..7d90461077 100644
--- a/legacy/eina/src/lib/eina_counter.c
+++ b/legacy/eina/src/lib/eina_counter.c
@@ -102,11 +102,11 @@ eina_counter_init(void)
    if (_eina_counter_init_count == 1)
      {
 	eina_error_init();
-	EINA_COUNTER_ERROR_OUT_OF_MEMORY  = eina_error_register("Eina_Counter out of memory");
+	EINA_COUNTER_ERROR_OUT_OF_MEMORY  = eina_error_msg_register("Eina_Counter out of memory");
 #ifdef _WIN32
         if (!QueryPerformanceFrequency(&_eina_counter_frequency))
           {
-             EINA_COUNTER_ERROR_WINDOWS = eina_error_register("Change your OS, you moron !");
+             EINA_COUNTER_ERROR_WINDOWS = eina_error_msg_register("Change your OS, you moron !");
              _eina_counter_init_count--;
              return 0;
           }
diff --git a/legacy/eina/src/lib/eina_error.c b/legacy/eina/src/lib/eina_error.c
index 74b85e2b9c..b01eb54cc7 100644
--- a/legacy/eina/src/lib/eina_error.c
+++ b/legacy/eina/src/lib/eina_error.c
@@ -16,6 +16,140 @@
  * if not, see <http://www.gnu.org/licenses/>.
  */
 
+
+/**
+ * @page tutorial_error_page Error Tutorial
+ *
+ * @section tutorial_error_introduction Introduction
+ *
+ * The Eina error module provides a way to manage errors in a simple
+ * but powerful way in libraries and modules. It is also used in Eina
+ * itself. It provides facilities for displaying different kind of
+ * messages (warning, informations, errors, or debug), which can be
+ * tuned by the user, or for registering new errors messages.
+ *
+ * @section tutorial_error_basic_usage Basic Usage
+ *
+ * The first thing to do when using the error module is to initialize
+ * it with eina_error_init() and, when the error module is not used
+ * anymore, to shut down it with eina_error_shutdown(). So a basic
+ * program would look like that:
+ *
+ * @code
+ * #include <stdlib.h>
+ * #include <stdio.h>
+ *
+ * #include <eina_error.h>
+ *
+ * int main(void)
+ * {
+ *    if (!eina_error_init())
+ *    {
+ *        printf ("Error during the initialization of eina_error module\n");
+ *        return EXIT_FAILURE;
+ *    }
+ *
+ *    eina_error_shutdown();
+ *
+ *    return EXIT_SUCCESS;
+ * }
+ * @endcode
+ *
+ * All program using any module of eina must be compiled with the
+ * following command:
+ *
+ * @code
+ * gcc -Wall -o my_exe my_source.c `pkg-config --cflags --libs eina`
+ * @endcode
+ *
+ * Now that the error module is initialized, error messages can
+ * be displayed. Helper macros are already defined for such purpose:
+ *
+ * @li EINA_ERROR_PERR(),
+ * @li EINA_ERROR_PINFO(),
+ * @li EINA_ERROR_PWARN(),
+ * @li EINA_ERROR_PDBG().
+ *
+ * Here is an example:
+ *
+ * @code
+ * #include <stdlib.h>
+ * #include <stdio.h>
+ *
+ * #include <eina_error.h>
+ *
+ * void test(int i)
+ * {
+ *    EINA_ERROR_PDBG("Entering test\n");
+ *
+ *    if (i < 0)
+ *    {
+ *        EINA_ERROR_PERR("argument is negative\n");
+ *        return;
+ *    }
+ *
+ *    EINA_ERROR_PINFO("argument non negative\n");
+ *
+ *    EINA_ERROR_PDBG("Exiting test\n");
+ * }
+ *
+ * int main(void)
+ * {
+ *    if (!eina_error_init())
+ *    {
+ *        printf ("Error during the initialization of eina_error module\n");
+ *        return EXIT_FAILURE;
+ *    }
+ *
+ *    test(-1);
+ *    test(0);
+ *
+ *    eina_error_shutdown();
+ *
+ *    return EXIT_SUCCESS;
+ * }
+ * @endcode
+ *
+ * If you compiled Eina without debug mode, after executing that
+ * program, you will see only 1 message (the argument being
+ * negative). Why ? These macros are just wrappers around
+ * eina_error_print(). This function only dysplays messages if the
+ * current error level is lesser or equal than the one used by
+ * eina_error_print(). By default, the current error level is
+ * #EINA_ERROR_LEVEL_ERR (in non debug mode), and the macro uses
+ * the error values defines by #Eina_Error_Level. So as
+ * #EINA_ERROR_LEVEL_ERR is the smallest value, only
+ * EINA_ERROR_PERR() will display the message.
+ *
+ * To modify this behavior, you have two solutions:
+ *
+ * @li Using the environment variable EINA_ERROR_LEVEL. In that case,
+ * just set the environment variable to a integer number between 0
+ * (#EINA_ERROR_LEVEL_ERR) and 3 (#EINA_ERROR_LEVEL_DBG)
+ * before executing the program. That environment variable will be
+ * read during the first call of eina_error_init().
+ * @li Using the function eina_error_log_level_set().
+ *
+ * So try using the environment variable like this:
+ *
+ * @code
+ * EINA_ERROR_LEVEL=2 ./my_app
+ * @endcode
+ *
+ * To do the same with eina_error_log_level_set(), just add
+ *
+ * @code
+ * eina_error_log_level_set(EINA_ERROR_LEVEL_INFO);
+ * @endcode
+ *
+ * before the calls of the tests in the above example.
+ *
+ * @section tutorial_error_registering_msg Registering messages
+ *
+ * @section tutorial_error_advanced_display Advanced usage of print callbacks
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -40,6 +174,10 @@
  *                                  Local                                     *
  *============================================================================*/
 
+/**
+ * @cond LOCAL
+ */
+
 static int _init_count = 0;
 static Eina_List *_error_list;
 static Eina_Error _err;
@@ -65,6 +203,10 @@ static char *_colors[EINA_ERROR_LEVELS] = {
 	[EINA_ERROR_LEVEL_DBG] = GREEN,
 };
 
+/**
+ * @endcond
+ */
+
 
 /*============================================================================*
  *                                 Global                                     *
@@ -74,10 +216,104 @@ static char *_colors[EINA_ERROR_LEVELS] = {
  *                                   API                                      *
  *============================================================================*/
 
+/**
+ * @addtogroup Eina_Error_Group Error Functions
+ *
+ * @brief These functions provide error management for porjects.
+ *
+ * The error system must be initialized with eina_error_init() and
+ * shut down with eina_error_shutdown(). The most generic way to print
+ * errors is to use eina_error_print() but the helper macros
+ * EINA_ERROR_PERR(), EINA_ERROR_PINFO(), EINA_ERROR_PWARN() and
+ * EINA_ERROR_PDBG() should be used instead.
+ *
+ * Here is a straightforward example:
+ *
+ * @code
+ * #include <stdlib.h>
+ * #include <stdio.h>
+ *
+ * #include <eina_error.h>
+ *
+ * void test_warn(void)
+ * {
+ *    EINA_ERROR_PWARN("Here is a warning message\n");
+ * }
+ *
+ * int main(void)
+ * {
+ *    if (!eina_error_init())
+ *    {
+ *        printf ("Error during the initialization of eina_error module\n");
+ *        return EXIT_FAILURE;
+ *    }
+ *
+ *    test_warn();
+ *
+ *    eina_error_shutdown();
+ *
+ *    return EXIT_SUCCESS;
+ * }
+ * @endcode
+ *
+ * Compile this code with the following commant:
+ *
+ * @code
+ * gcc -Wall -o test_eina_error test_eina.c `pkg-config --cflags --libs eina`
+ * @endcode
+ *
+ * If Eina is compiled without debug mode, then executing the
+ * resulting program displays nothing because the default error level
+ * is #EINA_ERROR_LEVEL_ERR and we want to display a warning
+ * message, which level is strictly greater than the error level (see
+ * eina_error_print() for more informations). Now execute the program
+ * with:
+ *
+ * @code
+ * EINA_ERROR_LEVEL=2 ./test_eina_error
+ * @endcode
+ *
+ * You should see a message displayed in the terminal.
+ *
+ * For more information, you can look at the @ref tutorial_error_page.
+ *
+ * @{
+ */
+
+
+/**
+ * @cond LOCAL
+ */
+
 EAPI Eina_Error EINA_ERROR_OUT_OF_MEMORY = 0;
 
 /**
+ * @endcond
+ */
+
+/**
+ * @brief Initialize the error system.
  *
+ * @return 1 or greater on success, 0 on error.
+ *
+ * This function sets up the error system or Eina. It is called by
+ * eina_init() and by all subsystems initialization functions. It
+ * returns 0 on failure, otherwise it returns the number of times it
+ * is called.
+ *
+ * The default error level value is set by default to
+ * #EINA_ERROR_LEVEL_DBG if Eina is compiled with debug mode, or to
+ * #EINA_ERROR_LEVEL_ERR otherwise. That value can be overwritten by
+ * setting the environment variable EINA_ERROR_LEVEL. This function
+ * checks the value of that environment variable in the first
+ * call. Its value must be a number between 0 and 3, to match the
+ * error levels #EINA_ERROR_LEVEL_ERR, #EINA_ERROR_LEVEL_WARN,
+ * #EINA_ERROR_LEVEL_INFO and #EINA_ERROR_LEVEL_DBG. That value can
+ * also be set later with eina_error_log_level_set().
+ *
+ * If you call explicitely this function and once you don't need
+ * anymore the error subsystem, then call eina_error_shutdown() to
+ * shut down the error system.
  */
 EAPI int eina_error_init(void)
 {
@@ -90,13 +326,23 @@ EAPI int eina_error_init(void)
 		{
 			_error_level = atoi(level);
 		}
-		EINA_ERROR_OUT_OF_MEMORY = eina_error_register("Out of memory");
+		EINA_ERROR_OUT_OF_MEMORY = eina_error_msg_register("Out of memory");
 	}
 	/* get all the modules */
 	return ++_init_count;
 }
+
 /**
+ * @brief Shut down the error system.
  *
+ * @return 0 when the error system is completely shut down, 1 or
+ * greater otherwise.
+ *
+ * This function shut down the error system set up by
+ * eina_error_init(). It is called by eina_shutdown() and by all
+ * subsystems shutdown functions. It returns 0 when it is called the
+ * same number of times that eina_error_init() and it clears the error
+ * list.
  */
 EAPI int eina_error_shutdown(void)
 {
@@ -114,41 +360,94 @@ EAPI int eina_error_shutdown(void)
 }
 
 /**
- * Register a new error type
- * @param msg The description of the error
- * @return The unique number identifier for this error
+ * @brief Register a new error type.
+ *
+ * @param msg The description of the error.
+ * @return The unique number identifier for this error.
+ *
+ * This function stores in a list the error message described by
+ * @p msg. The returned value is a unique identifier greater or equal
+ * than 1. The description can be retrive later by passing to
+ * eina_error_msg_get() the returned value.
  */
-EAPI Eina_Error eina_error_register(const char *msg)
+EAPI Eina_Error eina_error_msg_register(const char *msg)
 {
 	_error_list = eina_list_append(_error_list, strdup(msg));
 
 	return eina_list_count(_error_list);
 }
+
 /**
+ * @brief Return the description of the given an error number.
  *
+ * @param error The error number.
+ * @return The description of the error.
+ *
+ * This function returns the description of an error that has been
+ * registered with eina_error_msg_register(). If an incorrect error is
+ * given, then @c NULL is returned.
+ */
+EAPI const char * eina_error_msg_get(Eina_Error error)
+{
+	return eina_list_nth(_error_list, error - 1);
+}
+
+/**
+ * @brief Return the last set error.
+ *
+ * @return The last error.
+ *
+ * This function returns the last error set by eina_error_set().
  */
 EAPI Eina_Error eina_error_get(void)
 {
 	return _err;
 }
+
 /**
+ * @brief Set the last error.
  *
+ * @param err The error identifier.
+ *
+ * This function sets the last error identifier. The last error can be
+ * retrieved with eina_error_get().
  */
 EAPI void eina_error_set(Eina_Error err)
 {
 	_err = err;
 }
+
 /**
- * Given an error number return the description of it
- * @param error The error number
- * @return The description of the error
- */
-EAPI const char * eina_error_msg_get(int error)
-{
-	return eina_list_nth(_error_list, error - 1);
-}
-/**
+ * @brief Print the error to a file.
  *
+ * @param level The error level.
+ * @param file The name of the file where the error occurred.
+ * @param fnc The name of the function where the error occurred.
+ * @param line The number of the line where the error occurred.
+ * @param fmt The format to use.
+ *
+ * This function sends to a stream (like stdout or stderr) a formatted
+ * string that describes the error. The error level is set by
+ * @p level, the name of the file, of the function and the number of the
+ * line where the error occurred are respectively set by @p file,
+ * @p fnc and @p line. A description of the error message is given by
+ * @p fmt, which is a formatted string, followed by optional arguments
+ * that can be converted (like with printf). If @p level is strictly
+ * larger than the current error level, that function returns
+ * immediatly, otherwise it prints all the errors up to the current
+ * error level. The current error level can be changed with
+ * eina_error_log_level_set(). See also eina_error_init() for more
+ * informations.
+ *
+ * By default, that formatted message is send to stdout and is
+ * formatted by eina_error_print_cb_stdout(). The destination of the
+ * formatted message is send and the way it is formatted can be
+ * changed by setting a print callback with
+ * eina_error_print_cb_set(). Some print callbacks are already
+ * defined: eina_error_print_cb_stdout() that send the message to
+ * stdout and eina_error_print_cb_file() that sends it to a file, but
+ * custom print callbacks can be used. They must be of type
+ * #Eina_Error_Print_Cb.
  */
 EAPI void eina_error_print(Eina_Error_Level level, const char *file,
 		const char *fnc, int line, const char *fmt, ...)
@@ -162,8 +461,21 @@ EAPI void eina_error_print(Eina_Error_Level level, const char *file,
 	_print_cb(level, file, fnc, line, fmt, _print_cb_data, args);
 	va_end(args);
 }
+
 /**
+ * @brief Print callback that send the error message to stdout.
  *
+ * @param level The error level.
+ * @param file The name of the file where the error occurred.
+ * @param fnc The name of the function where the error occurred.
+ * @param line The number of the line where the error occurred.
+ * @param fmt The format to use.
+ * @param data Unused.
+ * @param args The arguments that will be converted.
+ *
+ * This function is used to send a formatted error message to standard
+ * output and as a print callback, with eina_error_print(). This is
+ * the default print callback.
  */
 EAPI void eina_error_print_cb_stdout(Eina_Error_Level level, const char *file,
 		const char *fnc, int line, const char *fmt, __UNUSED__ void *data,
@@ -174,8 +486,23 @@ EAPI void eina_error_print_cb_stdout(Eina_Error_Level level, const char *file,
 	printf("%s", _colors[EINA_ERROR_LEVEL_INFO]);
 	vprintf(fmt, args);
 }
+
 /**
+ * @brief Print callback that send the error message to a specified stream.
  *
+ * @param level Unused.
+ * @param file The name of the file where the error occurred.
+ * @param fnc The name of the function where the error occurred.
+ * @param line The number of the line where the error occurred.
+ * @param fmt The format to use.
+ * @param data The file stream.
+ * @param args The arguments that will be converted.
+ *
+ * This function is used to send a formatted error message to the
+ * stream specified by @p data. That stream must be of type FILE *. Look
+ * at eina_error_print_cb_stdout() for the description of the other
+ * parameters. Use eina_error_print_cb_set() to set it as default
+ * print callback in eina_error_print().
  */
 EAPI void eina_error_print_cb_file(__UNUSED__ Eina_Error_Level level, const char *file,
 		const char *fnc, int line, const char *fmt, void *data,
@@ -186,18 +513,36 @@ EAPI void eina_error_print_cb_file(__UNUSED__ Eina_Error_Level level, const char
 	fprintf(f, "[%s:%d] %s() ", file, line, fnc);
 	vfprintf(f, fmt, args);
 }
+
 /**
+ * @brief Set the default print callback.
  *
+ * @param cb The print callback.
+ * @param data The data to pass to the callback
+ *
+ * This function set the default print callback @p cb used by
+ * eina_error_print(). A data an be passed to that callback with
+ * @p data.
  */
 EAPI void eina_error_print_cb_set(Eina_Error_Print_Cb cb, void *data)
 {
 	_print_cb = cb;
 	_print_cb_data = data;
 }
+
 /**
+ * @brief Set the default error log level.
  *
+ * @param level The error level.
+ *
+ * This function sets the error log level @p level. I it used in
+ * eina_error_print().
  */
 EAPI void eina_error_log_level_set(Eina_Error_Level level)
 {
 	_error_level = level;
 }
+
+/**
+ * @}
+ */
diff --git a/legacy/eina/src/lib/eina_mempool.c b/legacy/eina/src/lib/eina_mempool.c
index 4a3c8f29a4..e01c88450f 100644
--- a/legacy/eina/src/lib/eina_mempool.c
+++ b/legacy/eina/src/lib/eina_mempool.c
@@ -99,7 +99,7 @@ eina_mempool_init(void)
 
 		eina_module_app_register(_group, "eina", "mp", NULL);
 
-		EINA_ERROR_NOT_MEMPOOL_MODULE = eina_error_register("Not a memory pool module.");
+		EINA_ERROR_NOT_MEMPOOL_MODULE = eina_error_msg_register("Not a memory pool module.");
 	}
 	/* get all the modules */
 	return ++_init_count;
diff --git a/legacy/eina/src/tests/eina_test_error.c b/legacy/eina/src/tests/eina_test_error.c
index 8502aeabfb..9d4f92e5ae 100644
--- a/legacy/eina/src/tests/eina_test_error.c
+++ b/legacy/eina/src/tests/eina_test_error.c
@@ -45,7 +45,7 @@ START_TEST(eina_error_errno)
 
    eina_error_init();
 
-   test = eina_error_register(TEST_TEXT);
+   test = eina_error_msg_register(TEST_TEXT);
    fail_if(!eina_error_msg_get(test));
    fail_if(strcmp(eina_error_msg_get(test), TEST_TEXT) != 0);