diff --git a/WordPressKit/BlogServiceRemoteREST.m b/WordPressKit/BlogServiceRemoteREST.m
index 5fcf08e1..ec47ca49 100644
--- a/WordPressKit/BlogServiceRemoteREST.m
+++ b/WordPressKit/BlogServiceRemoteREST.m
@@ -106,7 +106,7 @@ - (void)getAllAuthorsWithRemoteUsers:(NSMutableArray <RemoteUser *>*)remoteUsers
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:parameters
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                               if (success) {
@@ -138,7 +138,7 @@ - (void)syncPostTypesWithSuccess:(PostTypesHandler)success
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     NSDictionary *parameters = @{@"context": @"edit"};
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
        parameters:parameters
           success:^(NSDictionary *responseObject, NSHTTPURLResponse *httpResponse) {
              
@@ -168,7 +168,7 @@ - (void)syncPostFormatsWithSuccess:(PostFormatsHandler)success
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
        parameters:nil
           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
               NSDictionary *formats = [self mapPostFormatsFromResponse:responseObject[@"formats"]];
@@ -189,7 +189,7 @@ - (void)syncBlogWithSuccess:(BlogDetailsHandler)success
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:nil
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                               NSDictionary *responseDict = (NSDictionary *)responseObject;
@@ -210,7 +210,7 @@ - (void)syncBlogSettingsWithSuccess:(SettingsHandler)success
     NSString *path = [self pathForSettings];
     NSString *requestUrl = [self pathForEndpoint:path withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
        parameters:nil
           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
               if (![responseObject isKindOfClass:[NSDictionary class]]){
@@ -240,7 +240,7 @@ - (void)updateBlogSettings:(RemoteBlogSettings *)settings
     NSString *path = [NSString stringWithFormat:@"sites/%@/settings?context=edit", self.siteID];
     NSString *requestUrl = [self pathForEndpoint:path withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
         parameters:parameters
            success:^(NSDictionary *responseDict, NSHTTPURLResponse *httpResponse) {
                if (![responseDict isKindOfClass:[NSDictionary class]]) {
@@ -272,7 +272,7 @@ - (void)fetchSiteInfoForAddress:(NSString *)siteAddress
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:nil
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                               if (success) {
@@ -293,7 +293,7 @@ - (void)fetchUnauthenticatedSiteInfoForAddress:(NSString *)siteAddress
     NSString *path = [self pathForEndpoint:@"connect/site-info" withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     NSURL *siteURL = [NSURL URLWithString:siteAddress];
 
-    [self.wordPressComRestApi GET:path
+    [self.wordPressComRESTAPI get:path
                        parameters:@{ @"url": siteURL.absoluteString }
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                               if (success) {
diff --git a/WordPressKit/CommentServiceRemoteREST.m b/WordPressKit/CommentServiceRemoteREST.m
index 6a34e1ba..68cfdd38 100644
--- a/WordPressKit/CommentServiceRemoteREST.m
+++ b/WordPressKit/CommentServiceRemoteREST.m
@@ -41,7 +41,7 @@ - (void)getCommentsWithMaximumCount:(NSInteger)maximumComments
     [parameters removeObjectForKey:@"status"];
     parameters[@"status"] = [self parameterForCommentStatus:statusFilter];
 
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:parameters
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                               if (success) {
@@ -84,7 +84,7 @@ - (void)getCommentWithID:(NSNumber *)commentID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:nil
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         RemoteComment *comment = [self remoteCommentFromJSONDictionary:responseObject];
@@ -116,7 +116,7 @@ - (void)createComment:(RemoteComment *)comment
                                  @"content": comment.content,
                                  @"context": @"edit",
                                  };
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                // TODO: validate response
@@ -147,7 +147,7 @@ - (void)updateComment:(RemoteComment *)comment
         @"context": @"edit",
     };
 
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                // TODO: validate response
@@ -174,7 +174,7 @@ - (void)moderateComment:(RemoteComment *)comment
                                  @"status": [self remoteStatusWithStatus:comment.status],
                                  @"context": @"edit",
                                  };
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                // TODO: validate response
@@ -197,7 +197,7 @@ - (void)trashComment:(RemoteComment *)comment
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:nil
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                if (success) {
@@ -226,7 +226,7 @@ - (void)syncHierarchicalCommentsForPost:(NSNumber *)postID
     NSDictionary *parameters = @{
         @"force": @"wpcom" // Force fetching data from shadow site on Jetpack sites
     };
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:parameters
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (success) {
@@ -258,7 +258,7 @@ - (void)updateCommentWithID:(NSNumber *)commentID
         @"content": content,
         @"context": @"edit",
     };
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                if (success) {
@@ -282,7 +282,7 @@ - (void)replyToPostWithID:(NSNumber *)postID
     
     NSDictionary *parameters = @{@"content": content};
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
         parameters:parameters
            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                if (success) {
@@ -310,7 +310,7 @@ - (void)replyToCommentWithID:(NSNumber *)commentID
         @"content": content,
         @"context": @"edit",
     };
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                if (success) {
@@ -339,7 +339,7 @@ - (void)moderateCommentWithID:(NSNumber *)commentID
         @"context"  : @"edit",
     };
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                if (success) {
@@ -360,7 +360,7 @@ - (void)trashCommentWithID:(NSNumber *)commentID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:nil
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                if (success) {
@@ -381,7 +381,7 @@ - (void)likeCommentWithID:(NSNumber *)commentID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:nil
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                if (success) {
@@ -402,7 +402,7 @@ - (void)unlikeCommentWithID:(NSNumber *)commentID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:nil
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                if (success) {
@@ -444,7 +444,7 @@ - (void)getLikesForCommentID:(NSNumber *)commentID
         parameters[@"exclude"] = excludeUserIDs;
     }
 
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:parameters
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (success) {
diff --git a/WordPressKit/MediaServiceRemoteREST.m b/WordPressKit/MediaServiceRemoteREST.m
index c8509e79..4652c811 100644
--- a/WordPressKit/MediaServiceRemoteREST.m
+++ b/WordPressKit/MediaServiceRemoteREST.m
@@ -18,7 +18,7 @@ - (void)getMediaWithID:(NSNumber *)mediaID
     
     NSDictionary * parameters = @{};
     
-    [self.wordPressComRestApi GET:requestUrl parameters:parameters success:^(id responseObject, NSHTTPURLResponse *response) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:parameters success:^(id responseObject, NSHTTPURLResponse *response) {
         if (success) {
             NSDictionary *response = (NSDictionary *)responseObject;
             success([MediaServiceRemoteREST remoteMediaFromJSONDictionary:response]);
@@ -60,7 +60,7 @@ - (void)getMediaLibraryPage:(NSString *)pageHandle
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
        parameters:[NSDictionary dictionaryWithDictionary:parameters]
           success:^(id responseObject, NSHTTPURLResponse *response) {
               NSArray *mediaItems = responseObject[@"media"];
@@ -104,7 +104,7 @@ - (void)getMediaLibraryCountForType:(NSString *)mediaType
         parameters[@"mime_type"] = mediaType;
     }
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
        parameters:[NSDictionary dictionaryWithDictionary:parameters]
           success:^(id responseObject, NSHTTPURLResponse *response) {
               NSDictionary *jsonDictionary = (NSDictionary *)responseObject;
@@ -261,7 +261,7 @@ - (void)updateMedia:(RemoteMedia *)media
 
     NSDictionary *parameters = [self parametersFromRemoteMedia:media];
 
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
         parameters:parameters
            success:^(id responseObject, NSHTTPURLResponse *response) {
                RemoteMedia *media = [MediaServiceRemoteREST remoteMediaFromJSONDictionary:responseObject];
@@ -285,7 +285,7 @@ - (void)deleteMedia:(RemoteMedia *)media
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:nil
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                NSDictionary *response = (NSDictionary *)responseObject;
@@ -318,7 +318,7 @@ -(void)getMetadataFromVideoPressID:(NSString *)videoPressID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:nil
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         NSDictionary *response = (NSDictionary *)responseObject;
@@ -358,7 +358,7 @@ -(void)getVideoPressToken:(NSString *)videoPressID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_2_0];
 
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:nil
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                NSDictionary *response = (NSDictionary *)responseObject;
diff --git a/WordPressKit/MenusServiceRemote.m b/WordPressKit/MenusServiceRemote.m
index 0c224506..119651a7 100644
--- a/WordPressKit/MenusServiceRemote.m
+++ b/WordPressKit/MenusServiceRemote.m
@@ -39,7 +39,7 @@ - (void)createMenuWithName:(NSString *)menuName
     NSString *requestURL = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestURL
+    [self.wordPressComRESTAPI post:requestURL
         parameters:@{MenusRemoteKeyName: menuName}
            success:^(id  _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
                void(^responseFailure)(void) = ^() {
@@ -94,7 +94,7 @@ - (void)updateMenuForID:(NSNumber *)menuID
     // Brent Coursey - 10/1/2015
     [params setObject:menuID forKey:MenusRemoteKeyID];
     
-    [self.wordPressComRestApi POST:requestURL
+    [self.wordPressComRESTAPI post:requestURL
         parameters:params
            success:^(id  _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
                void(^responseFailure)(void) = ^() {
@@ -131,7 +131,7 @@ - (void)deleteMenuForID:(NSNumber *)menuID
     NSString *path = [NSString stringWithFormat:@"sites/%@/menus/%@/delete", siteID, menuID];
     NSString *requestURL = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
-    [self.wordPressComRestApi POST:requestURL
+    [self.wordPressComRESTAPI post:requestURL
         parameters:nil
            success:^(id  _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
                void(^responseFailure)(void) = ^() {
@@ -169,7 +169,7 @@ - (void)getMenusForSiteID:(NSNumber *)siteID
     NSString *requestURL = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestURL
+    [self.wordPressComRESTAPI get:requestURL
        parameters:nil
           success:^(id  _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
               if (![responseObject isKindOfClass:[NSDictionary class]]) {
diff --git a/WordPressKit/PostServiceRemoteREST.m b/WordPressKit/PostServiceRemoteREST.m
index 6476c343..c072091f 100644
--- a/WordPressKit/PostServiceRemoteREST.m
+++ b/WordPressKit/PostServiceRemoteREST.m
@@ -41,7 +41,7 @@ - (void)getPostWithID:(NSNumber *)postID
     
     NSDictionary *parameters = @{ @"context": @"edit" };
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
        parameters:parameters
           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
               if (success) {
@@ -83,7 +83,7 @@ - (void)getPostsOfType:(NSString *)postType
         [mutableParameters addEntriesFromDictionary:options];
         parameters = [NSDictionary dictionaryWithDictionary:mutableParameters];
     }
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
        parameters:parameters
           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
               if (success) {
@@ -106,7 +106,7 @@ -(void)getAutoSaveForPost:(RemotePost *)post
     
     NSDictionary *parameters = [self parametersWithRemotePost:post];
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:parameters
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                               RemotePost *post = [self remotePostFromJSONDictionary:responseObject];
@@ -132,7 +132,7 @@ - (void)createPost:(RemotePost *)post
     
     NSDictionary *parameters = [self parametersWithRemotePost:post];
 
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
         parameters:parameters
            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                RemotePost *post = [self remotePostFromJSONDictionary:responseObject];
@@ -196,7 +196,7 @@ - (void)updatePost:(RemotePost *)post
     
     NSDictionary *parameters = [self parametersWithRemotePost:post];
 
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
         parameters:parameters
            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                RemotePost *post = [self remotePostFromJSONDictionary:responseObject];
@@ -222,7 +222,7 @@ - (void)autoSave:(RemotePost *)post
     
     NSDictionary *parameters = [self parametersWithRemotePost:post];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                                RemotePost *post = [self remotePostFromJSONDictionary:responseObject];
@@ -247,7 +247,7 @@ - (void)deletePost:(RemotePost *)post
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
         parameters:nil
            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                if (success) {
@@ -271,7 +271,7 @@ - (void)trashPost:(RemotePost *)post
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
         parameters:nil
            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                RemotePost *post = [self remotePostFromJSONDictionary:responseObject];
@@ -297,7 +297,7 @@ - (void)restorePost:(RemotePost *)post
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
         parameters:nil
            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                RemotePost *post = [self remotePostFromJSONDictionary:responseObject];
@@ -340,7 +340,7 @@ - (void)getLikesForPostID:(NSNumber *)postID
         parameters[@"exclude"] = excludeUserIDs;
     }
 
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:parameters
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (success) {
diff --git a/WordPressKit/ReaderPostServiceRemote.m b/WordPressKit/ReaderPostServiceRemote.m
index 59c1981e..68545f04 100644
--- a/WordPressKit/ReaderPostServiceRemote.m
+++ b/WordPressKit/ReaderPostServiceRemote.m
@@ -72,7 +72,7 @@ - (void)fetchPost:(NSUInteger)postID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
            parameters:nil
               success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                   if (!success) {
@@ -113,7 +113,7 @@ - (void)fetchPostAtURL:(NSURL *)postURL
         return;
     }
 
-    [self.wordPressComRestApi GET:path
+    [self.wordPressComRESTAPI get:path
                        parameters:nil
                           success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                               if (!success) {
@@ -144,7 +144,7 @@ - (void)likePost:(NSUInteger)postID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (success) {
             success();
         }
@@ -164,7 +164,7 @@ - (void)unlikePost:(NSUInteger)postID
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (success) {
             success();
         }
@@ -181,7 +181,7 @@ - (NSString *)endpointUrlForSearchPhrase:(NSString *)phrase
 
     NSString *endpoint = [NSString stringWithFormat:@"read/search?q=%@", [phrase stringByUrlEncoding]];
     NSString *absolutePath = [self pathForEndpoint:endpoint withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
-    NSURL *url = [NSURL URLWithString:absolutePath relativeToURL:self.wordPressComRestApi.baseURL];
+    NSURL *url = [NSURL URLWithString:absolutePath relativeToURL:self.wordPressComRESTAPI.baseURL];
     return [url absoluteString];
 }
 
@@ -201,7 +201,7 @@ - (void)fetchPostsFromEndpoint:(NSURL *)endpoint
                            failure:(void (^)(NSError *))failure
 {
     NSString *path = [endpoint absoluteString];
-    [self.wordPressComRestApi GET:path
+    [self.wordPressComRESTAPI get:path
            parameters:params
               success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
                   if (!success) {
diff --git a/WordPressKit/ReaderSiteServiceRemote.m b/WordPressKit/ReaderSiteServiceRemote.m
index 60609725..975c6a8f 100644
--- a/WordPressKit/ReaderSiteServiceRemote.m
+++ b/WordPressKit/ReaderSiteServiceRemote.m
@@ -17,7 +17,7 @@ - (void)fetchFollowedSitesWithSuccess:(void(^)(NSArray *sites))success failure:(
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi GET:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -44,7 +44,7 @@ - (void)followSiteWithID:(NSUInteger)siteID success:(void (^)(void))success fail
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi POST:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (success) {
             success();
         }
@@ -61,7 +61,7 @@ - (void)unfollowSiteWithID:(NSUInteger)siteID success:(void (^)(void))success fa
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (success) {
             success();
         }
@@ -80,7 +80,7 @@ - (void)followSiteAtURL:(NSString *)siteURL success:(void (^)(void))success fail
     
     NSDictionary *params = @{ReaderSiteServiceRemoteURLKey: siteURL,
                              ReaderSiteServiceRemoteSourceKey: ReaderSiteServiceRemoteSourceValue};
-    [self.wordPressComRestApi POST:requestUrl parameters:params success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:params success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         NSDictionary *dict = (NSDictionary *)responseObject;
         BOOL subscribed = [[dict numberForKey:@"subscribed"] boolValue];
         if (!subscribed) {
@@ -109,7 +109,7 @@ - (void)unfollowSiteAtURL:(NSString *)siteURL success:(void (^)(void))success fa
     
     NSDictionary *params = @{ReaderSiteServiceRemoteURLKey: siteURL};
     
-    [self.wordPressComRestApi POST:requestUrl parameters:params success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:params success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         NSDictionary *dict = (NSDictionary *)responseObject;
         BOOL subscribed = [[dict numberForKey:@"subscribed"] boolValue];
         if (subscribed) {
@@ -163,7 +163,7 @@ - (void)findSiteIDForURL:(NSURL *)siteURL success:(void (^)(NSUInteger siteID))s
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl parameters:nil success:successBlock failure:^(NSError *error, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:nil success:successBlock failure:^(NSError *error, NSHTTPURLResponse *httpResponse) {
         NSString *newHost;
         if ([host hasPrefix:@"www."]) {
             // If the provided host includes a www. prefix, try again without it.
@@ -178,7 +178,7 @@ - (void)findSiteIDForURL:(NSURL *)siteURL success:(void (^)(NSUInteger siteID))s
         NSString *newPathRequestUrl = [self pathForEndpoint:newPath
                                                 withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
         
-        [self.wordPressComRestApi GET:newPathRequestUrl parameters:nil success:successBlock failure:failureBlock];
+        [self.wordPressComRESTAPI get:newPathRequestUrl parameters:nil success:successBlock failure:failureBlock];
     }];
 }
 
@@ -218,7 +218,7 @@ - (void)checkSubscribedToSiteByID:(NSUInteger)siteID success:(void (^)(BOOL foll
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -239,7 +239,7 @@ - (void)checkSubscribedToFeedByURL:(NSURL *)siteURL success:(void (^)(BOOL follo
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -270,7 +270,7 @@ - (void)flagSiteWithID:(NSUInteger)siteID asBlocked:(BOOL)blocked success:(void(
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi POST:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         NSDictionary *dict = (NSDictionary *)responseObject;
         if (![[dict numberForKey:@"success"] boolValue]) {
             if (blocked) {
diff --git a/WordPressKit/ReaderTopicServiceRemote.m b/WordPressKit/ReaderTopicServiceRemote.m
index 4487bbe0..d475ad87 100644
--- a/WordPressKit/ReaderTopicServiceRemote.m
+++ b/WordPressKit/ReaderTopicServiceRemote.m
@@ -19,7 +19,7 @@ - (void)fetchReaderMenuWithSuccess:(void (^)(NSArray *topics))success failure:(v
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_3];
 
-    [self.wordPressComRestApi GET:requestUrl parameters:nil success:^(NSDictionary *response, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:nil success:^(NSDictionary *response, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -65,7 +65,7 @@ - (void)fetchFollowedSitesWithSuccess:(void(^)(NSArray *sites))success failure:(
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
 
-    [self.wordPressComRestApi GET:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -93,7 +93,7 @@ - (void)unfollowTopicWithSlug:(NSString *)slug
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi POST:requestUrl parameters:nil success:^(NSDictionary *responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:nil success:^(NSDictionary *responseObject, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -124,7 +124,7 @@ - (void)followTopicWithSlug:(NSString *)slug
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [self.wordPressComRestApi POST:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI post:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -146,7 +146,7 @@ - (void)fetchTagInfoForTagWithSlug:(NSString *)slug
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
 
-    [self.wordPressComRestApi GET:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -180,7 +180,7 @@ - (void)fetchSiteInfoForSiteWithID:(NSNumber *)siteID
                                withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
     }
     
-    [self.wordPressComRestApi GET:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
+    [self.wordPressComRESTAPI get:requestUrl parameters:nil success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
         if (!success) {
             return;
         }
@@ -221,7 +221,7 @@ - (RemoteReaderSiteInfo *)siteInfoFromFollowedSiteDictionary:(NSDictionary *)dic
 - (NSString *)endpointUrlForPath:(NSString *)endpoint
 {
     NSString *absolutePath = [self pathForEndpoint:endpoint withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
-    NSURL *url = [NSURL URLWithString:absolutePath relativeToURL:self.wordPressComRestApi.baseURL];
+    NSURL *url = [NSURL URLWithString:absolutePath relativeToURL:self.wordPressComRESTAPI.baseURL];
     return [url absoluteString];
 }
 
diff --git a/WordPressKit/TaxonomyServiceRemoteREST.m b/WordPressKit/TaxonomyServiceRemoteREST.m
index 3535d828..70c352cc 100644
--- a/WordPressKit/TaxonomyServiceRemoteREST.m
+++ b/WordPressKit/TaxonomyServiceRemoteREST.m
@@ -186,7 +186,7 @@ - (void)createTaxonomyWithType:(NSString *)typeIdentifier
     NSString *path = [NSString stringWithFormat:@"sites/%@/%@/new?context=edit", self.siteID, typeIdentifier];
     NSString *requestUrl = [self pathForEndpoint:path withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id  _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
                                if (![responseObject isKindOfClass:[NSDictionary class]]) {
@@ -211,7 +211,7 @@ - (void)getTaxonomyWithType:(NSString *)typeIdentifier
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi GET:requestUrl
+    [self.wordPressComRESTAPI get:requestUrl
                        parameters:parameters
                           success:^(id  _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
                               if (![responseObject isKindOfClass:[NSDictionary class]]) {
@@ -236,7 +236,7 @@ - (void)deleteTaxonomyWithType:(NSString *)typeIdentifier
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:nil
                            success:^(id _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
                                if (![responseObject isKindOfClass:[NSDictionary class]]) {
@@ -261,7 +261,7 @@ - (void)updateTaxonomyWithType:(NSString *)typeIdentifier
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl
+    [self.wordPressComRESTAPI post:requestUrl
                         parameters:parameters
                            success:^(id _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
                                if (![responseObject isKindOfClass:[NSDictionary class]]) {
diff --git a/WordPressKit/ThemeServiceRemote.m b/WordPressKit/ThemeServiceRemote.m
index 094a8982..d6b73417 100644
--- a/WordPressKit/ThemeServiceRemote.m
+++ b/WordPressKit/ThemeServiceRemote.m
@@ -28,7 +28,7 @@ - (NSProgress *)getActiveThemeForBlogId:(NSNumber *)blogId
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    NSProgress *progress = [self.wordPressComRestApi GET:requestUrl
+    NSProgress *progress = [self.wordPressComRESTAPI get:requestUrl
                                               parameters:nil
                                                  success:^(NSDictionary *themeDictionary, NSHTTPURLResponse *httpResponse) {
                                                      if (success) {
@@ -55,7 +55,7 @@ - (NSProgress *)getPurchasedThemesForBlogId:(NSNumber *)blogId
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    NSProgress *progress = [self.wordPressComRestApi GET:requestUrl
+    NSProgress *progress = [self.wordPressComRESTAPI get:requestUrl
                                 parameters:nil
                                    success:^(NSDictionary *response, NSHTTPURLResponse *httpResponse) {
                                        if (success) {
@@ -81,7 +81,7 @@ - (NSProgress *)getThemeId:(NSString*)themeId
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    NSProgress *progress = [self.wordPressComRestApi GET:requestUrl
+    NSProgress *progress = [self.wordPressComRESTAPI get:requestUrl
                                 parameters:nil
                                    success:^(NSDictionary *themeDictionary, NSHTTPURLResponse *httpResponse) {
                                        if (success) {
@@ -233,7 +233,7 @@ - (NSProgress *)getThemesWithRequestUrl:(NSString *)requestUrl
                                 failure:(ThemeServiceRemoteFailureBlock)failure
 {
 
-    return [self.wordPressComRestApi GET:requestUrl
+    return [self.wordPressComRESTAPI get:requestUrl
                               parameters:parameters
                                  success:^(NSDictionary *response, NSHTTPURLResponse *httpResponse) {
                                      if (success) {
@@ -270,7 +270,7 @@ - (NSProgress *)activateThemeId:(NSString *)themeId
     
     NSDictionary* parameters = @{@"theme": themeId};
     
-    NSProgress *progress = [self.wordPressComRestApi POST:requestUrl
+    NSProgress *progress = [self.wordPressComRESTAPI post:requestUrl
                                  parameters:parameters
                                     success:^(NSDictionary *themeDictionary, NSHTTPURLResponse *httpResponse) {
                                         if (success) {
@@ -299,7 +299,7 @@ - (NSProgress *)installThemeId:(NSString*)themeId
     NSString *requestUrl = [self pathForEndpoint:path
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    NSProgress *progress = [self.wordPressComRestApi POST:requestUrl
+    NSProgress *progress = [self.wordPressComRESTAPI post:requestUrl
                                                parameters:nil
                                                   success:^(NSDictionary *themeDictionary, NSHTTPURLResponse *httpResponse) {
                                                       if (success) {
diff --git a/WordPressKit/WordPressComRESTAPIInterfacing.h b/WordPressKit/WordPressComRESTAPIInterfacing.h
index 8a68cb04..119f52d0 100644
--- a/WordPressKit/WordPressComRESTAPIInterfacing.h
+++ b/WordPressKit/WordPressComRESTAPIInterfacing.h
@@ -2,14 +2,16 @@
 
 @protocol WordPressComRESTAPIInterfacing
 
-- (void)get:(NSString * _Nonnull)URLString
- parameters:(NSDictionary<NSString *, NSObject *> * _Nullable)parameters
-    success:(void (^ _Nonnull)(id _Nonnull, NSHTTPURLResponse * _Nullable))success
-    failure:(void (^ _Nonnull)(NSError * _Nonnull, NSHTTPURLResponse * _Nullable))failure;
-
-- (void)post:(NSString * _Nonnull)URLString
-  parameters:(NSDictionary<NSString *, NSObject *> * _Nullable)parameters
-     success:(void (^ _Nonnull)(id _Nonnull, NSHTTPURLResponse * _Nullable))success
-     failure:(void (^ _Nonnull)(NSError * _Nonnull, NSHTTPURLResponse * _Nullable))failure;
+@property (strong, nonatomic, readonly) NSURL * _Nonnull baseURL;
+
+- (NSProgress * _Nullable)get:(NSString * _Nonnull)URLString
+                   parameters:(NSDictionary<NSString *, NSObject *> * _Nullable)parameters
+                      success:(void (^ _Nonnull)(id _Nonnull, NSHTTPURLResponse * _Nullable))success
+                      failure:(void (^ _Nonnull)(NSError * _Nonnull, NSHTTPURLResponse * _Nullable))failure;
+
+- (NSProgress * _Nullable)post:(NSString * _Nonnull)URLString
+                    parameters:(NSDictionary<NSString *, NSObject *> * _Nullable)parameters
+                       success:(void (^ _Nonnull)(id _Nonnull, NSHTTPURLResponse * _Nullable))success
+                       failure:(void (^ _Nonnull)(NSError * _Nonnull, NSHTTPURLResponse * _Nullable))failure;
 
 @end
diff --git a/WordPressKit/WordPressComRestApi.swift b/WordPressKit/WordPressComRestApi.swift
index 0d4f6ae9..3d919297 100644
--- a/WordPressKit/WordPressComRestApi.swift
+++ b/WordPressKit/WordPressComRestApi.swift
@@ -634,7 +634,7 @@ extension WordPressComRestApi: WordPressComRESTAPIInterfacing {
         parameters: [String: NSObject]?,
         success: @escaping (Any, HTTPURLResponse?) -> Void,
         failure: @escaping (any Error, HTTPURLResponse?) -> Void
-    ) {
+    ) -> Progress? {
         GET(URLString, parameters: parameters, success: success, failure: failure)
     }
 
@@ -643,7 +643,7 @@ extension WordPressComRestApi: WordPressComRESTAPIInterfacing {
         parameters: [String: NSObject]?,
         success: @escaping (Any, HTTPURLResponse?) -> Void,
         failure: @escaping (any Error, HTTPURLResponse?) -> Void
-    ) {
+    ) -> Progress? {
         POST(URLString, parameters: parameters, success: success, failure: failure)
     }
 }
diff --git a/WordPressKit/WordPressComServiceRemote.m b/WordPressKit/WordPressComServiceRemote.m
index 3013c921..454553aa 100644
--- a/WordPressKit/WordPressComServiceRemote.m
+++ b/WordPressKit/WordPressComServiceRemote.m
@@ -61,7 +61,7 @@ - (void)createWPComAccountWithEmail:(NSString *)email
     NSString *requestUrl = [self pathForEndpoint:@"users/new"
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl parameters:params success:successBlock failure:failureBlock];
+    [self.wordPressComRESTAPI post:requestUrl parameters:params success:successBlock failure:failureBlock];
 }
 
 - (void)createWPComAccountWithGoogle:(NSString *)token
@@ -116,7 +116,7 @@ - (void)createSocialWPComAccountWithParams:(NSDictionary *)params
     };
 
     NSString *requestUrl = [self pathForEndpoint:@"users/social/new" withVersion:ServiceRemoteWordPressComRESTApiVersion_1_0];
-    [self.wordPressComRestApi POST:requestUrl parameters:params success:successBlock failure:failureBlock];
+    [self.wordPressComRESTAPI post:requestUrl parameters:params success:successBlock failure:failureBlock];
 }
 
 - (void)validateWPComBlogWithUrl:(NSString *)blogUrl
@@ -222,7 +222,7 @@ - (void)createWPComBlogWithUrl:(NSString *)blogUrl
     NSString *requestUrl = [self pathForEndpoint:@"sites/new"
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    [self.wordPressComRestApi POST:requestUrl parameters:params success:successBlock failure:failureBlock];
+    [self.wordPressComRESTAPI post:requestUrl parameters:params success:successBlock failure:failureBlock];
 }
 
 #pragma mark - Error localization
diff --git a/WordPressKitTests/BlogServiceRemoteRESTTests.m b/WordPressKitTests/BlogServiceRemoteRESTTests.m
index fe3444e2..6ea95182 100644
--- a/WordPressKitTests/BlogServiceRemoteRESTTests.m
+++ b/WordPressKitTests/BlogServiceRemoteRESTTests.m
@@ -37,7 +37,7 @@ - (void)testThatGetAuthorsWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg isKindOfClass:[NSDictionary class]]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -62,7 +62,7 @@ - (void)testThatSyncSiteDetailsForBlogWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg isNil]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -88,7 +88,7 @@ - (void)testThatSyncPostTypesForBlogWorks
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
     NSDictionary *parameters = @{@"context": @"edit"};
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg isEqual:parameters]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -113,7 +113,7 @@ - (void)testThatSyncPostFormatsForBlogWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg isNil]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
diff --git a/WordPressKitTests/MenusServiceRemoteTests.m b/WordPressKitTests/MenusServiceRemoteTests.m
index 52f7467a..5aa794eb 100644
--- a/WordPressKitTests/MenusServiceRemoteTests.m
+++ b/WordPressKitTests/MenusServiceRemoteTests.m
@@ -32,7 +32,7 @@ - (void)testThatCreateMenuWithNameWorks
                 && [[parameters objectForKey:@"name"] isEqualToString:name]);
     };
     
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg checkWithBlock:parametersCheckBlock]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -59,7 +59,7 @@ - (void)testThatUpdateMenuWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg isKindOfClass:[NSDictionary class]]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -89,7 +89,7 @@ - (void)testThatDeleteMenuWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg isNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -112,7 +112,7 @@ - (void)testThatGetMenusWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg isNil]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
diff --git a/WordPressKitTests/PostServiceRemoteRESTTests.m b/WordPressKitTests/PostServiceRemoteRESTTests.m
index ccc5a2e4..e1c73864 100644
--- a/WordPressKitTests/PostServiceRemoteRESTTests.m
+++ b/WordPressKitTests/PostServiceRemoteRESTTests.m
@@ -40,7 +40,7 @@ - (void)testThatGetPostWithIDWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg isNotNil]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -82,7 +82,7 @@ - (void)testThatGetPostsOfTypeWorks
                 && [[parameters objectForKey:@"type"] isEqualToString:postType]);
     };
     
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg checkWithBlock:parametersCheckBlock]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -118,7 +118,7 @@ - (void)testThatGetPostsOfTypeWithOptionsWorks
                 && [parameters objectForKey:testOptionKey] == testOptionValue);
     };
     
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg checkWithBlock:parametersCheckBlock]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -153,7 +153,7 @@ - (void)testThatCreatePostWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
 
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg isKindOfClass:[NSDictionary class]]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -198,7 +198,7 @@ - (void)testThatUpdatePostWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
 
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg isKindOfClass:[NSDictionary class]]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -243,7 +243,7 @@ - (void)testThatAutoSavePostWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg isKindOfClass:[NSDictionary class]]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -276,7 +276,7 @@ - (void)testThatGetAutoSaveForPostWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg isNotNil]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -304,7 +304,7 @@ - (void)testThatDeletePostWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
     
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg isNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -341,7 +341,7 @@ - (void)testThatTrashPostWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg isNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -378,7 +378,7 @@ - (void)testThatRestorePostWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    OCMStub([api POST:[OCMArg isEqual:url]
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg isNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
diff --git a/WordPressKitTests/TaxonomyServiceRemoteRESTTests.m b/WordPressKitTests/TaxonomyServiceRemoteRESTTests.m
index 2fbe2fea..12be440d 100644
--- a/WordPressKitTests/TaxonomyServiceRemoteRESTTests.m
+++ b/WordPressKitTests/TaxonomyServiceRemoteRESTTests.m
@@ -56,8 +56,8 @@ - (void)testThatCreateCategoryWorks
         return ([parameters isKindOfClass:[NSDictionary class]] && [[parameters objectForKey:@"name"] isEqualToString:category.name]);
     };
     
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
-    OCMStub([api POST:[OCMArg isEqual:url]
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg checkWithBlock:parametersCheckBlock]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -75,8 +75,8 @@ - (void)testThatGetCategoriesWorks
         return ([parameters isKindOfClass:[NSDictionary class]] && [[parameters objectForKey:@"number"] integerValue] == 1000);
     };
 
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
-    OCMStub([api GET:[OCMArg isEqual:url]
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg checkWithBlock:parametersCheckBlock]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -90,7 +90,7 @@ - (void)testThatGetCategoriesWithNilParent
 {
     NSString *url = [self GETtaxonomyURLWithType:@"categories"];
 
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
     NSDictionary *json = @{
         @"found": @1,
         @"categories": @[
@@ -113,7 +113,7 @@ - (void)testThatGetCategoriesWithNilParent
         ]
       };
     NSHTTPURLResponse *response = OCMStrictClassMock([NSHTTPURLResponse class]);
-    OCMStub([api GET:[OCMArg isEqual:url]
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg any]
              success:([OCMArg invokeBlockWithArgs:json, response, nil])
              failure:[OCMArg isNotNil]]);
@@ -163,8 +163,8 @@ - (void)testThatGetCategoriesWithPagingWorks
         return YES;
     };
     
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
-    OCMStub([api GET:[OCMArg isEqual:url]
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg checkWithBlock:parametersCheckBlock]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -189,8 +189,8 @@ - (void)testThatSearchCategoriesWithNameWorks
         return YES;
     };
     
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
-    OCMStub([api GET:[OCMArg isEqual:url]
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg checkWithBlock:parametersCheckBlock]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -216,8 +216,8 @@ - (void)testThatCreateTagWorks
         return ([parameters isKindOfClass:[NSDictionary class]] && [[parameters objectForKey:@"name"] isEqualToString:tag.name]);
     };
 
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
-    OCMStub([api POST:[OCMArg isEqual:url]
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
+    OCMStub([api post:[OCMArg isEqual:url]
            parameters:[OCMArg checkWithBlock:parametersCheckBlock]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]);
@@ -235,8 +235,8 @@ - (void)testThatGetTagsWorks
         return ([parameters isKindOfClass:[NSDictionary class]] && [[parameters objectForKey:@"number"] integerValue] == 1000);
     };
 
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
-    OCMStub([api GET:[OCMArg isEqual:url]
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg checkWithBlock:parametersCheckBlock]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -278,8 +278,8 @@ - (void)testThatGetTagsWithPagingWorks
         return YES;
     };
     
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
-    OCMStub([api GET:[OCMArg isEqual:url]
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg checkWithBlock:parametersCheckBlock]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
@@ -304,8 +304,8 @@ - (void)testThatSearchTagsWithNameWorks
         return YES;
     };
     
-    WordPressComRestApi *api = self.service.wordPressComRestApi;
-    OCMStub([api GET:[OCMArg isEqual:url]
+    id<WordPressComRESTAPIInterfacing> api = self.service.wordPressComRESTAPI;
+    OCMStub([api get:[OCMArg isEqual:url]
           parameters:[OCMArg checkWithBlock:parametersCheckBlock]
              success:[OCMArg isNotNil]
              failure:[OCMArg isNotNil]]);
diff --git a/WordPressKitTests/ThemeServiceRemoteTests.m b/WordPressKitTests/ThemeServiceRemoteTests.m
index afebb787..f4e6277e 100644
--- a/WordPressKitTests/ThemeServiceRemoteTests.m
+++ b/WordPressKitTests/ThemeServiceRemoteTests.m
@@ -42,7 +42,7 @@ - (void)testThatGetActiveThemeForBlogIdWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [OCMStub([api GET:[OCMArg isEqual:url]
+    [OCMStub([api get:[OCMArg isEqual:url]
            parameters:[OCMArg isNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]) andDo:^(NSInvocation *invocation) {
@@ -95,7 +95,7 @@ - (void)testThatGetPurchasedThemesForBlogIdWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [OCMStub([api GET:[OCMArg isEqual:url]
+    [OCMStub([api get:[OCMArg isEqual:url]
            parameters:[OCMArg isNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]) andDo:^(NSInvocation *invocation) {
@@ -148,7 +148,7 @@ - (void)testThatGetThemeIdWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
-    [OCMStub([api GET:[OCMArg isEqual:url]
+    [OCMStub([api get:[OCMArg isEqual:url]
            parameters:[OCMArg isNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]) andDo:^(NSInvocation *invocation) {
@@ -203,7 +203,7 @@ - (void)testThatGetThemesWorks
         NSCAssert(totalThemeCount == expectedThemes, @"Expected %ld themes to be found", expectedThemes);
     };
     
-    [OCMStub([api GET:[OCMArg isEqual:url]
+    [OCMStub([api get:[OCMArg isEqual:url]
            parameters:[OCMArg isNotNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]) andDo:^(NSInvocation *invocation) {
@@ -247,7 +247,7 @@ - (void)testThatGetThemesForBlogIdWorks
     NSString *url = [service pathForEndpoint:endpoint
                                  withVersion:ServiceRemoteWordPressComRESTApiVersion_1_2];
 
-    [OCMStub([api GET:[OCMArg isEqual:url]
+    [OCMStub([api get:[OCMArg isEqual:url]
            parameters:[OCMArg isNotNil]
               success:[OCMArg isNotNil]
               failure:[OCMArg isNotNil]]) andDo:^(NSInvocation *invocation) {
@@ -311,7 +311,7 @@ - (void)testThatActivateThemeIdWorks
         return [themeIdParameter isEqualToString:themeId];
     };
 
-    [OCMStub([api POST:[OCMArg isEqual:url]
+    [OCMStub([api post:[OCMArg isEqual:url]
             parameters:[OCMArg checkWithBlock:checkBlock]
                success:[OCMArg isNotNil]
                failure:[OCMArg isNotNil]]) andDo:^(NSInvocation *invocation) {