Refactor identifier controlled vocabulary