diff --git a/Stripe/PublicHeaders/STPAddress.h b/Stripe/PublicHeaders/STPAddress.h
index 9877575ded..2bca39dc3c 100644
--- a/Stripe/PublicHeaders/STPAddress.h
+++ b/Stripe/PublicHeaders/STPAddress.h
@@ -93,7 +93,7 @@ typedef NS_ENUM(NSUInteger, STPBillingAddressFields) {
 #pragma clang diagnostic pop
 
 - (BOOL)containsRequiredFields:(STPBillingAddressFields)requiredFields;
-- (BOOL)containsRequiredPKFields:(PKAddressField)requiredFields;
+- (BOOL)containsRequiredShippingAddressFields:(PKAddressField)requiredFields;
 
 + (PKAddressField)applePayAddressFieldsFromBillingAddressFields:(STPBillingAddressFields)billingAddressFields; FAUXPAS_IGNORED_ON_LINE(APIAvailability);
 
diff --git a/Stripe/PublicHeaders/STPBlocks.h b/Stripe/PublicHeaders/STPBlocks.h
index 6b54c9d97a..905ae8dad8 100644
--- a/Stripe/PublicHeaders/STPBlocks.h
+++ b/Stripe/PublicHeaders/STPBlocks.h
@@ -11,6 +11,21 @@
 
 @class STPToken;
 
+/**
+ *  These values control the labels used in the shipping info collection form.
+ */
+typedef NS_ENUM(NSUInteger, STPShippingType) {
+    /**
+     *  Shipping the purchase to the provided address using a third-party
+     *  shipping company.
+     */
+    STPShippingTypeShipping,
+    /**
+     *  Delivering the purchase by the seller.
+     */
+    STPShippingTypeDelivery,
+};
+
 /**
  *  An enum representing the status of a payment requested from the user.
  */
diff --git a/Stripe/PublicHeaders/STPPaymentConfiguration.h b/Stripe/PublicHeaders/STPPaymentConfiguration.h
index e6c638ce8e..ddcf3f32a2 100644
--- a/Stripe/PublicHeaders/STPPaymentConfiguration.h
+++ b/Stripe/PublicHeaders/STPPaymentConfiguration.h
@@ -11,24 +11,8 @@
 #import "STPPaymentMethod.h"
 #import "STPTheme.h"
 
-/**
- *  These values control the labels used in the shipping info collection form.
- */
-typedef NS_ENUM(NSUInteger, STPShippingType) {
-    /**
-     *  Shipping the purchase to the provided address using a third-party
-     *  shipping company.
-     */
-    STPShippingTypeShipping,
-    /**
-     *  Delivering the purchase by the seller.
-     */
-    STPShippingTypeDelivery,
-};
-
 NS_ASSUME_NONNULL_BEGIN
 
-
 /**
  An `STPPaymentConfiguration` represents all the options you can set or change
  around a payment. 
diff --git a/Stripe/STPAddress.m b/Stripe/STPAddress.m
index 90fc8251b8..4c1e84f16a 100644
--- a/Stripe/STPAddress.m
+++ b/Stripe/STPAddress.m
@@ -84,7 +84,7 @@
     return containsFields;
 }
 
-- (BOOL)containsRequiredPKFields:(PKAddressField)requiredFields {
+- (BOOL)containsRequiredShippingAddressFields:(PKAddressField)requiredFields {
     BOOL containsFields = YES;
     if (requiredFields & PKAddressFieldName) {
         containsFields = containsFields && [self.name length] > 0;
diff --git a/Stripe/STPAddressViewModel.m b/Stripe/STPAddressViewModel.m
index f28069fe93..0c68f520df 100644
--- a/Stripe/STPAddressViewModel.m
+++ b/Stripe/STPAddressViewModel.m
@@ -184,7 +184,7 @@
         return [self.address containsRequiredFields:self.requiredBillingAddressFields];
     }
     else {
-        return [self.address containsRequiredPKFields:self.requiredShippingAddressFields];
+        return [self.address containsRequiredShippingAddressFields:self.requiredShippingAddressFields];
     }
 }
 
diff --git a/Tests/Tests/STPAddressTests.m b/Tests/Tests/STPAddressTests.m
index 9c09c55e76..2727289c91 100644
--- a/Tests/Tests/STPAddressTests.m
+++ b/Tests/Tests/STPAddressTests.m
@@ -137,29 +137,29 @@
     XCTAssertTrue([address containsRequiredFields:STPBillingAddressFieldsFull]);
 }
 
-- (void)testContainsRequiredPKFields {
+- (void)testContainsRequiredShippingAddressFields {
     STPAddress *address = [STPAddress new];
-    XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldNone]);
-    XCTAssertFalse([address containsRequiredPKFields:PKAddressFieldAll]);
+    XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldNone]);
+    XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
 
     address.name = @"John Smith";
-    XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldName]);
-    XCTAssertFalse([address containsRequiredPKFields:PKAddressFieldEmail]);
+    XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldName]);
+    XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldEmail]);
 
     address.email = @"john@example.com";
-    XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldEmail|PKAddressFieldName]);
-    XCTAssertFalse([address containsRequiredPKFields:PKAddressFieldAll]);
+    XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldEmail|PKAddressFieldName]);
+    XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
 
     address.phone = @"5555555555";
-    XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldEmail|PKAddressFieldName|PKAddressFieldPhone]);
-    XCTAssertFalse([address containsRequiredPKFields:PKAddressFieldAll]);
+    XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldEmail|PKAddressFieldName|PKAddressFieldPhone]);
+    XCTAssertFalse([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
 
     address.country = @"US";
     address.line1 = @"55 John St";
     address.city = @"New York";
     address.state = @"NY";
     address.postalCode = @"12345";
-    XCTAssertTrue([address containsRequiredPKFields:PKAddressFieldAll]);
+    XCTAssertTrue([address containsRequiredShippingAddressFields:PKAddressFieldAll]);
 }
 
 @end