Use more intuitive names

Update format for math math index

Change-Id: Id460b1d80c916f06c5286dfb8e57ec9580a15161