Some of these are leftovers from renaming the files, others
are just typos.

Also introduce an ugly awk script to enforce this.