Rename macros
Add new table for userphrase lifetime