diff --git a/lib/BillingPortal/Session.php b/lib/BillingPortal/Session.php
index e765752fb..7ea30cf0d 100644
--- a/lib/BillingPortal/Session.php
+++ b/lib/BillingPortal/Session.php
@@ -3,15 +3,16 @@
 namespace Stripe\BillingPortal;
 
 /**
- * A session describes the instantiation of the self-serve portal for a particular
- * customer. By visiting the self-serve portal's URL, the customer can manage their
+ * A session describes the instantiation of the customer portal for a particular
+ * customer. By visiting the session's URL, the customer can manage their
  * subscriptions and billing details. For security reasons, sessions are
  * short-lived and will expire if the customer does not visit the URL. Create
- * Sessions on-demand.
+ * sessions on-demand when customers intend to manage their subscriptions and
+ * billing details.
  *
  * Integration guide: <a
- * href="https://stripe.com/docs/billing/subscriptions/integrating-self-serve-portal">Billing
- * self-serve portal</a>.
+ * href="https://stripe.com/docs/billing/subscriptions/integrating-customer-portal">Billing
+ * customer portal</a>.
  *
  * @property string $id Unique identifier for the object.
  * @property string $object String representing the object's type. Objects of the same type share the same value.
@@ -19,7 +20,7 @@
  * @property string $customer The ID of the customer for this session.
  * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
  * @property string $return_url The URL to which Stripe should send customers when they click on the link to return to your website.
- * @property string $url The short-lived URL of the session giving customers access to the self-serve portal.
+ * @property string $url The short-lived URL of the session giving customers access to the customer portal.
  */
 class Session extends \Stripe\ApiResource
 {
diff --git a/lib/Service/BillingPortal/SessionService.php b/lib/Service/BillingPortal/SessionService.php
index 3a60ad60a..86c34260a 100644
--- a/lib/Service/BillingPortal/SessionService.php
+++ b/lib/Service/BillingPortal/SessionService.php
@@ -5,7 +5,7 @@
 class SessionService extends \Stripe\Service\AbstractService
 {
     /**
-     * Creates a session of the self-serve portal.
+     * Creates a session of the customer portal.
      *
      * @param null|array $params
      * @param null|array|\Stripe\Util\RequestOptions $opts
diff --git a/lib/TaxId.php b/lib/TaxId.php
index eb0b437a4..fa06db8cf 100644
--- a/lib/TaxId.php
+++ b/lib/TaxId.php
@@ -16,7 +16,7 @@
  * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch.
  * @property string|\Stripe\Customer $customer ID of the customer.
  * @property bool $livemode Has the value <code>true</code> if the object exists in live mode or the value <code>false</code> if the object exists in test mode.
- * @property string $type Type of the tax ID, one of <code>ae_trn</code>, <code>au_abn</code>, <code>br_cnpj</code>, <code>br_cpf</code>, <code>ca_bn</code>, <code>ca_qst</code>, <code>ch_vat</code>, <code>cl_tin</code>, <code>es_cif</code>, <code>eu_vat</code>, <code>hk_br</code>, <code>in_gst</code>, <code>jp_cn</code>, <code>kr_brn</code>, <code>li_uid</code>, <code>mx_rfc</code>, <code>my_itn</code>, <code>my_sst</code>, <code>no_vat</code>, <code>nz_gst</code>, <code>ru_inn</code>, <code>sa_vat</code>, <code>sg_gst</code>, <code>sg_uen</code>, <code>th_vat</code>, <code>tw_vat</code>, <code>us_ein</code>, or <code>za_vat</code>. Note that some legacy tax IDs have type <code>unknown</code>
+ * @property string $type Type of the tax ID, one of <code>ae_trn</code>, <code>au_abn</code>, <code>br_cnpj</code>, <code>br_cpf</code>, <code>ca_bn</code>, <code>ca_qst</code>, <code>ch_vat</code>, <code>cl_tin</code>, <code>es_cif</code>, <code>eu_vat</code>, <code>hk_br</code>, <code>id_npwp</code>, <code>in_gst</code>, <code>jp_cn</code>, <code>kr_brn</code>, <code>li_uid</code>, <code>mx_rfc</code>, <code>my_frp</code>, <code>my_itn</code>, <code>my_sst</code>, <code>no_vat</code>, <code>nz_gst</code>, <code>ru_inn</code>, <code>sa_vat</code>, <code>sg_gst</code>, <code>sg_uen</code>, <code>th_vat</code>, <code>tw_vat</code>, <code>us_ein</code>, or <code>za_vat</code>. Note that some legacy tax IDs have type <code>unknown</code>
  * @property string $value Value of the tax ID.
  * @property \Stripe\StripeObject $verification
  */
@@ -37,11 +37,13 @@ class TaxId extends ApiResource
     const TYPE_ES_CIF = 'es_cif';
     const TYPE_EU_VAT = 'eu_vat';
     const TYPE_HK_BR = 'hk_br';
+    const TYPE_ID_NPWP = 'id_npwp';
     const TYPE_IN_GST = 'in_gst';
     const TYPE_JP_CN = 'jp_cn';
     const TYPE_KR_BRN = 'kr_brn';
     const TYPE_LI_UID = 'li_uid';
     const TYPE_MX_RFC = 'mx_rfc';
+    const TYPE_MY_FRP = 'my_frp';
     const TYPE_MY_ITN = 'my_itn';
     const TYPE_MY_SST = 'my_sst';
     const TYPE_NO_VAT = 'no_vat';