Adjust vendor naming, cleaning up so it should now work as expected