better FW names in MP worfklow