diff --git a/include/pemagine/pe_structs.h b/include/pemagine/pe_structs.h
index 64508e6..430c967 100644
--- a/include/pemagine/pe_structs.h
+++ b/include/pemagine/pe_structs.h
@@ -98,7 +98,7 @@ struct pe_raw_opt_hdr_dirs {
 	unsigned char	reserved			[0x08];
 };
 
-struct pe_data_dirs {
+struct pe_raw_data_dirs {
 	unsigned char	rva_and_sizes			[0x04];
 	unsigned char	export_tbl			[0x08];
 	unsigned char	import_tbl			[0x08];
diff --git a/include/pemagine/pemagine.h b/include/pemagine/pemagine.h
index 47eb96a..7d0ee93 100644
--- a/include/pemagine/pemagine.h
+++ b/include/pemagine/pemagine.h
@@ -155,7 +155,7 @@ typedef int pe_enum_image_import_hdrs_callback(
 pe_api struct pe_raw_image_dos_hdr *	pe_get_image_dos_hdr_addr	(const void * base);
 pe_api struct pe_raw_coff_file_hdr *	pe_get_image_coff_hdr_addr	(const void * base);
 pe_api union  pe_raw_opt_hdr *		pe_get_image_opt_hdr_addr	(const void * base);
-pe_api struct pe_data_dirs *		pe_get_image_data_dirs_addr	(const void * base);
+pe_api struct pe_raw_data_dirs *	pe_get_image_data_dirs_addr	(const void * base);
 pe_api struct pe_sec_hdr *		pe_get_image_section_tbl_addr	(const void * base);
 pe_api struct pe_sec_hdr *		pe_get_image_named_section_addr	(const void * base, const char * name);
 pe_api struct pe_export_hdr *		pe_get_image_export_hdr_addr	(const void * base, uint32_t * sec_size);
diff --git a/src/headers/pe_get_image_data_dirs_addr.c b/src/headers/pe_get_image_data_dirs_addr.c
index 1edbdd3..54bf6f3 100644
--- a/src/headers/pe_get_image_data_dirs_addr.c
+++ b/src/headers/pe_get_image_data_dirs_addr.c
@@ -10,7 +10,7 @@
 #include <pemagine/pemagine.h>
 
 pe_api
-struct pe_data_dirs * pe_get_image_data_dirs_addr(const void * base)
+struct pe_raw_data_dirs * pe_get_image_data_dirs_addr(const void * base)
 {
 	uint16_t *		magic;
 	union pe_raw_opt_hdr *	hdr;
@@ -22,10 +22,10 @@ struct pe_data_dirs * pe_get_image_data_dirs_addr(const void * base)
 
 	switch (*magic) {
 		case PE_MAGIC_PE32:
-			return (struct pe_data_dirs *)hdr->opt_hdr_32.rva_and_sizes;
+			return (struct pe_raw_data_dirs *)hdr->opt_hdr_32.rva_and_sizes;
 
 		case PE_MAGIC_PE32_PLUS:
-			return (struct pe_data_dirs *)hdr->opt_hdr_64.rva_and_sizes;
+			return (struct pe_raw_data_dirs *)hdr->opt_hdr_64.rva_and_sizes;
 
 		default:
 			return 0;
diff --git a/src/headers/pe_get_image_special_hdr_addr.c b/src/headers/pe_get_image_special_hdr_addr.c
index 276ec9f..9788099 100644
--- a/src/headers/pe_get_image_special_hdr_addr.c
+++ b/src/headers/pe_get_image_special_hdr_addr.c
@@ -13,7 +13,7 @@
 pe_api
 void * pe_get_image_special_hdr_addr(const void * base, uint32_t ordinal, uint32_t * sec_size)
 {
-	struct pe_data_dirs *	dirs;
+	struct pe_raw_data_dirs*dirs;
 	struct pe_block *	dir;
 	uint32_t *		count;