If you are getting this error because of sticky points due to replication run this:

sp_dropdistpublisher 'bad server name'

that should clear up the name mismatch on replication and allow you to change your server name as you noted in the origional post.