fixing name in messages