Having a distinct class just for that was a bit overkill
Rename classes to (hopefully) clearer names while we're doing that.