Whenever you change a custom merge tag in personalization settings it does not change them in emails. Because of that you have to open each email where you have your changed merge tags and change them manually.
It would make lives much easier if you link them so that when it is changed in settings it is automatically changed in all emails where it is used.