#452 Make CSS class names adhere to styleguide