diff --git a/OPENAPI_VERSION b/OPENAPI_VERSION
index 1ffbdb7c1..a75e729f5 100644
--- a/OPENAPI_VERSION
+++ b/OPENAPI_VERSION
@@ -1 +1 @@
-v215
+v216
\ No newline at end of file
diff --git a/stripe/api_resources/__init__.py b/stripe/api_resources/__init__.py
index 62d96516a..681f1b67a 100644
--- a/stripe/api_resources/__init__.py
+++ b/stripe/api_resources/__init__.py
@@ -19,6 +19,7 @@
 from stripe.api_resources import radar
 from stripe.api_resources import reporting
 from stripe.api_resources import sigma
+from stripe.api_resources import tax
 from stripe.api_resources import terminal
 from stripe.api_resources import test_helpers
 from stripe.api_resources import treasury
@@ -84,11 +85,9 @@
 from stripe.api_resources.subscription import Subscription
 from stripe.api_resources.subscription_item import SubscriptionItem
 from stripe.api_resources.subscription_schedule import SubscriptionSchedule
-from stripe.api_resources.tax_calculation import TaxCalculation
 from stripe.api_resources.tax_code import TaxCode
 from stripe.api_resources.tax_id import TaxId
 from stripe.api_resources.tax_rate import TaxRate
-from stripe.api_resources.tax_transaction import TaxTransaction
 from stripe.api_resources.token import Token
 from stripe.api_resources.topup import Topup
 from stripe.api_resources.transfer import Transfer
diff --git a/stripe/api_resources/tax/__init__.py b/stripe/api_resources/tax/__init__.py
new file mode 100644
index 000000000..6d642cbe7
--- /dev/null
+++ b/stripe/api_resources/tax/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# File generated from our OpenAPI spec
+from __future__ import absolute_import, division, print_function
+
+# flake8: noqa
+
+from stripe.api_resources.tax.calculation import Calculation
+from stripe.api_resources.tax.transaction import Transaction
diff --git a/stripe/api_resources/tax_calculation.py b/stripe/api_resources/tax/calculation.py
similarity index 96%
rename from stripe/api_resources/tax_calculation.py
rename to stripe/api_resources/tax/calculation.py
index 50bd1cd13..a5f2a9241 100644
--- a/stripe/api_resources/tax_calculation.py
+++ b/stripe/api_resources/tax/calculation.py
@@ -6,7 +6,7 @@
 from stripe.api_resources.abstract import CreateableAPIResource
 
 
-class TaxCalculation(CreateableAPIResource):
+class Calculation(CreateableAPIResource):
     """
     A Tax `Calculation` allows you to calculate the tax to collect from your customer.
     """
diff --git a/stripe/api_resources/tax_transaction.py b/stripe/api_resources/tax/transaction.py
similarity index 94%
rename from stripe/api_resources/tax_transaction.py
rename to stripe/api_resources/tax/transaction.py
index 75b13eeab..4c102abfb 100644
--- a/stripe/api_resources/tax_transaction.py
+++ b/stripe/api_resources/tax/transaction.py
@@ -5,7 +5,7 @@
 from stripe.api_resources.abstract import CreateableAPIResource
 
 
-class TaxTransaction(CreateableAPIResource):
+class Transaction(CreateableAPIResource):
     """
     A Tax `Transaction` records the tax collected from or refunded to your customer.
     """
diff --git a/stripe/object_classes.py b/stripe/object_classes.py
index bc83b05a8..f4de2d0d4 100644
--- a/stripe/object_classes.py
+++ b/stripe/object_classes.py
@@ -93,11 +93,11 @@
     api_resources.Subscription.OBJECT_NAME: api_resources.Subscription,
     api_resources.SubscriptionItem.OBJECT_NAME: api_resources.SubscriptionItem,
     api_resources.SubscriptionSchedule.OBJECT_NAME: api_resources.SubscriptionSchedule,
-    api_resources.TaxCalculation.OBJECT_NAME: api_resources.TaxCalculation,
+    api_resources.tax.Calculation.OBJECT_NAME: api_resources.tax.Calculation,
+    api_resources.tax.Transaction.OBJECT_NAME: api_resources.tax.Transaction,
     api_resources.TaxCode.OBJECT_NAME: api_resources.TaxCode,
     api_resources.TaxId.OBJECT_NAME: api_resources.TaxId,
     api_resources.TaxRate.OBJECT_NAME: api_resources.TaxRate,
-    api_resources.TaxTransaction.OBJECT_NAME: api_resources.TaxTransaction,
     api_resources.terminal.Configuration.OBJECT_NAME: api_resources.terminal.Configuration,
     api_resources.terminal.ConnectionToken.OBJECT_NAME: api_resources.terminal.ConnectionToken,
     api_resources.terminal.Location.OBJECT_NAME: api_resources.terminal.Location,