Name Generator fixes