Fix Builder for custom type name