Fix to capture+promotion generation, name changes.