Make indexer filenames more consistent