Source uglification, part III.

Rename a few more things.  Because, you know, namespaces are overrated.