Refactor indicator names