Fix incompatible encoding names in ContentModel (bug uncovered by 41c17bccb6f16)