Refactor icon names.