fixing class namespaces to match vendor name