Improved file name consistency.