Rename some Classes