name ref fixes in messages