changed some identifiers