Rename some identifiers