Refactor controller/directive labeling