Name mentioning fixes