Add handling of duplicate index names