More changes prior to some renames.
Sigh
Mass renaming checkin. History should be preserved, if I care.