Rename some more classes and methods