refactor payload and payload terminology to be more intuitive.