WP-3669: Rename fields to show label and remove maxlength