diff --git a/AirshipKit/AirshipKit/UAAutomation.m b/AirshipKit/AirshipKit/UAAutomation.m
index f0179948a..c10dcb1d0 100644
--- a/AirshipKit/AirshipKit/UAAutomation.m
+++ b/AirshipKit/AirshipKit/UAAutomation.m
@@ -18,7 +18,7 @@
 #import "UAJSONPredicate.h"
 #import "UAPreferenceDataStore+Internal.h"
 
-NSUInteger const UAAutomationScheduleLimit = 1000;
+NSUInteger const UAAutomationScheduleLimit = 100;
 NSString *const UAAutomationEnabled = @"UAAutomationEnabled";
 
 @implementation UAAutomation
diff --git a/AirshipKit/AirshipKit/UAPush.h b/AirshipKit/AirshipKit/UAPush.h
index 29d818d69..260fdc1a9 100644
--- a/AirshipKit/AirshipKit/UAPush.h
+++ b/AirshipKit/AirshipKit/UAPush.h
@@ -111,19 +111,17 @@ static const UANotificationOptions UANotificationOptionNone =  0;
  * Called when the UIApplicationDelegate's application:didRegisterForRemoteNotificationsWithDeviceToken:
  * delegate method is called.
  *
- * @param application The application instance.
  * @param deviceToken The APNS device token.
  */
-- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
+- (void)apnsRegistrationSucceededWithDeviceToken:(NSData *)deviceToken;
 
 /**
  * Called when the UIApplicationDelegate's application:didFailToRegisterForRemoteNotificationsWithError:
  * delegate method is called.
  *
- * @param application The application instance.
  * @param error An NSError object that encapsulates information why registration did not succeed.
  */
-- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error;
+- (void)apnsRegistrationFailedWithError:(NSError *)error;
 
 @end
 
diff --git a/AirshipKit/AirshipKit/UAPush.m b/AirshipKit/AirshipKit/UAPush.m
index 3673f6959..eca53cfcf 100755
--- a/AirshipKit/AirshipKit/UAPush.m
+++ b/AirshipKit/AirshipKit/UAPush.m
@@ -644,8 +644,8 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio
 
     dispatch_async(dispatch_get_main_queue(), ^{
         id strongDelegate = self.registrationDelegate;
-        if ([strongDelegate respondsToSelector:@selector(application:didRegisterForRemoteNotificationsWithDeviceToken:)]) {
-            [strongDelegate application:application didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+        if ([strongDelegate respondsToSelector:@selector(apnsRegistrationSucceededWithDeviceToken:)]) {
+            [strongDelegate apnsRegistrationSucceededWithDeviceToken:deviceToken];
         }
     });
 }
@@ -657,8 +657,8 @@ - (void)application:(UIApplication *)application didRegisterForRemoteNotificatio
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
     dispatch_async(dispatch_get_main_queue(), ^{
         id strongDelegate = self.registrationDelegate;
-        if ([strongDelegate respondsToSelector:@selector(application:didRegisterForRemoteNotificationsWithDeviceToken:)]) {
-            [strongDelegate application:application didFailToRegisterForRemoteNotificationsWithError:error];
+        if ([strongDelegate respondsToSelector:@selector(apnsRegistrationFailedWithError:)]) {
+            [strongDelegate apnsRegistrationFailedWithError:error];
         }
     });
 }
diff --git a/AirshipKit/AirshipKitTests/UAPushTest.m b/AirshipKit/AirshipKitTests/UAPushTest.m
index d0f173959..639332871 100644
--- a/AirshipKit/AirshipKitTests/UAPushTest.m
+++ b/AirshipKit/AirshipKitTests/UAPushTest.m
@@ -730,7 +730,7 @@ -(void)testPushForwardsDidRegisterForRemoteNotificationsWithDeviceTokenToRegistr
     
     [[[self.mockRegistrationDelegate expect] andDo:^(NSInvocation *invocation) {
         [delegateCalled fulfill];
-    }]  application:self.mockedApplication didRegisterForRemoteNotificationsWithDeviceToken:self.validAPNSDeviceToken];
+    }]  apnsRegistrationSucceededWithDeviceToken:self.validAPNSDeviceToken];
     
     // Expect UAPush to update its registration
     [[[self.mockedChannelRegistrar expect] ignoringNonObjectArgs] registerWithChannelID:OCMOCK_ANY
@@ -760,7 +760,7 @@ -(void)testPushForwardsDidRegisterForRemoteNotificationsWithDeviceTokenToRegistr
     
     [[[self.mockRegistrationDelegate expect] andDo:^(NSInvocation *invocation) {
         [delegateCalled fulfill];
-    }]  application:self.mockedApplication didRegisterForRemoteNotificationsWithDeviceToken:self.validAPNSDeviceToken];
+    }]  apnsRegistrationSucceededWithDeviceToken:self.validAPNSDeviceToken];
     
     // Expect UAPush to not update its registration
     [[[self.mockedChannelRegistrar expect] ignoringNonObjectArgs] registerWithChannelID:OCMOCK_ANY
@@ -793,7 +793,7 @@ -(void)testPushForwardsDidFailToRegisterForRemoteNotificationsWithDeviceTokenToR
     
     [[[self.mockRegistrationDelegate expect] andDo:^(NSInvocation *invocation) {
         [delegateCalled fulfill];
-    }]  application:self.mockedApplication didFailToRegisterForRemoteNotificationsWithError:error];
+    }]  apnsRegistrationFailedWithError:error];
     
     [self.push application:self.mockedApplication didFailToRegisterForRemoteNotificationsWithError:error];