Updating name generation and builder logic