diff --git a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.h b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.h
index 50cb604..5313842 100644
--- a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.h
@@ -138,15 +138,15 @@ typedef void (^BUYDataGiftCardBlock)(BUYGiftCard * _Nullable giftCard, NSError *
 - (BUYOperation *)completeCheckout:(BUYCheckout *)checkout paymentToken:(_Nullable id<BUYPaymentToken>)paymentToken completion:(BUYDataCheckoutBlock)block;
 
 /**
- *  Retrieve the status of a BUYCheckout. This checks the status of the current payment processing job for the provided checkout.
+ *  Retrieve the status of a checkout with token. This checks the status of the current payment processing job for the provided checkout.
  *  Once the job is complete (status == BUYStatusComplete), you can retrieve the completed order by calling `getCheckout:completion`
  *
- *  @param checkout The BUYCheckout to retrieve completion status for
- *  @param block    (^BUYDataStatusBlock)(BUYCheckout *checkout, BUYStatus status, NSError *error);
+ *  @param checkoutToken  The checkout token for which to retrieve completion status
+ *  @param block          (^BUYDataStatusBlock)(BUYCheckout *checkout, BUYStatus status, NSError *error);
  *
  *  @return The associated BUYRequestOperation
  */
-- (BUYRequestOperation *)getCompletionStatusOfCheckout:(BUYCheckout *)checkout completion:(BUYDataStatusBlock)block;
+- (BUYRequestOperation *)getCompletionStatusOfCheckoutWithToken:(NSString *)checkoutToken completion:(BUYDataStatusBlock)block;
 
 /**
  *  Retrieve the status of a checkout given a URL obtained in the UIApplicationDelegate method `application:sourceApplication:annotation`
diff --git a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m
index 1f04f3f..5d5e43d 100644
--- a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Checkout.m
@@ -98,11 +98,10 @@
 	return operation;
 }
 
-- (BUYRequestOperation *)getCompletionStatusOfCheckout:(BUYCheckout *)checkout completion:(BUYDataStatusBlock)block
+- (BUYRequestOperation *)getCompletionStatusOfCheckoutWithToken:(NSString *)checkoutToken completion:(BUYDataStatusBlock)block
 {
-	BUYAssertCheckout(checkout);
-	
-	return [self getCompletionStatusOfCheckoutToken:checkout.token start:YES completion:block];
+	BUYAssertToken(checkoutToken);
+	return [self getCompletionStatusOfCheckoutWithToken:checkoutToken start:YES completion:block];
 }
 
 - (BUYRequestOperation *)getCompletionStatusOfCheckoutURL:(NSURL *)url completion:(BUYDataStatusBlock)block
@@ -119,7 +118,7 @@
 	
 	BUYAssert(token, @"Failed to get completion status of checkout. Checkout URL must have a valid token associated with it.");
 	
-	return [self getCompletionStatusOfCheckoutToken:token start:YES completion:block];
+	return [self getCompletionStatusOfCheckoutWithToken:token start:YES completion:block];
 }
 
 #pragma mark - Checkout Helpers -
@@ -138,7 +137,7 @@
 	}];
 }
 
-- (BUYRequestOperation *)getCompletionStatusOfCheckoutToken:(NSString *)token start:(BOOL)start completion:(BUYDataStatusBlock)block
+- (BUYRequestOperation *)getCompletionStatusOfCheckoutWithToken:(NSString *)token start:(BOOL)start completion:(BUYDataStatusBlock)block
 {
 	NSURL *url = [self urlForCheckoutsProcessingWithToken:token];
 	return [self getRequestForURL:url start:start completionHandler:^(NSDictionary *json, NSHTTPURLResponse *response, NSError *error) {
diff --git a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h
index cbcedfc..8c99668 100644
--- a/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h
+++ b/Mobile Buy SDK/Mobile Buy SDK/Data/BUYClient+Internal.h
@@ -63,7 +63,7 @@ typedef void (^BUYClientRequestJSONCompletion)(NSDictionary *json, NSHTTPURLResp
 @interface BUYClient (PrivateCheckout)
 
 - (BUYRequestOperation *)beginCheckout:(BUYCheckout *)checkout paymentToken:(id<BUYPaymentToken>)paymentToken completion:(BUYDataCheckoutBlock)block;
-- (BUYRequestOperation *)getCompletionStatusOfCheckoutToken:(NSString *)token start:(BOOL)start completion:(BUYDataStatusBlock)block;
+- (BUYRequestOperation *)getCompletionStatusOfCheckoutWithToken:(NSString *)token start:(BOOL)start completion:(BUYDataStatusBlock)block;
 - (BUYRequestOperation *)getCheckout:(BUYCheckout *)checkout start:(BOOL)start completion:(BUYDataCheckoutBlock)block;
 
 @end
diff --git a/Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m b/Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m
index 3a43fef..1f60428 100644
--- a/Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Operations/BUYCheckoutOperation.m
@@ -147,7 +147,7 @@
 
 - (BUYRequestOperation *)createPollOperation
 {
-	BUYRequestOperation *operation =[self.client getCompletionStatusOfCheckoutToken:self.checkout.token start:NO completion:^(BUYStatus status, NSError *error) {
+	BUYRequestOperation *operation =[self.client getCompletionStatusOfCheckoutWithToken:self.checkout.token start:NO completion:^(BUYStatus status, NSError *error) {
 		if (status != BUYStatusComplete) {
 			[self finishWithError:error];
 		}
diff --git a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayAuthorizationDelegate.m b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayAuthorizationDelegate.m
index dff51da..a32a436 100644
--- a/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayAuthorizationDelegate.m
+++ b/Mobile Buy SDK/Mobile Buy SDK/Utils/BUYApplePayAuthorizationDelegate.m
@@ -295,7 +295,7 @@ const NSTimeInterval PollDelay = 0.5;
 		dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
 		
 		while (checkout.token && checkoutStatus != BUYStatusFailed && checkoutStatus != BUYStatusComplete) {
-			[self.client getCompletionStatusOfCheckout:self.checkout completion:^(BUYStatus status, NSError *error) {
+			[self.client getCompletionStatusOfCheckoutWithToken:self.checkout.token completion:^(BUYStatus status, NSError *error) {
 				checkoutStatus = status;
 				self.lastError = error;
 				dispatch_semaphore_signal(semaphore);