Improved file naming