NXIO-308: Align marketplace name changes