Rename class, add time correction.
Update consumers with new class name.