Renamed two classes to more accurately reflect their purpose.