Merge "Consistent naming for vid deployment"