UPD: Rename identifiers