Rename a few tx-related functions