Continued renaming CommentData