minor vocab updates, and naming

git-svn-id: http://gforge.hl7.org/svn/fhir/trunk/build@3538 2f0db536-2c49-4257-a3fa-e771ed206c19