Make file names consistent