Rename things in tap.

Makes the wording more consistent with
tapping metaphor.