I regard that as a downstream effect of giving power a unit in the first place, but yes. We should have just stuck to J and J/s. It would have prevented the kWh and also abominations like the mAh “capacity” ratings you see on batteries.