Yes we definitely should kick off class renaming soon.

But at the same time, I'd rather separate the introduction of a functionality from class renaming/refactoring.
If we roll the functionality back, we'll have lost work/time for this task only. Does it make sense?