Minor adjustments to file naming