Use terminology for agents more consistently