Do we agree making this distinction is the right thing to do? /cc @elsigh