Ensure uniqueness on volume options across volumes

This changes the way we name volume options. We now prefix the volume
name to the option name, to ensure that the resource is uniquely
identified.