Revised file naming system