Rename 'CommentItem' to 'Comment'