CRM-13161 change token names back to the familiar old ones

----------------------------------------
* CRM-13161: Greetings are  not evaluated correctly if it includes prefix / suffix
  http://issues.civicrm.org/jira/browse/CRM-13161
Merge pull request #1711 from colemanw/master

CRM-13161 change token names back to the familiar old ones