diff --git a/libntfs/mst.c b/libntfs/mst.c
index d6e0f34e..c63a3fad 100644
--- a/libntfs/mst.c
+++ b/libntfs/mst.c
@@ -175,7 +175,7 @@ int ntfs_mst_pre_write_fixup(NTFS_RECORD *b, const u32 size)
  *
  * Perform the necessary post write multi sector transfer fixup, not checking
  * for any errors, because we assume we have just used
- * ntfs_pre_write_mst_fixup(), thus the data will be fine or we would never
+ * ntfs_mst_pre_write_fixup(), thus the data will be fine or we would never
  * have gotten here.
  */
 void ntfs_mst_post_write_fixup(NTFS_RECORD *b)
diff --git a/libntfs/unistr.c b/libntfs/unistr.c
index b7f0d014..848d9f9d 100644
--- a/libntfs/unistr.c
+++ b/libntfs/unistr.c
@@ -112,7 +112,7 @@ int ntfs_names_collate(const uchar_t *name1, const u32 name1_len,
 
 #ifdef DEBUG
 	if (!name1 || !name2 || (ic && !upcase && upcase_len)) {
-		Dputs("ntfs_collate_names received NULL pointer!");
+		Dputs("ntfs_names_collate received NULL pointer!");
 		exit(1);
 	}
 #endif
@@ -267,7 +267,7 @@ void ntfs_name_upcase(uchar_t *name, u32 name_len, const uchar_t *upcase,
 /**
  * ntfs_file_value_upcase
  */
-void ntfs_file_upcase_value(FILE_NAME_ATTR *file_name_attr,
+void ntfs_file_value_upcase(FILE_NAME_ATTR *file_name_attr,
 		const uchar_t *upcase, const u32 upcase_len)
 {
 	ntfs_name_upcase((uchar_t*)&file_name_attr->file_name,
@@ -277,7 +277,7 @@ void ntfs_file_upcase_value(FILE_NAME_ATTR *file_name_attr,
 /**
  * ntfs_file_values_compare
  */
-int ntfs_file_compare_values(FILE_NAME_ATTR *file_name_attr1,
+int ntfs_file_values_compare(FILE_NAME_ATTR *file_name_attr1,
 		FILE_NAME_ATTR *file_name_attr2,
 		const int err_val, const IGNORE_CASE_BOOL ic,
 		const uchar_t *upcase, const u32 upcase_len)
diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index f7fa7a14..fa8363fa 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -2100,7 +2100,7 @@ int insert_file_link_in_dir_index(INDEX_BLOCK *index, MFT_REF file_ref,
 		}
 #endif
 */
-		i = ntfs_file_compare_values(file_name,
+		i = ntfs_file_values_compare(file_name,
 				(FILE_NAME_ATTR*)&ie->key.file_name, 1,
 				IGNORE_CASE, vol->upcase, vol->upcase_len);
 		/*
@@ -2124,7 +2124,7 @@ int insert_file_link_in_dir_index(INDEX_BLOCK *index, MFT_REF file_ref,
 		if (file_name->file_name_type != FILE_NAME_POSIX ||
 		    ie->key.file_name.file_name_type != FILE_NAME_POSIX)
 			return -EEXIST;
-		i = ntfs_file_compare_values(file_name,
+		i = ntfs_file_values_compare(file_name,
 				(FILE_NAME_ATTR*)&ie->key.file_name, 1,
 				CASE_SENSITIVE, vol->upcase, vol->upcase_len);
 		if (i == -1)