Change namespace to use vendorname
Cleanup