MDL-59987 analytics: Updated indicator names