Consistently add vendor to namespaces