Fixing issue relating to classes being incorrectly spelled compared to spec (which is incorrectly spelled).

18 files changed, 99 insertions, 31 deletions

diff --git a/SmartDeviceLink/SDLGetWaypoints.h b/SmartDeviceLink/SDLGetWaypoints.h
index e14ace9e5..6a2de931c 100644
--- a/SmartDeviceLink/SDLGetWaypoints.h
+++ b/SmartDeviceLink/SDLGetWaypoints.h
@@ -5,7 +5,8 @@
 
 @class SDLWaypointType;
 
-@interface SDLGetWaypoints : SDLRPCRequest
+
+@interface SDLGetWayPoints : SDLRPCRequest
 
 - (instancetype)initWithType:(SDLWaypointType *)type;
 
@@ -18,3 +19,8 @@
 @property (strong, nonatomic) SDLWaypointType *waypointType;
 
 @end
+
+__deprecated_msg("Use SDLGetWayPoints instead")
+@interface SDLGetWaypoints : SDLGetWayPoints
+
+@end
diff --git a/SmartDeviceLink/SDLGetWaypoints.m b/SmartDeviceLink/SDLGetWaypoints.m
index 0a479c865..9afb83f99 100644
--- a/SmartDeviceLink/SDLGetWaypoints.m
+++ b/SmartDeviceLink/SDLGetWaypoints.m
@@ -6,7 +6,7 @@
 #import "SDLNames.h"
 #import "SDLWaypointType.h"
 
-@implementation SDLGetWaypoints
+@implementation SDLGetWayPoints
 
 - (instancetype)init {
     if (self = [super initWithName:NAMES_GetWaypoints]) {
@@ -20,9 +20,9 @@
     if (!self) {
         return nil;
     }
-
+    
     self.waypointType = type;
-
+    
     return self;
 }
 
@@ -44,3 +44,8 @@
 }
 
 @end
+
+@implementation SDLGetWaypoints
+
+@end
+
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.h b/SmartDeviceLink/SDLGetWaypointsResponse.h
index 94d449886..a2456686c 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.h
+++ b/SmartDeviceLink/SDLGetWaypointsResponse.h
@@ -5,7 +5,7 @@
 
 @class SDLLocationDetails;
 
