Tidy up class names