Replace NameSupport with PrefixNameGenerator