Updated for generic vendor name.