Add rename refactor support