Rename some classes