Various fixes to resolve weird naming issues

Various fixes to resolve weird naming issues around the vector API...