MDL-39864: Update styles to improve class naming