rename many variables in agent to more general terms