Merge "Rename comment-related classes to reduce confusion"