Fix index names