Pam,
I made the changes.  I think the easiest fix may be for me to refactor the names back to their original names.  I only made 11 changes, so it should be pretty simple.  That way, we can preserver the useful changes that Mark committed after I committed my useless changes.  Any thoughts?