More class renaming, and a little more docs.