Handle index names consistently.