Rename classes and update class handling