Fixing after change in NameGenerator.