fixing class names to work it out