Improve file name consistency