Cleanup some class names