case 2952 - Rename vocabularies.
Merge branch 'case-2952' into develop

* case-2952:
  case 2952 - Rename vocabularies.