I think git’s naming is actually pretty reasonable: smudge (on checkout) & clean (on stage).