Updated indicator varnames to reflect new indicators