Remove remaining calls to name-based storage
Update VNP version