Improve consitency in file names