Index name fix 809449

See the commit comments for details.

r?