Use the provided index name if one is given. Closes #1944