Rename unfortunate identifiers