Fix up r45819 per CR comments: removing calls to removed function Database::indexName()