some changes in identifiers