Merge "Make the indexName functions more obviously laid out"