File name consistency changes