diff --git a/include/pemagine/pe_structs.h b/include/pemagine/pe_structs.h
index a1886b9..f3e1b14 100644
--- a/include/pemagine/pe_structs.h
+++ b/include/pemagine/pe_structs.h
@@ -243,7 +243,7 @@ struct pe_raw_sec_hdr {
 };
 
 
-struct pe_export_hdr {
+struct pe_raw_export_hdr {
 	unsigned char	export_flags			[0x04];		/* 0x00 */
 	unsigned char	time_date_stamp			[0x04];		/* 0x04 */
 	unsigned char	major_ver			[0x02];		/* 0x08 */
diff --git a/include/pemagine/pemagine.h b/include/pemagine/pemagine.h
index f427bdb..dee22e5 100644
--- a/include/pemagine/pemagine.h
+++ b/include/pemagine/pemagine.h
@@ -140,7 +140,7 @@ typedef int pe_enum_modules_callback(
 
 typedef int pe_enum_image_exports_callback(
 	const void *			base,
-	struct pe_export_hdr *		exp_hdr,
+	struct pe_raw_export_hdr *	exp_hdr,
 	struct pe_export_sym  *		sym,
 	enum pe_callback_reason		reason,
 	void *				context);
@@ -158,7 +158,7 @@ pe_api union  pe_raw_opt_hdr *		pe_get_image_opt_hdr_addr	(const void * base);
 pe_api struct pe_raw_data_dirs *	pe_get_image_data_dirs_addr	(const void * base);
 pe_api struct pe_raw_sec_hdr *		pe_get_image_section_tbl_addr	(const void * base);
 pe_api struct pe_raw_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);
+pe_api struct pe_raw_export_hdr *	pe_get_image_export_hdr_addr	(const void * base, uint32_t * sec_size);
 pe_api struct pe_import_hdr *		pe_get_image_import_dir_addr	(const void * base, uint32_t * sec_size);
 pe_api void *				pe_get_image_special_hdr_addr	(const void * base, uint32_t ordinal, uint32_t * sec_size);
 pe_api void *				pe_get_image_entry_point_addr	(const void * base);
diff --git a/src/exports/pe_enum_image_exports.c b/src/exports/pe_enum_image_exports.c
index 85e92cf..e097802 100644
--- a/src/exports/pe_enum_image_exports.c
+++ b/src/exports/pe_enum_image_exports.c
@@ -16,7 +16,7 @@ int pe_enum_image_exports(
 	struct pe_export_sym  *			sym,
 	void *					ctx)
 {
-	struct pe_export_hdr *	exp_hdr;
+	struct pe_raw_export_hdr*exp_hdr;
 	uint32_t *		count;
 	uint32_t *		fn_addr;
 	uint32_t *		fn_names;
diff --git a/src/exports/pe_get_export_symbol_info.c b/src/exports/pe_get_export_symbol_info.c
index 2f0016c..831b7e5 100644
--- a/src/exports/pe_get_export_symbol_info.c
+++ b/src/exports/pe_get_export_symbol_info.c
@@ -21,7 +21,7 @@ int pe_get_export_symbol_info(
 	const char *		name,
 	struct pe_export_sym *	sym)
 {
-	struct pe_export_hdr *	exp_hdr;
+	struct pe_raw_export_hdr*exp_hdr;
 
 	ssize_t		len;
 	uint32_t *	rva_offset;
diff --git a/src/headers/pe_get_image_special_hdr_addr.c b/src/headers/pe_get_image_special_hdr_addr.c
index 9788099..dc1e6b0 100644
--- a/src/headers/pe_get_image_special_hdr_addr.c
+++ b/src/headers/pe_get_image_special_hdr_addr.c
@@ -37,9 +37,9 @@ void * pe_get_image_special_hdr_addr(const void * base, uint32_t ordinal, uint32
 }
 
 pe_api
-struct pe_export_hdr * pe_get_image_export_hdr_addr(const void * base, uint32_t * sec_size)
+struct pe_raw_export_hdr * pe_get_image_export_hdr_addr(const void * base, uint32_t * sec_size)
 {
-	return (struct pe_export_hdr *)pe_get_image_special_hdr_addr(base,PE_IMAGE_DATA_DIR_ORDINAL_EXPORT,sec_size);
+	return (struct pe_raw_export_hdr *)pe_get_image_special_hdr_addr(base,PE_IMAGE_DATA_DIR_ORDINAL_EXPORT,sec_size);
 }
 
 pe_api
diff --git a/src/meta/pe_get_symbol_name.c b/src/meta/pe_get_symbol_name.c
index cff27a9..9b4d11d 100644
--- a/src/meta/pe_get_symbol_name.c
+++ b/src/meta/pe_get_symbol_name.c
@@ -16,7 +16,7 @@ struct pe_symbol_name_ctx {
 /* private forward declarations */
 static int pe_enum_exports_callback(
 	const void *			base,
-	struct pe_export_hdr *		exp_hdr,
+	struct pe_raw_export_hdr *	exp_hdr,
 	struct pe_export_sym *		sym,
 	enum pe_callback_reason		reason,
 	void *				context);
@@ -70,7 +70,7 @@ char * pe_get_import_symbol_info(
 
 static int pe_enum_exports_callback(
 	const void *			base,
-	struct pe_export_hdr *		exp_hdr,
+	struct pe_raw_export_hdr *	exp_hdr,
 	struct pe_export_sym  *		sym,
 	enum pe_callback_reason		reason,
 	void *				context)