GPII-947: Renaming CSS selectors.
Incorporating Justin's solution about messages.