Making vendor name lookup more consistent