Update class selectors to be more descriptive