diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index f0a3fb04..0607879e 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -2149,7 +2149,7 @@ static int add_attr_vol_name(MFT_RECORD *m, const char *vol_name,
 	int i;
 
 	if (vol_name) {
-		uname_len = ntfs_mbstoucs_libntfscompat(vol_name, &uname, 0);
+		uname_len = ntfs_mbstoucs(vol_name, &uname);
 		if (uname_len < 0)
 			return -errno;
 		if (uname_len > 0xff) {
diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c
index 7c5ba3f3..dad83dd2 100644
--- a/ntfsprogs/ntfscat.c
+++ b/ntfsprogs/ntfscat.c
@@ -235,8 +235,8 @@ static int parse_options(int argc, char **argv)
 			break;
 
 		case 'n':
-			opts.attr_name_len = ntfs_mbstoucs_libntfscompat(optarg,
-							   &opts.attr_name, 0);
+			opts.attr_name_len = ntfs_mbstoucs(optarg,
+							   &opts.attr_name);
 			if (opts.attr_name_len < 0) {
 				ntfs_log_perror("Invalid attribute name '%s'",
 						optarg);
diff --git a/ntfsprogs/ntfscp.c b/ntfsprogs/ntfscp.c
index 58a6a096..8f4b3064 100644
--- a/ntfsprogs/ntfscp.c
+++ b/ntfsprogs/ntfscp.c
@@ -293,7 +293,7 @@ static ntfs_inode *ntfs_new_file(ntfs_inode *dir_ni,
 
 	/* ntfs_mbstoucs(...) will allocate memory for ufilename if it's NULL */
 	ufilename = NULL;
-	ufilename_len = ntfs_mbstoucs_libntfscompat(filename, &ufilename, 0);
+	ufilename_len = ntfs_mbstoucs(filename, &ufilename);
 	if (ufilename_len == -1) {
 		ntfs_log_perror("ERROR: Failed to convert '%s' to unicode",
 					filename);
diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c
index f6612803..57949e68 100644
--- a/ntfsprogs/ntfslabel.c
+++ b/ntfsprogs/ntfslabel.c
@@ -257,7 +257,7 @@ static int change_label(ntfs_volume *vol, unsigned long mnt_flags, char *label,
 		}
 	}
 
-	label_len = ntfs_mbstoucs_libntfscompat(label, &new_label, 0);
+	label_len = ntfs_mbstoucs(label, &new_label);
 	if (label_len == -1) {
 		ntfs_log_perror("Unable to convert label string to Unicode");
 		return 1;
diff --git a/ntfsprogs/ntfstruncate.c b/ntfsprogs/ntfstruncate.c
index 1a6e2861..26422dc6 100644
--- a/ntfsprogs/ntfstruncate.c
+++ b/ntfsprogs/ntfstruncate.c
@@ -241,7 +241,7 @@ static void parse_options(int argc, char *argv[])
 		s = argv[optind++];
 		if (optind != argc) {
 			/* Convert the string to little endian Unicode. */
-			attr_name_len = ntfs_mbstoucs_libntfscompat(s, &attr_name, 0);
+			attr_name_len = ntfs_mbstoucs(s, &attr_name);
 			if ((int)attr_name_len < 0)
 				err_exit("Invalid attribute name \"%s\": %s\n",
 						s, strerror(errno));