Did some renaming to make the name more appropriate for what the class does.