trivial naming cleanups
fix typo
cleanup encap portion of device independent transmit