diff --git a/src/sce-elf.c b/src/sce-elf.c
index 41f7bee..ed96367 100755
--- a/src/sce-elf.c
+++ b/src/sce-elf.c
@@ -55,7 +55,7 @@ static int _stub_nid_search(const void *key, const void *element) {
 	return 0;
 }
 
-static void * _module_init(void *element)
+static void * _library_init(void *element)
 {
 	import_library  *library = element;
 	if (!varray_init(&library->functions_va, sizeof(vita_elf_stub_t), 8)) return NULL;
@@ -68,14 +68,14 @@ static void * _module_init(void *element)
 
 	return library;
 }
-static void _module_destroy(void *element)
+static void _library_destroy(void *element)
 {
 	import_library  *library = element;
 	varray_destroy(&library->functions_va);
 	varray_destroy(&library->variables_va);
 }
 
-static int _module_sort(const void *el1, const void *el2)
+static int _library_sort(const void *el1, const void *el2)
 {
 	const import_library  *lib1 = el1, *lib2 = el2;
 	if (lib2->nid > lib1->nid)
@@ -85,7 +85,7 @@ static int _module_sort(const void *el1, const void *el2)
 	return 0;
 }
 
-static int _module_search(const void *key, const void *element)
+static int _library_search(const void *key, const void *element)
 {
 	const uint32_t *nid = key;
 	const import_library  *library = element;
@@ -400,10 +400,10 @@ sce_module_info_t *sce_elf_module_info_create(vita_elf_t *ve, vita_export_t *exp
 	}
 	
 	ASSERT(varray_init(&liblist.va, sizeof(import_library ), 8));
-	liblist.va.init_func = _module_init;
-	liblist.va.destroy_func = _module_destroy;
-	liblist.va.sort_compar = _module_sort;
-	liblist.va.search_compar = _module_search;
+	liblist.va.init_func = _library_init;
+	liblist.va.destroy_func = _library_destroy;
+	liblist.va.sort_compar = _library_sort;
+	liblist.va.search_compar = _library_search;
 
 	for (i = 0; i < ve->num_fstubs; i++) {
 		curstub = ve->fstubs + i;
diff --git a/src/vita-export-parse.c b/src/vita-export-parse.c
index 0ef0bea..6d38fd6 100644
--- a/src/vita-export-parse.c
+++ b/src/vita-export-parse.c
@@ -525,6 +525,11 @@ int process_module_info(yaml_node *parent, yaml_node *child, vita_export_t *info
 	}
 	
 	else if (strcmp(key->value, "modules") == 0) {
+		fprintf(stderr, "warning: line: %zd, column: %zd, use of 'modules' is deprecated, 'libraries' should be used instead.\n", child->position.line, child->position.column);
+		if (yaml_iterate_mapping(child, (mapping_functor)process_export_list, info) < 0)
+			return -1;
+	}
+	else if (strcmp(key->value, "libraries") == 0) {
 		if (yaml_iterate_mapping(child, (mapping_functor)process_export_list, info) < 0)
 			return -1;
 	}