PR for many things.

Some class renaming, cleaning up resources, and fixing Lint errors.