Fix borked class names