8a90032e93
Rename some classes for clarity and move the implementations to the use sites.
Rename some classes for clarity and move the implementations to the use sites.