Tidy up PR#11 to a better set of class names