Some class name changes, to make more consistent.