Email description wrong.

I recently changed my iCloud account password. I have logged in to iCloud on all my devices, and performed backups, so they all know the new password.

On my iPhone 3GS, when I go to mail, I can see a list of accounts. The iCloud account is called my.email@provider.com. The others are called Fred, Bert and Harry.

When I go into Settings > Mail, Contacts, Reminders; the accounts are named: Spikey, Fred, Bert and Harry.

If I tap Spikey > Account, the Apple ID shows my.email@provider.com, and the Description shows Spikey.

If I change Spikey to Spikeywan, tap Done and go back to Mail, Contacts, Reminders; I now see: Spikeywan, Fred, Bert and Harry.

When I open Mail again, it opens straight away in my iCloud Inbox, even though I left it at the Mailboxes view, and the Account is still called my.email@provider.com.

On my iPod Touch and iPad, changing the description works as expected, but not on my iPhone. I was going to delete the account and add it again, but got scared when it said "If you delete your account, all Photo Stream photos and documents stored in iCloud will be deleted from this iPhone."

How can I get it to display the correct name again?

It was fine before I changed my password.