Rename some classes/properties