Fix naming and vendor