diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 56044313..b51a6189 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -60,7 +60,7 @@ struct codepage_desc {
 
  	/* If some byte in the codepage corresponds to multiple Unicode
  	 * characters, then the preferred character is in @highhalf
- 	 * above, and the rest are listed here in @extra.  This table
+ 	 * above, and the rest are listed here in @table.  This table
  	 * is not used for translating from the codepage to Unicode.  */
 	const struct table_entry *table;
 };
diff --git a/src/intl/charsets.h b/src/intl/charsets.h
index 7f95e3e8..e6dbe707 100644
--- a/src/intl/charsets.h
+++ b/src/intl/charsets.h
@@ -41,9 +41,9 @@ struct conv_table {
 		/* If @t==0: a null-terminated string that is the
 		 * corresponding character in the target charset.
 		 * Normally, the string is statically allocated.
-		 * However, if the translation table is to UTF-8,
-		 * then the strings in elements 0x80 to 0xFF are
-		 * allocated with mem_alloc.  */
+		 * However, if the conversion table is to UTF-8, then
+		 * the strings in elements 0x80 to 0xFF are allocated
+		 * with @mem_alloc and owned by the table.  */
 		const unsigned char *str;
 		/* If @t==1: a pointer to a nested conversion table
 		 * (with 256 elements) that describes how to convert