diff --git a/tsk/base/tsk_base.h b/tsk/base/tsk_base.h
index 9caa4404e4586b57f877e40aa96d49fae45830b5..5a24dfbac1539e888f41db80e20d36c32778a67a 100644
--- a/tsk/base/tsk_base.h
+++ b/tsk/base/tsk_base.h
@@ -476,11 +476,11 @@ documentation and/or software.
 
 /* Flags for which type of hash(es) to run */
 	typedef enum{
-		TSK_HASH_INVALID_ID = 0,
-		TSK_HASH_MD5 = 0x01,
-		TSK_HASH_SHA1 = 0x02
-		//TSK_HASH_SHA256 = 0x04,
-	} TSK_HASH_ENUM;
+		TSK_BASE_HASH_INVALID_ID = 0,
+		TSK_BASE_HASH_MD5 = 0x01,
+		TSK_BASE_HASH_SHA1 = 0x02
+		//TSK_BASE_HASH_SHA256 = 0x04,
+	} TSK_BASE_HASH_ENUM;
 
 
 //@}
diff --git a/tsk/fs/fls_lib.c b/tsk/fs/fls_lib.c
index 48a1d51266af0e8a5049b4e1e259844e04bc4412..c7a452ca654d7f42546ea955362a4cf43a2b8973 100644
--- a/tsk/fs/fls_lib.c
+++ b/tsk/fs/fls_lib.c
@@ -50,7 +50,7 @@ static void
 printit(TSK_FS_FILE * fs_file, const char *a_path,
     const TSK_FS_ATTR * fs_attr, const FLS_DATA * fls_data)
 {
-	TSK_HASH_RESULTS hash_results;
+	TSK_FS_HASH_RESULTS hash_results;
     unsigned int i;
 
     if ((!(fls_data->flags & TSK_FS_FLS_FULL)) && (a_path)) {
@@ -69,7 +69,7 @@ printit(TSK_FS_FILE * fs_file, const char *a_path,
 
 	if(fls_data->flags & TSK_FS_FLS_MAC){
 		if(fls_data->flags & TSK_FS_FLS_HASH){
-			tsk_fs_file_hash_calc(fs_file, &hash_results, TSK_HASH_MD5);
+			tsk_fs_file_hash_calc(fs_file, &hash_results, TSK_BASE_HASH_MD5);
 			tsk_fs_name_print_mac_md5(stdout, fs_file, a_path,
 				fs_attr, fls_data->macpre, fls_data->sec_skew,
 				hash_results.md5_digest);
diff --git a/tsk/fs/fs_file.c b/tsk/fs/fs_file.c
index 74417d832a99308e7fa89162d04b827e6ea44232..45faa8f1fe35c707df5088ff2b57f4389fa4d796 100644
--- a/tsk/fs/fs_file.c
+++ b/tsk/fs/fs_file.c
@@ -569,10 +569,10 @@ tsk_fs_file_get_owner_sid(TSK_FS_FILE * a_fs_file, char **sid_str)
  * Internal struct used for hash calculations
  */
 typedef struct {
-	TSK_HASH_ENUM flags;
+	TSK_BASE_HASH_ENUM flags;
 	TSK_MD5_CTX md5_context;
 	TSK_SHA_CTX sha1_context;
-} TSK_HASH_DATA;
+} TSK_FS_HASH_DATA;
 
 /**
  * Helper function for tsk_fs_file_get_md5
@@ -582,15 +582,15 @@ tsk_fs_file_hash_calc_callback(TSK_FS_FILE * file, TSK_OFF_T offset,
     TSK_DADDR_T addr, char *buf, size_t size,
     TSK_FS_BLOCK_FLAG_ENUM a_flags, void *ptr)
 {
-    TSK_HASH_DATA * hash_data = (TSK_HASH_DATA *) ptr;
+    TSK_FS_HASH_DATA * hash_data = (TSK_FS_HASH_DATA *) ptr;
     if (hash_data == NULL)
         return TSK_WALK_CONT;
 
-	if(hash_data->flags & TSK_HASH_MD5){
+	if(hash_data->flags & TSK_BASE_HASH_MD5){
 		TSK_MD5_Update(&(hash_data->md5_context), (unsigned char *) buf, (unsigned int) size);
 	}
 
-	if(hash_data->flags & TSK_HASH_SHA1){
+	if(hash_data->flags & TSK_BASE_HASH_SHA1){
 		TSK_SHA_Update(&(hash_data->sha1_context), (unsigned char *) buf, (unsigned int) size);
 	}
 
@@ -606,8 +606,8 @@ tsk_fs_file_hash_calc_callback(TSK_FS_FILE * file, TSK_OFF_T offset,
  * @param a_flags Indicates which hash algorithm(s) to use
  * @returns 0 on success or 1 on error
  */
-extern uint8_t tsk_fs_file_hash_calc(TSK_FS_FILE * a_fs_file, TSK_HASH_RESULTS * a_hash_results, TSK_HASH_ENUM a_flags){
-	TSK_HASH_DATA hash_data;
+extern uint8_t tsk_fs_file_hash_calc(TSK_FS_FILE * a_fs_file, TSK_FS_HASH_RESULTS * a_hash_results, TSK_BASE_HASH_ENUM a_flags){
+	TSK_FS_HASH_DATA hash_data;
 	int i;
 
     if ((a_fs_file == NULL) || (a_fs_file->fs_info == NULL)
@@ -623,10 +623,10 @@ extern uint8_t tsk_fs_file_hash_calc(TSK_FS_FILE * a_fs_file, TSK_HASH_RESULTS *
         return 1;
     }
 
-	if(a_flags & TSK_HASH_MD5){
+	if(a_flags & TSK_BASE_HASH_MD5){
 		TSK_MD5_Init(&(hash_data.md5_context));
 	}
-	if(a_flags & TSK_HASH_SHA1){
+	if(a_flags & TSK_BASE_HASH_SHA1){
 		TSK_SHA_Init(&(hash_data.sha1_context));
 	}
 
@@ -639,10 +639,10 @@ extern uint8_t tsk_fs_file_hash_calc(TSK_FS_FILE * a_fs_file, TSK_HASH_RESULTS *
     }
 
 	a_hash_results->flags = a_flags;
-	if(a_flags & TSK_HASH_MD5){
+	if(a_flags & TSK_BASE_HASH_MD5){
 		TSK_MD5_Final(a_hash_results->md5_digest, &(hash_data.md5_context));
 	}
-	if(a_flags & TSK_HASH_MD5){
+	if(a_flags & TSK_BASE_HASH_MD5){
 		TSK_SHA_Final(a_hash_results->sha1_digest, &(hash_data.sha1_context));
 	}
 
diff --git a/tsk/fs/tsk_fs.h b/tsk/fs/tsk_fs.h
index 936d4ee8c3c219c465ff8172431acc4a3c7fa397..66cbb69678bf000fe1517baea3e8db14b50a7525 100644
--- a/tsk/fs/tsk_fs.h
+++ b/tsk/fs/tsk_fs.h
@@ -723,12 +723,12 @@ extern "C" {
     extern uint8_t tsk_fs_file_get_owner_sid(TSK_FS_FILE *, char **);
 
 	typedef struct {
-		TSK_HASH_ENUM flags;
+		TSK_BASE_HASH_ENUM flags;
 		unsigned char md5_digest[16];
 		unsigned char sha1_digest[20];
-	} TSK_HASH_RESULTS;
+	} TSK_FS_HASH_RESULTS;
 
-	extern uint8_t tsk_fs_file_hash_calc(TSK_FS_FILE *, TSK_HASH_RESULTS *, TSK_HASH_ENUM);
+	extern uint8_t tsk_fs_file_hash_calc(TSK_FS_FILE *, TSK_FS_HASH_RESULTS *, TSK_BASE_HASH_ENUM);
 
     //@}