Fixes index names