Rename a few encode/decode functions.