A couple of renames (for clarity). (dm)