Thanks for advice, new additions and changes, see if you like them:
Thanks for all the replies. I think Wight is right, I'll change the dwarf to cover his crests with cloth and when asked, he'll give the name adopted by his family. So he will never lie, but will not be telling the whole truth...