Small change to some class names