Also fix the funcition trait name to include the vendor name. Change-Id: I8dd9b23a536c93c1a2127bef8781291a5d1d02f0