Changed tap primitives to more portable and consistent names (tap_<type abbreviation>)