Update to reflect VOSA / DSA merging to DVSA

Including DSA this time