14 files changed, 130 insertions, 130 deletions

diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 63c9e7d67a..ac556a55aa 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -318,7 +318,7 @@ void eo_gen_class_names_get(const Eolian_Class *cl, char **cname,
 }
 
 static Eina_Bool
-_write_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname,
+_write_header(const Eolian_State *eos, const Eolian_Unit *src, const char *ofname,
               const char *ifname, Eina_Bool legacy)
 {
    INF("generating header: %s (legacy: %d)", ofname, legacy);
@@ -354,7 +354,7 @@ _write_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname,
 }
 
 static Eina_Bool
-_write_stub_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname,
+_write_stub_header(const Eolian_State *eos, const Eolian_Unit *src, const char *ofname,
                    const char *ifname)
 {
    INF("generating stub header: %s", ofname);
@@ -379,7 +379,7 @@ _write_stub_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname
 }
 
 static Eina_Bool
-_write_source(const Eolian *eos, const Eolian_Unit *src, const char *ofname,
+_write_source(const Eolian_State *eos, const Eolian_Unit *src, const char *ofname,
               const char *ifname, Eina_Bool eot)
 {
    INF("generating source: %s", ofname);
@@ -432,7 +432,7 @@ main(int argc, char **argv)
    eina_init();
    eolian_init();
 
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    const char *dom = "eolian_gen";
    _eolian_gen_log_dom = eina_log_domain_register(dom, EINA_COLOR_GREEN);
@@ -593,7 +593,7 @@ end:
      free(outs[i]);
    free(basen);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
    eina_shutdown();
 
diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc
index 67b73b2cc5..54aaa3534e 100644
--- a/src/bin/eolian_cxx/eolian_cxx.cc
+++ b/src/bin/eolian_cxx/eolian_cxx.cc
@@ -34,7 +34,7 @@ struct options_type
 {
    std::vector<std::string> include_dirs;
    std::vector<std::string> in_files;
-   mutable Eolian* state;
+   mutable Eolian_State* state;
    mutable Eolian_Unit const* unit;
    std::string out_file;
    bool main_header;
@@ -42,7 +42,7 @@ struct options_type
    options_type() : main_header(false) {}
    ~options_type()
      {
-        eolian_free(state);
+        eolian_state_free(state);
      }
 };
 
@@ -354,7 +354,7 @@ run(options_type const& opts)
 static void
 state_init(options_type const& opts)
 {
-   Eolian *eos = ::eolian_new();
+   Eolian_State *eos = ::eolian_state_new();
    if (!eos)
      {
         EINA_CXX_DOM_LOG_ERR(eolian_cxx::domain)
diff --git a/src/bin/eolian_mono/eolian_mono.cc b/src/bin/eolian_mono/eolian_mono.cc
index db50906318..616985e088 100644
--- a/src/bin/eolian_mono/eolian_mono.cc
+++ b/src/bin/eolian_mono/eolian_mono.cc
@@ -40,7 +40,7 @@ struct options_type
    std::string in_file;
    std::string out_file;
    std::string dllimport;
-   mutable Eolian* state;
+   mutable Eolian_State* state;
    mutable Eolian_Unit const* unit;
    int v_major;
    int v_minor;
@@ -196,7 +196,7 @@ run(options_type const& opts)
 static void
 state_init(options_type const& opts)
 {
-   Eolian *eos = ::eolian_new();
+   Eolian_State *eos = ::eolian_state_new();
    if (!eos)
      {
         EINA_CXX_DOM_LOG_ERR(eolian_mono::domain)
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 773d302a55..bea134e2e3 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -13,7 +13,7 @@ ffi.cdef [[
     typedef unsigned char Eina_Bool;
     typedef struct _Eina_Iterator Eina_Iterator;
 
-    typedef struct _Eolian Eolian;
+    typedef struct _Eolian_State Eolian_State;
     typedef struct _Eolian_Class Eolian_Class;
     typedef struct _Eolian_Function Eolian_Function;
     typedef struct _Eolian_Type Eolian_Type;
@@ -287,17 +287,17 @@ ffi.cdef [[
 
     int eolian_init(void);
     int eolian_shutdown(void);
-    Eolian *eolian_new(void);
-    void eolian_free(Eolian *state);
-    const Eolian_Unit *eolian_file_parse(Eolian *state, const char *filepath);
-    Eina_Iterator *eolian_all_eo_file_paths_get(Eolian *state);
-    Eina_Iterator *eolian_all_eot_file_paths_get(Eolian *state);
-    Eina_Iterator *eolian_all_eo_files_get(Eolian *state);
-    Eina_Iterator *eolian_all_eot_files_get(Eolian *state);
-    Eina_Bool eolian_directory_scan(Eolian *state, const char *dir);
-    Eina_Bool eolian_system_directory_scan(Eolian *state);
-    Eina_Bool eolian_all_eo_files_parse(Eolian *state);
-    Eina_Bool eolian_all_eot_files_parse(Eolian *state);
+    Eolian_State *eolian_state_new(void);
+    void eolian_state_free(Eolian_State *state);
+    const Eolian_Unit *eolian_file_parse(Eolian_State *state, const char *filepath);
+    Eina_Iterator *eolian_all_eo_file_paths_get(Eolian_State *state);
+    Eina_Iterator *eolian_all_eot_file_paths_get(Eolian_State *state);
+    Eina_Iterator *eolian_all_eo_files_get(Eolian_State *state);
+    Eina_Iterator *eolian_all_eot_files_get(Eolian_State *state);
+    Eina_Bool eolian_directory_scan(Eolian_State *state, const char *dir);
+    Eina_Bool eolian_system_directory_scan(Eolian_State *state);
+    Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
+    Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
     const Eolian_Class *eolian_class_get_by_name(const Eolian_Unit *unit, const char *class_name);
     const Eolian_Class *eolian_class_get_by_file(const Eolian_Unit *unit, const char *file_name);
     const char *eolian_class_file_get(const Eolian_Class *klass);
@@ -455,7 +455,7 @@ ffi.cdef [[
     Eina_Iterator *eolian_variable_namespaces_get(const Eolian_Variable *var);
     Eina_Bool eolian_variable_is_extern(const Eolian_Variable *var);
     const Eolian_Declaration *eolian_declaration_get_by_name(const Eolian_Unit *unit, const char *name);
-    Eina_Iterator *eolian_declarations_get_by_file(const Eolian *state, const char *fname);
+    Eina_Iterator *eolian_declarations_get_by_file(const Eolian_State *state, const char *fname);
     Eina_Iterator *eolian_all_declarations_get(const Eolian_Unit *unit);
     Eolian_Declaration_Type eolian_declaration_type_get(const Eolian_Declaration *decl);
     const char *eolian_declaration_name_get(const Eolian_Declaration *decl);
@@ -512,7 +512,7 @@ M.object_scope = {
     PROTECTED = 3
 }
 
-ffi.metatype("Eolian", {
+ffi.metatype("Eolian_State", {
     __index = {
         directory_scan = function(self, dir)
             return eolian.eolian_directory_scan(self, dir) ~= 0
@@ -564,12 +564,12 @@ ffi.metatype("Eolian", {
         end
     },
     __gc = function(self)
-        eolian.eolian_free(self)
+        eolian.eolian_state_free(self)
     end
 })
 
 M.new = function()
-    return eolian.eolian_new()
+    return eolian.eolian_state_new()
 end
 
 M.declaration_type = {
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index bb67db9139..46c864cb95 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -88,7 +88,7 @@ extern "C" {
  *
  * @ingroup Eolian
  */
-typedef struct _Eolian Eolian;
+typedef struct _Eolian_State Eolian_State;
 
 /* Class type used to extract information on classes
  *
@@ -482,7 +482,7 @@ EAPI int eolian_shutdown(void);
  *
  * @ingroup Eolian
  */
-EAPI Eolian *eolian_new(void);
+EAPI Eolian_State *eolian_state_new(void);
 
 /*
  * @brief Free an Eolian state.
@@ -494,7 +494,7 @@ EAPI Eolian *eolian_new(void);
  * @param[in] state the state to free
  *
  */
-EAPI void eolian_free(Eolian *state);
+EAPI void eolian_state_free(Eolian_State *state);
 
 /*
  * @brief Parse the given .eo or .eot file and fill the database.
@@ -510,7 +510,7 @@ EAPI void eolian_free(Eolian *state);
  *
  * @ingroup Eolian
  */
-EAPI const Eolian_Unit *eolian_file_parse(Eolian *state, const char *filepath);
+EAPI const Eolian_Unit *eolian_file_parse(Eolian_State *state, const char *filepath);
 
 /*
  * @brief Get an iterator to all .eo file names with paths.
@@ -523,7 +523,7 @@ EAPI const Eolian_Unit *eolian_file_parse(Eolian *state, const char *filepath);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian *state);
+EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian_State *state);
 
 /*
  * @brief Get an iterator to all .eot file names with paths.
@@ -536,7 +536,7 @@ EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian *state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian *state);
+EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian_State *state);
 
 /*
  * @brief Get an iterator to all .eo file names (without paths).
@@ -549,7 +549,7 @@ EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian *state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian *state);
+EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian_State *state);
 
 /*
  * @brief Get an iterator to all .eot file names (without paths).
@@ -562,7 +562,7 @@ EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian *state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian *state);
+EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian_State *state);
 
 /*
  * @brief Scan the given directory (recursively) and search for .eo and
@@ -578,7 +578,7 @@ EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian *state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Bool eolian_directory_scan(Eolian *state, const char *dir);
+EAPI Eina_Bool eolian_directory_scan(Eolian_State *state, const char *dir);
 
 /*
  * @brief Scan the system directory (recursively) and search for .eo and
@@ -592,7 +592,7 @@ EAPI Eina_Bool eolian_directory_scan(Eolian *state, const char *dir);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Bool eolian_system_directory_scan(Eolian *state);
+EAPI Eina_Bool eolian_system_directory_scan(Eolian_State *state);
 
 /*
  * @brief Force parsing of all the .eo files located in the directories
@@ -607,7 +607,7 @@ EAPI Eina_Bool eolian_system_directory_scan(Eolian *state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Bool eolian_all_eo_files_parse(Eolian *state);
+EAPI Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
 
 /*
  * @brief Force parsing of all the .eot files located in the directories
@@ -622,7 +622,7 @@ EAPI Eina_Bool eolian_all_eo_files_parse(Eolian *state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Bool eolian_all_eot_files_parse(Eolian *state);
+EAPI Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
 
 /*
  * @brief Gets a class by its name
@@ -2416,7 +2416,7 @@ EAPI const Eolian_Declaration *eolian_declaration_get_by_name(const Eolian_Unit
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_declarations_get_by_file(const Eolian *state, const char *fname);
+EAPI Eina_Iterator *eolian_declarations_get_by_file(const Eolian_State *state, const char *fname);
 
 /*
  * @brief Get an iterator to all declarations in the Eolian database.
diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c
index 238eabbe9a..bbdf1d501d 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -845,7 +845,7 @@ _var_map_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED,
 }
 
 Eina_Bool
-database_validate(Eolian *state, const Eolian_Unit *src)
+database_validate(Eolian_State *state, const Eolian_Unit *src)
 {
    Eolian_Class *cl;
 
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 80f08eac2c..70c3afdf2b 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -1014,7 +1014,7 @@ get_filename(Eo_Lexer *ls)
 }
 
 static void
-eo_lexer_set_input(Eo_Lexer *ls, Eolian *state, const char *source)
+eo_lexer_set_input(Eo_Lexer *ls, Eolian_State *state, const char *source)
 {
    Eina_File *f = eina_file_open(source, EINA_FALSE);
    if (!f)
@@ -1115,7 +1115,7 @@ eo_lexer_free(Eo_Lexer *ls)
 }
 
 Eo_Lexer *
-eo_lexer_new(Eolian *state, const char *source)
+eo_lexer_new(Eolian_State *state, const char *source)
 {
    volatile Eo_Lexer *ls = calloc(1, sizeof(Eo_Lexer));
 
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 9ca577101b..c944cd6ce1 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -167,7 +167,7 @@ typedef struct _Eo_Lexer
     * display the current line with a caret at the respective column */
    const char  *stream_line;
    /* a pointer to the state this lexer belongs to */
-   Eolian      *state;
+   Eolian_State *state;
    /* the unit being filled during current parsing */
    Eolian_Unit *unit;
    /* this is jumped to when an error happens */
@@ -191,7 +191,7 @@ typedef struct _Eo_Lexer
 
 int         eo_lexer_init           (void);
 int         eo_lexer_shutdown       (void);
-Eo_Lexer   *eo_lexer_new            (Eolian *state, const char *source);
+Eo_Lexer   *eo_lexer_new            (Eolian_State *state, const char *source);
 void        eo_lexer_free           (Eo_Lexer *ls);
 /* gets a regular token, singlechar or one of TOK_something */
 int         eo_lexer_get            (Eo_Lexer *ls);
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index da5cc8766b..70a6dc3818 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -44,7 +44,7 @@ eolian_declaration_get_by_name(const Eolian_Unit *unit, const char *name)
 }
 
 EAPI Eina_Iterator *
-eolian_declarations_get_by_file(const Eolian *state, const char *fname)
+eolian_declarations_get_by_file(const Eolian_State *state, const char *fname)
 {
    if (!state) return NULL;
    Eina_Stringshare *shr = eina_stringshare_add(fname);
@@ -514,7 +514,7 @@ eolian_doc_token_ref_get(const Eolian_Unit *unit, const Eolian_Doc_Token *tok,
 }
 
 void
-database_unit_init(Eolian *state, Eolian_Unit *unit)
+database_unit_init(Eolian_State *state, Eolian_Unit *unit)
 {
    unit->state = state;
 
@@ -549,10 +549,10 @@ _hashlist_free(void *data)
    eina_list_free((Eina_List*)data);
 }
 
-EAPI Eolian *
-eolian_new(void)
+EAPI Eolian_State *
+eolian_state_new(void)
 {
-   Eolian *state = calloc(1, sizeof(Eolian));
+   Eolian_State *state = calloc(1, sizeof(Eolian_State));
    if (!state)
      return NULL;
 
@@ -576,7 +576,7 @@ eolian_new(void)
 }
 
 EAPI void
-eolian_free(Eolian *state)
+eolian_state_free(Eolian_State *state)
 {
    if (!state)
      return;
@@ -621,7 +621,7 @@ join_path(const char *path, const char *file)
 static void
 _scan_cb(const char *name, const char *path, void *data EINA_UNUSED)
 {
-   Eolian *state = data;
+   Eolian_State *state = data;
    Eina_Bool is_eo = eina_str_has_suffix(name, EO_SUFFIX);
    if (!is_eo && !eina_str_has_suffix(name, EOT_SUFFIX)) return;
    eina_hash_add(is_eo ? state->filenames_eo : state->filenames_eot,
@@ -629,7 +629,7 @@ _scan_cb(const char *name, const char *path, void *data EINA_UNUSED)
 }
 
 EAPI Eina_Bool
-eolian_directory_scan(Eolian *state, const char *dir)
+eolian_directory_scan(Eolian_State *state, const char *dir)
 {
    if (!dir || !state) return EINA_FALSE;
    eina_file_dir_list(dir, EINA_TRUE, _scan_cb, state);
@@ -637,7 +637,7 @@ eolian_directory_scan(Eolian *state, const char *dir)
 }
 
 EAPI Eina_Bool
-eolian_system_directory_scan(Eolian *state)
+eolian_system_directory_scan(Eolian_State *state)
 {
    Eina_Bool ret;
    Eina_Strbuf *buf = eina_strbuf_new();
@@ -769,7 +769,7 @@ _merge_units(Eolian_Unit *unit)
 }
 
 EAPI const Eolian_Unit *
-eolian_file_parse(Eolian *state, const char *filepath)
+eolian_file_parse(Eolian_State *state, const char *filepath)
 {
    if (!state)
      return NULL;
@@ -788,7 +788,7 @@ eolian_file_parse(Eolian *state, const char *filepath)
 
 typedef struct _Parse_Data
 {
-   Eolian *state;
+   Eolian_State *state;
    Eina_Bool ret;
 } Parse_Data;
 
@@ -805,7 +805,7 @@ static Eina_Bool _tfile_parse(const Eina_Hash *hash EINA_UNUSED, const void *key
 }
 
 EAPI Eina_Bool
-eolian_all_eot_files_parse(Eolian *state)
+eolian_all_eot_files_parse(Eolian_State *state)
 {
    Parse_Data pd = { state, EINA_TRUE };
 
@@ -834,7 +834,7 @@ static Eina_Bool _file_parse(const Eina_Hash *hash EINA_UNUSED, const void *key
 }
 
 EAPI Eina_Bool
-eolian_all_eo_files_parse(Eolian *state)
+eolian_all_eo_files_parse(Eolian_State *state)
 {
    Parse_Data pd = { state, EINA_TRUE };
 
@@ -851,28 +851,28 @@ eolian_all_eo_files_parse(Eolian *state)
 }
 
 EAPI Eina_Iterator *
-eolian_all_eot_files_get(const Eolian *state)
+eolian_all_eot_files_get(const Eolian_State *state)
 {
    if (!state) return NULL;
    return eina_hash_iterator_key_new(state->filenames_eot);
 }
 
 EAPI Eina_Iterator *
-eolian_all_eo_files_get(const Eolian *state)
+eolian_all_eo_files_get(const Eolian_State *state)
 {
    if (!state) return NULL;
    return eina_hash_iterator_key_new(state->filenames_eo);
 }
 
 EAPI Eina_Iterator *
-eolian_all_eot_file_paths_get(const Eolian *state)
+eolian_all_eot_file_paths_get(const Eolian_State *state)
 {
    if (!state) return NULL;
    return eina_hash_iterator_data_new(state->filenames_eot);
 }
 
 EAPI Eina_Iterator *
-eolian_all_eo_file_paths_get(const Eolian *state)
+eolian_all_eo_file_paths_get(const Eolian_State *state)
 {
    if (!state) return NULL;
    return eina_hash_iterator_data_new(state->filenames_eo);
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 58fd1c8d16..4eed189fbe 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -33,7 +33,7 @@ extern Eina_Prefix *_eolian_prefix;
 
 struct _Eolian_Unit
 {
-   Eolian        *state;
+   Eolian_State  *state;
    Eina_Hash     *children;
    Eina_Hash     *classes;
    Eina_Hash     *globals;
@@ -44,7 +44,7 @@ struct _Eolian_Unit
    Eina_Hash     *decls;
 };
 
-struct _Eolian
+struct _Eolian_State
 {
    Eolian_Unit unit;
 
@@ -338,7 +338,7 @@ struct _Eolian_Variable
 };
 
 char *database_class_to_filename(const char *cname);
-Eina_Bool database_validate(Eolian *state, const Eolian_Unit *src);
+Eina_Bool database_validate(Eolian_State *state, const Eolian_Unit *src);
 
 void database_decl_add(Eolian_Unit *unit, Eina_Stringshare *name,
                        Eolian_Declaration_Type type,
@@ -346,7 +346,7 @@ void database_decl_add(Eolian_Unit *unit, Eina_Stringshare *name,
 
 void database_doc_del(Eolian_Documentation *doc);
 
-void database_unit_init(Eolian *state, Eolian_Unit *unit);
+void database_unit_init(Eolian_State *state, Eolian_Unit *unit);
 void database_unit_del(Eolian_Unit *unit);
 
 /* types */
diff --git a/src/lib/eolian_cxx/Eolian_Cxx.hh b/src/lib/eolian_cxx/Eolian_Cxx.hh
index ec5062fee3..2eb9736cb0 100644
--- a/src/lib/eolian_cxx/Eolian_Cxx.hh
+++ b/src/lib/eolian_cxx/Eolian_Cxx.hh
@@ -26,14 +26,14 @@ struct eolian_init
 
 struct eolian_state
 {
-   Eolian *value;
+   Eolian_State *value;
    eolian_state()
    {
-       value = ::eolian_new();
+       value = ::eolian_state_new();
    }
    ~eolian_state()
    {
-     ::eolian_free(value);
+     ::eolian_state_free(value);
    }
 
    inline Eolian_Unit const* as_unit() const
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index d62e74bec2..37a0568600 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -436,11 +436,11 @@ class Eolian_Unit(EolianBaseObject):
 
 class Eolian(Eolian_Unit):
     def __init__(self):
-        self._obj = lib.eolian_new()  # Eolian *
+        self._obj = lib.eolian_state_new()  # Eolian_State *
 
     def __del__(self):
         if not _already_halted:  # do not free after eolian_shutdown
-            lib.eolian_free(self._obj)
+            lib.eolian_state_free(self._obj)
 
     def file_parse(self, filepath):
         c_unit = lib.eolian_file_parse(self._obj, _str_to_bytes(filepath))
diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py
index 78b3a70d94..2170d29c43 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -39,47 +39,47 @@ lib.eolian_init.restype = c_int
 lib.eolian_shutdown.argtypes = []
 lib.eolian_shutdown.restype = c_int
 
-# EAPI Eolian *eolian_new(void);
-lib.eolian_new.argtypes = []
-lib.eolian_new.restype = c_void_p
+# EAPI Eolian_State *eolian_state_new(void);
+lib.eolian_state_new.argtypes = []
+lib.eolian_state_new.restype = c_void_p
 
-# EAPI void eolian_free(Eolian *state);
-lib.eolian_free.argtypes = [c_void_p,]
-lib.eolian_free.restype = None
+# EAPI void eolian_state_free(Eolian_State *state);
+lib.eolian_state_free.argtypes = [c_void_p,]
+lib.eolian_state_free.restype = None
 
-# EAPI const Eolian_Unit *eolian_file_parse(Eolian *state, const char *filepath);
+# EAPI const Eolian_Unit *eolian_file_parse(Eolian_State *state, const char *filepath);
 lib.eolian_file_parse.argtypes = [c_void_p, c_char_p]
 lib.eolian_file_parse.restype = c_void_p
 
-# EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian *state);
+# EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian_State *state);
 lib.eolian_all_eo_file_paths_get.argtypes = [c_void_p,]
 lib.eolian_all_eo_file_paths_get.restype = c_void_p
 
-# EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian *state);
+# EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian_State *state);
 lib.eolian_all_eot_file_paths_get.argtypes = [c_void_p,]
 lib.eolian_all_eot_file_paths_get.restype = c_void_p
 
-# EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian *state);
+# EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian_State *state);
 lib.eolian_all_eo_files_get.argtypes = [c_void_p,]
 lib.eolian_all_eo_files_get.restype = c_void_p
 
-# EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian *state);
+# EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian_State *state);
 lib.eolian_all_eot_files_get.argtypes = [c_void_p,]
 lib.eolian_all_eot_files_get.restype = c_void_p
 
-# EAPI Eina_Bool eolian_directory_scan(Eolian *state, const char *dir);
+# EAPI Eina_Bool eolian_directory_scan(Eolian_State *state, const char *dir);
 lib.eolian_directory_scan.argtypes = [c_void_p, c_char_p]
 lib.eolian_directory_scan.restype = c_bool
 
-# EAPI Eina_Bool eolian_system_directory_scan(Eolian *state);
+# EAPI Eina_Bool eolian_system_directory_scan(Eolian_State *state);
 lib.eolian_system_directory_scan.argtypes = [c_void_p,]
 lib.eolian_system_directory_scan.restype = c_bool
 
-# EAPI Eina_Bool eolian_all_eo_files_parse(Eolian *state);
+# EAPI Eina_Bool eolian_all_eo_files_parse(Eolian_State *state);
 lib.eolian_all_eo_files_parse.argtypes = [c_void_p,]
 lib.eolian_all_eo_files_parse.restype = c_bool
 
-# EAPI Eina_Bool eolian_all_eot_files_parse(Eolian *state);
+# EAPI Eina_Bool eolian_all_eot_files_parse(Eolian_State *state);
 lib.eolian_all_eot_files_parse.argtypes = [c_void_p,]
 lib.eolian_all_eot_files_parse.restype = c_bool
 
@@ -684,7 +684,7 @@ lib.eolian_variable_is_extern.restype = c_bool
 lib.eolian_declaration_get_by_name.argtypes = [c_void_p, c_char_p]
 lib.eolian_declaration_get_by_name.restype = c_void_p
 
-# EAPI Eina_Iterator *eolian_declarations_get_by_file(const Eolian *state, const char *fname);
+# EAPI Eina_Iterator *eolian_declarations_get_by_file(const Eolian_State *state, const char *fname);
 lib.eolian_declarations_get_by_file.argtypes = [c_void_p, c_char_p]
 lib.eolian_declarations_get_by_file.restype = c_void_p
 
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index 7c75be94da..79d7ef03b1 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -23,7 +23,7 @@ START_TEST(eolian_namespaces)
    void *dummy;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/nmsp1_class1.eo")));
@@ -90,7 +90,7 @@ START_TEST(eolian_namespaces)
    fail_if(eina_iterator_next(iter, &dummy));
    eina_iterator_free(iter);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -106,7 +106,7 @@ START_TEST(eolian_events)
    void *dummy;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/events.eo")));
@@ -166,7 +166,7 @@ START_TEST(eolian_events)
    fail_if(!eolian_class_event_get_by_name(class, "clicked,double"));
    fail_if(eolian_class_event_get_by_name(class, "clicked,triple"));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -181,7 +181,7 @@ START_TEST(eolian_override)
    const Eolian_Unit *unit;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/override.eo")));
@@ -226,7 +226,7 @@ START_TEST(eolian_override)
 
    eina_iterator_free(iter);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -238,7 +238,7 @@ START_TEST(eolian_consts)
    const Eolian_Unit *unit;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/consts.eo")));
@@ -248,7 +248,7 @@ START_TEST(eolian_consts)
    fail_if(!(fid = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)));
    fail_if(EINA_FALSE == eolian_function_object_is_const(fid));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -265,7 +265,7 @@ START_TEST(eolian_ctor_dtor)
    void *dummy;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/ctor_dtor.eo")));
@@ -318,7 +318,7 @@ START_TEST(eolian_ctor_dtor)
    fail_if(eina_iterator_next(iter, &dummy));
    eina_iterator_free(iter);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -334,7 +334,7 @@ START_TEST(eolian_typedef)
    const char *file;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/typedef.eo")));
@@ -402,7 +402,7 @@ START_TEST(eolian_typedef)
    fail_if(!eina_iterator_next(iter, (void**)&tdl));
    fail_if(eina_iterator_next(iter, (void**)&tdl));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -419,7 +419,7 @@ START_TEST(eolian_complex_type)
    void *dummy;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/complex_type.eo")));
@@ -491,7 +491,7 @@ START_TEST(eolian_complex_type)
    fail_if(strcmp(type_name, "char *"));
    eina_stringshare_del(type_name);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -503,7 +503,7 @@ START_TEST(eolian_scope)
    const Eolian_Unit *unit;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/scope.eo")));
@@ -527,7 +527,7 @@ START_TEST(eolian_scope)
    fail_if(!(fid = eolian_class_function_get_by_name(class, "foobar", EOLIAN_METHOD)));
    fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PUBLIC);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -546,7 +546,7 @@ START_TEST(eolian_simple_parsing)
    void *dummy;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/class_simple.eo")));
@@ -666,7 +666,7 @@ START_TEST(eolian_simple_parsing)
    fail_if(eolian_function_is_beta(fid));
    fail_if(!eolian_type_is_ptr(eolian_function_return_type_get(fid, EOLIAN_METHOD)));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -683,7 +683,7 @@ START_TEST(eolian_struct)
    const char *file;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -739,7 +739,7 @@ START_TEST(eolian_struct)
    fail_if(!(tdl = eolian_type_typedecl_get(type)));
    fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_STRUCT);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -751,7 +751,7 @@ START_TEST(eolian_extern)
    const Eolian_Unit *unit;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -777,7 +777,7 @@ START_TEST(eolian_extern)
    fail_if(!(tdl = eolian_typedecl_struct_get_by_name(unit, "Y")));
    fail_if(!eolian_typedecl_is_extern(tdl));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -793,7 +793,7 @@ START_TEST(eolian_var)
    const char *name;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -845,7 +845,7 @@ START_TEST(eolian_var)
    fail_if(strcmp(name, "double"));
    fail_if(eolian_variable_value_get(var));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -864,7 +864,7 @@ START_TEST(eolian_enum)
    Eolian_Value v;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -949,7 +949,7 @@ START_TEST(eolian_enum)
    fail_if(v.type != EOLIAN_EXPR_INT);
    fail_if(v.value.i != 5);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -961,7 +961,7 @@ START_TEST(eolian_class_funcs)
    const Eolian_Unit *unit;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
    fail_if(!(unit = eolian_file_parse(eos, TESTS_SRC_DIR"/data/class_funcs.eo")));
@@ -988,7 +988,7 @@ START_TEST(eolian_class_funcs)
    fail_if(eolian_function_is_class(fid));
    fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PROTECTED);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -1001,7 +1001,7 @@ START_TEST(eolian_free_func)
    const Eolian_Unit *unit;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -1037,7 +1037,7 @@ START_TEST(eolian_free_func)
    fail_if(!(type = eolian_typedecl_base_type_get(tdl)));
    fail_if(strcmp(eolian_type_free_func_get(type), "ptr_free"));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -1051,7 +1051,7 @@ START_TEST(eolian_null)
    Eina_Iterator *iter;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    /* Parsing */
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
@@ -1089,7 +1089,7 @@ START_TEST(eolian_null)
    fail_if(eina_iterator_next(iter, (void**)&param));
    eina_iterator_free(iter);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -1101,7 +1101,7 @@ START_TEST(eolian_import)
    const Eolian_Unit *unit;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
@@ -1114,7 +1114,7 @@ START_TEST(eolian_import)
    fail_if(!(tdl = eolian_typedecl_struct_get_by_name(unit, "Imported_Struct")));
    fail_if(strcmp(eolian_typedecl_file_get(tdl), "import_types.eot"));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -1129,7 +1129,7 @@ START_TEST(eolian_decl)
    Eina_Iterator *itr;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
@@ -1178,7 +1178,7 @@ START_TEST(eolian_decl)
    fail_if(!(decl = eolian_declaration_get_by_name(unit, "A")));
    fail_if(eolian_declaration_type_get(decl) != EOLIAN_DECL_STRUCT);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -1198,7 +1198,7 @@ START_TEST(eolian_docs)
    Eina_Iterator *itr;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
@@ -1424,7 +1424,7 @@ START_TEST(eolian_docs)
                   "Event docs."));
    fail_if(eolian_documentation_description_get(doc));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -1442,7 +1442,7 @@ START_TEST(eolian_function_types)
    void *dummy;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
@@ -1552,7 +1552,7 @@ START_TEST(eolian_function_types)
 
    fail_if(eina_iterator_next(iter, &dummy));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -1570,7 +1570,7 @@ START_TEST(eolian_function_as_arguments)
    void *dummy;
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
@@ -1594,7 +1594,7 @@ START_TEST(eolian_function_as_arguments)
 
    fail_if(eina_iterator_next(iter, &dummy));
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST
@@ -1612,7 +1612,7 @@ START_TEST(eolian_parts)
    };
 
    eolian_init();
-   Eolian *eos = eolian_new();
+   Eolian_State *eos = eolian_state_new();
 
    fail_if(!eolian_directory_scan(eos, TESTS_SRC_DIR"/data"));
 
@@ -1641,7 +1641,7 @@ START_TEST(eolian_parts)
      }
    eina_iterator_free(iter);
 
-   eolian_free(eos);
+   eolian_state_free(eos);
    eolian_shutdown();
 }
 END_TEST