-@interface SDLGetWaypointsResponse : SDLRPCResponse
+@interface SDLGetWayPointsResponse : SDLRPCResponse
 
 /**
  * @abstract Array of waypoints
@@ -17,3 +17,8 @@
 @property (strong) NSArray<SDLLocationDetails *> *waypoints;
 
 @end
+
+__deprecated_msg("Use SDLGetWayPointsResponse instead")
+@interface SDLGetWaypointsResponse : SDLGetWayPointsResponse
+
+@end
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.m b/SmartDeviceLink/SDLGetWaypointsResponse.m
index 9baa3b414..c59481226 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.m
+++ b/SmartDeviceLink/SDLGetWaypointsResponse.m
@@ -4,7 +4,7 @@
 #import "SDLGetWaypointsResponse.h"
 #import "SDLNames.h"
 
-@implementation SDLGetWaypointsResponse
+@implementation SDLGetWayPointsResponse
 
 - (instancetype)init {
     if (self = [super initWithName:NAMES_GetWaypoints]) {
@@ -25,3 +25,8 @@
 }
 
 @end
+
+@implementation SDLGetWaypointsResponse
+
+@end
+
diff --git a/SmartDeviceLink/SDLOnWaypointChange.h b/SmartDeviceLink/SDLOnWaypointChange.h
index fb7daabd3..b31fa586e 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.h
+++ b/SmartDeviceLink/SDLOnWaypointChange.h
@@ -5,7 +5,7 @@
 
 @class SDLLocationDetails;
 
-@interface SDLOnWaypointChange : SDLRPCNotification
+@interface SDLOnWayPointChange : SDLRPCNotification
 
 /**
  * @abstract Location address for display purposes only.
@@ -15,3 +15,9 @@
 @property (copy, nonatomic) NSArray<SDLLocationDetails *> *waypoints;
 
 @end
+
+__deprecated_msg("Use SDLOnWayPointChange instead")
+@interface SDLOnWaypointChange : SDLOnWayPointChange
+
+@end
+
diff --git a/SmartDeviceLink/SDLOnWaypointChange.m b/SmartDeviceLink/SDLOnWaypointChange.m
index 7fb77369a..a18975bc1 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.m
+++ b/SmartDeviceLink/SDLOnWaypointChange.m
@@ -5,7 +5,7 @@
 
 #import "SDLNames.h"
 
-@implementation SDLOnWaypointChange
+@implementation SDLOnWayPointChange
 
 - (instancetype)init {
     if (self = [super initWithName:NAMES_OnWaypointChange]) {
@@ -26,3 +26,7 @@
 }
 
 @end
+
+@implementation SDLOnWaypointChange
+
+@end
diff --git a/SmartDeviceLink/SDLProxyListener.h b/SmartDeviceLink/SDLProxyListener.h
index e8795907e..9b6f460f4 100644
--- a/SmartDeviceLink/SDLProxyListener.h
+++ b/SmartDeviceLink/SDLProxyListener.h
@@ -96,7 +96,7 @@
 - (void)onGenericResponse:(SDLGenericResponse *)response;
 - (void)onGetDTCsResponse:(SDLGetDTCsResponse *)response;
 - (void)onGetVehicleDataResponse:(SDLGetVehicleDataResponse *)response;
-- (void)onGetWaypointsResponse:(SDLGetWaypointsResponse *)response;
+- (void)onGetWayPointsResponse:(SDLGetWaypointsResponse *)response;
 - (void)onListFilesResponse:(SDLListFilesResponse *)response;
 - (void)onReceivedLockScreenIcon:(UIImage *)icon;
 - (void)onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered *)notification;
@@ -115,7 +115,7 @@
 - (void)onOnTBTClientState:(SDLOnTBTClientState *)notification;
 - (void)onOnTouchEvent:(SDLOnTouchEvent *)notification;
 - (void)onOnVehicleData:(SDLOnVehicleData *)notification;
-- (void)onOnWaypointChange:(SDLOnWaypointChange *)notification;
+- (void)onOnWayPointChange:(SDLOnWaypointChange *)notification;
 - (void)onPerformAudioPassThruResponse:(SDLPerformAudioPassThruResponse *)response;
 - (void)onPerformInteractionResponse:(SDLPerformInteractionResponse *)response;
 - (void)onPutFileResponse:(SDLPutFileResponse *)response;
@@ -134,12 +134,12 @@
 - (void)onSpeakResponse:(SDLSpeakResponse *)response;
 - (void)onSubscribeButtonResponse:(SDLSubscribeButtonResponse *)response;
 - (void)onSubscribeVehicleDataResponse:(SDLSubscribeVehicleDataResponse *)response;
-- (void)onSubscribeWaypointsResponse:(SDLSubscribeWaypointsResponse *)response;
+- (void)onSubscribeWayPointsResponse:(SDLSubscribeWaypointsResponse *)response;
 - (void)onSyncPDataResponse:(SDLSyncPDataResponse *)response;
 - (void)onUpdateTurnListResponse:(SDLUpdateTurnListResponse *)response;
 - (void)onUnregisterAppInterfaceResponse:(SDLUnregisterAppInterfaceResponse *)response;
 - (void)onUnsubscribeButtonResponse:(SDLUnsubscribeButtonResponse *)response;
 - (void)onUnsubscribeVehicleDataResponse:(SDLUnsubscribeVehicleDataResponse *)response;
-- (void)onUnsubscribeWaypointsResponse:(SDLUnsubscribeWaypointsResponse *)response;
+- (void)onUnsubscribeWayPointsResponse:(SDLUnsubscribeWaypointsResponse *)response;
 
 @end
diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.h b/SmartDeviceLink/SDLSubscribeWaypoints.h
index b5127d00e..46ce2531a 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.h
+++ b/SmartDeviceLink/SDLSubscribeWaypoints.h
@@ -10,7 +10,12 @@
 * @see SDLUnsubscribeWaypoints
 *
 */
