Use correct indicator names rather than descriptions