Renamed fields in CommentData to agree with form