Consistently use underscores in file names