Switch to vendor option prefix

Switch to vendor option prefix, includes feedback from ians