Fixing TOOLS-2469 - Payload Factory Mediator property name changes