Fixing class names