*8179* Email template variable renames