Rename DEFAULT to BUILDER for DefaultAddressBuilder/LenientAddressBuilder