Clean up file naming for working files