Changed to patternProperties for vessel names

Changed to patternProperties for vessel names
Merged in remote branch