Use more unique index names

Change-Id: I4244a864797c21a5974e7f652378748c8856d370