* changed some identifiers