Google has provided instructions on how to convert a <user>@googlemail.com account to a <user>@gmail.com. Please go to http://mail.google.com/support and search for "switch googlemail.com to gmail.com".