Renames the horribly named classes.