Minor class name changes, to make naming more consistent with SMACSS.