Clarify
Make class name match up better.
Minor renames to simplify diffing.