update references to new payload/context ones, to avoid client world ref

update references to new payload/context ones, to avoid client world ref #20