change terminology to be more inclusive