OPEN - issue YZABP-188: Re-work App/Library code 
https://illuminadev.co.uk/jira/browse/YZABP-188

More changes for the HealthvaultVocabulary => VocabularyInterface