+@interface SDLSubscribeWayPoints : SDLRPCRequest
 
-@interface SDLSubscribeWaypoints : SDLRPCRequest
+@end
+
+__deprecated_msg("Use SDLSubscribeWayPoints instead")
+@interface SDLSubscribeWaypoints : SDLSubscribeWayPoints
 
 @end
+
diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.m b/SmartDeviceLink/SDLSubscribeWaypoints.m
index 8c22da383..f043c6771 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLSubscribeWaypoints.m
@@ -4,7 +4,7 @@
 #import "SDLSubscribeWaypoints.h"
 #import "SDLNames.h"
 
-@implementation SDLSubscribeWaypoints
+@implementation SDLSubscribeWayPoints
 
 - (instancetype)init {
     if (self = [super initWithName:NAMES_SubscribeWaypoints]) {
@@ -13,3 +13,8 @@
 }
 
 @end
+
+@implementation SDLSubscribeWaypoints
+
+@end
+
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h b/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
index 9d4cfd967..02a9febc3 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
+++ b/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
@@ -3,6 +3,12 @@
 
 #import "SDLRPCResponse.h"
 
-@interface SDLSubscribeWaypointsResponse : SDLRPCResponse
+@interface SDLSubscribeWayPointsResponse : SDLRPCResponse
 
 @end
+
+__deprecated_msg("Use SDLSubscribeWayPointsResponse instead")
+@interface SDLSubscribeWaypointsResponse : SDLSubscribeWayPointsResponse
+
+@end
+
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m b/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
index 50979cd9f..11f066d11 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
@@ -4,7 +4,7 @@
 #import "SDLSubscribeWaypointsResponse.h"
 #import "SDLNames.h"
 
-@implementation SDLSubscribeWaypointsResponse
+@implementation SDLSubscribeWayPointsResponse
 
 - (instancetype)init {
     if (self = [super initWithName:NAMES_SubscribeWaypoints]) {
@@ -13,3 +13,7 @@
 }
 
 @end
+
+@implementation SDLSubscribeWaypointsResponse
+
+@end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.h b/SmartDeviceLink/SDLUnsubscribeWaypoints.h
index ff7b15296..2b2be9f7b 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.h
+++ b/SmartDeviceLink/SDLUnsubscribeWaypoints.h
@@ -3,6 +3,11 @@
 
 #import "SDLRPCRequest.h"
 
-@interface SDLUnsubscribeWaypoints : SDLRPCRequest
+@interface SDLUnsubscribeWayPoints : SDLRPCRequest
+
+@end
+
+__deprecated_msg("Use SDLUnsubscribeWayPoints instead")
+@interface SDLUnsubscribeWaypoints : SDLUnsubscribeWayPoints
 
 @end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.m b/SmartDeviceLink/SDLUnsubscribeWaypoints.m
index 9b5dfc54f..34ead6223 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLUnsubscribeWaypoints.m
@@ -4,7 +4,7 @@
 #import "SDLUnsubscribeWaypoints.h"
 #import "SDLNames.h"
 
-@implementation SDLUnsubscribeWaypoints
+@implementation SDLUnsubscribeWayPoints
 
 - (instancetype)init {
     if (self = [super initWithName:NAMES_UnsubscribeWaypoints]) {
@@ -12,5 +12,8 @@
     return self;
 }
 
+@end
+
+@implementation SDLUnsubscribeWaypoints
 
 @end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
index e64cc2d73..b0c03e6e5 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
+++ b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
@@ -3,6 +3,11 @@
 
 #import "SDLRPCResponse.h"
 
-@interface SDLUnsubscribeWaypointsResponse : SDLRPCResponse
+@interface SDLUnsubscribeWayPointsResponse : SDLRPCResponse
+
+@end
+
+__deprecated_msg("Use SDLUnsubscribeWayPointsResponse instead")
+@interface SDLUnsubscribeWaypointsResponse : SDLUnsubscribeWayPointsResponse
 
 @end
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
index 49f0f7f21..e4aaf9a72 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
@@ -5,7 +5,7 @@
 
 #import "SDLNames.h"
 
-@implementation SDLUnsubscribeWaypointsResponse
+@implementation SDLUnsubscribeWayPointsResponse
 
 - (instancetype)init {
     if (self = [super initWithName:NAMES_UnsubscribeWaypoints]) {
@@ -14,3 +14,7 @@
 }
 
 @end
+
+@implementation SDLUnsubscribeWaypointsResponse
+
+@end
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
index b08d8bb5d..1bdf53442 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
@@ -17,12 +17,12 @@
 QuickSpecBegin(SDLOnWaypointChangeSpec)
 
 describe(@"Getter/Setter Tests", ^ {
-    __block SDLOnWaypointChange* testNotification = nil;
+    __block SDLOnWayPointChange* testNotification = nil;
     __block NSArray<SDLLocationDetails *>* someWaypoints = nil;
     
     describe(@"when initialized with init", ^{
         beforeEach(^{
-            testNotification = [[SDLOnWaypointChange alloc] init];
+            testNotification = [[SDLOnWayPointChange alloc] init];
         });
         
         context(@"when parameters are set correctly", ^{
@@ -71,7 +71,7 @@ describe(@"Getter/Setter Tests", ^ {
                                            NAMES_operation_name:NAMES_OnWaypointChange
                                            };
                 
-                testNotification = [[SDLOnWaypointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
+                testNotification = [[SDLOnWayPointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
             });
             
             // Since all the properties are immutable, a copy should be executed as a retain, which means they should be identical
@@ -89,7 +89,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    }
                                            };
                 
-                testNotification = [[SDLOnWaypointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
+                testNotification = [[SDLOnWayPointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
             });
             
             it(@"should return nil for waypoints", ^{
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
index 579d63935..5edd91078 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
@@ -15,7 +15,7 @@ QuickSpecBegin(SDLGetWaypointsSpec)
 
 describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
-        SDLGetWaypoints* testRequest = [[SDLGetWaypoints alloc] init];
+        SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] init];
         
         testRequest.waypointType = [SDLWaypointType ALL];
         
@@ -27,13 +27,13 @@ describe(@"Getter/Setter Tests", ^ {
                                            @{NAMES_parameters:
                                                  @{NAMES_waypointType:[SDLWaypointType ALL]},
                                              NAMES_operation_name:NAMES_GetWaypoints}} mutableCopy];
-        SDLGetWaypoints* testRequest = [[SDLGetWaypoints alloc] initWithDictionary:dict];
+        SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] initWithDictionary:dict];
         
         expect(testRequest.waypointType).to(equal([SDLWaypointType ALL]));
     });
     
     it(@"Should return nil if not set", ^ {
-        SDLGetWaypoints* testRequest = [[SDLGetWaypoints alloc] init];
+        SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] init];
         
         expect(testRequest.waypointType).to(beNil());
     });
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
index 4754fe4e8..d1f2a0ab3 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
@@ -17,12 +17,12 @@
 QuickSpecBegin(SDLGetWaypointsResponseSpec)
 
 describe(@"Getter/Setter Tests", ^ {
-    __block SDLGetWaypointsResponse* testResponse = nil;
+    __block SDLGetWayPointsResponse* testResponse = nil;
     __block NSArray<SDLLocationDetails *>* someWaypoints = nil;
     
     describe(@"when initialized with init", ^{
         beforeEach(^{
-            testResponse = [[SDLGetWaypointsResponse alloc] init];
+            testResponse = [[SDLGetWayPointsResponse alloc] init];
         });
         
         context(@"when parameters are set correctly", ^{
@@ -70,7 +70,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    }
                                            };
                 
-                testResponse = [[SDLGetWaypointsResponse alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
+                testResponse = [[SDLGetWayPointsResponse alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
             });
             
             // Since all the properties are immutable, a copy should be executed as a retain, which means they should be identical
@@ -88,7 +88,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                    }
                                            };
                 
-                testResponse = [[SDLGetWaypointsResponse alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
+                testResponse = [[SDLGetWayPointsResponse alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
             });
             
             it(@"should return nil for waypoints", ^{