Cleaned NameGenerator interface