Rename "head" and "tail" in a couple of files to more correct names.