Unify SAPA/SAVI species