Merge pull request #697 from smartdevicelink/bugfix/issue_636_proxylistener_deprecated

Fix SDLProxyListener using removed waypoint classes

37 files changed, 211 insertions, 211 deletions

diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec
index 98a358b92..308f5987b 100644
--- a/SmartDeviceLink-iOS.podspec
+++ b/SmartDeviceLink-iOS.podspec
@@ -174,7 +174,7 @@ ss.public_header_files = [
 'SmartDeviceLink/SDLOnTBTClientState.h',
 'SmartDeviceLink/SDLOnTouchEvent.h',
 'SmartDeviceLink/SDLOnVehicleData.h',
-'SmartDeviceLink/SDLOnWaypointChange.h',
+'SmartDeviceLink/SDLOnWayPointChange.h',
 'SmartDeviceLink/SDLParameterPermissions.h',
 'SmartDeviceLink/SDLPerformAudioPassThru.h',
 'SmartDeviceLink/SDLPerformAudioPassThruResponse.h',
@@ -309,7 +309,7 @@ ss.public_header_files = [
 'SmartDeviceLink/SDLVrCapabilities.h',
 'SmartDeviceLink/SDLVrHelpItem.h',
 'SmartDeviceLink/SDLWarningLightStatus.h',
-'SmartDeviceLink/SDLWaypointType.h',
+'SmartDeviceLink/SDLWayPointType.h',
 'SmartDeviceLink/SDLWiperStatus.h',
 'SmartDeviceLink/SmartDeviceLink.h',
 ]
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index b5e562742..a88890f31 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -994,22 +994,22 @@
 		DA9F7E681DCBFAD400ACAE48 /* SDLOasisAddress.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E661DCBFAD400ACAE48 /* SDLOasisAddress.m */; };
 		DA9F7E6B1DCBFB0700ACAE48 /* SDLDeliveryMode.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E691DCBFB0700ACAE48 /* SDLDeliveryMode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DA9F7E6C1DCBFB0700ACAE48 /* SDLDeliveryMode.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E6A1DCBFB0700ACAE48 /* SDLDeliveryMode.m */; };
-		DA9F7E6F1DCBFFDB00ACAE48 /* SDLGetWaypoints.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E6D1DCBFFDB00ACAE48 /* SDLGetWaypoints.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA9F7E701DCBFFDB00ACAE48 /* SDLGetWaypoints.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E6E1DCBFFDB00ACAE48 /* SDLGetWaypoints.m */; };
-		DA9F7E731DCC004C00ACAE48 /* SDLGetWaypointsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E711DCC004C00ACAE48 /* SDLGetWaypointsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA9F7E741DCC004C00ACAE48 /* SDLGetWaypointsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E721DCC004C00ACAE48 /* SDLGetWaypointsResponse.m */; };
-		DA9F7E7F1DCC028B00ACAE48 /* SDLOnWaypointChange.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E7D1DCC028B00ACAE48 /* SDLOnWaypointChange.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA9F7E801DCC028B00ACAE48 /* SDLOnWaypointChange.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E7E1DCC028B00ACAE48 /* SDLOnWaypointChange.m */; };
-		DA9F7E831DCC047200ACAE48 /* SDLWaypointType.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E811DCC047200ACAE48 /* SDLWaypointType.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA9F7E841DCC047200ACAE48 /* SDLWaypointType.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E821DCC047200ACAE48 /* SDLWaypointType.m */; };
-		DA9F7E871DCC049900ACAE48 /* SDLSubscribeWaypoints.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E851DCC049900ACAE48 /* SDLSubscribeWaypoints.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA9F7E881DCC049900ACAE48 /* SDLSubscribeWaypoints.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E861DCC049900ACAE48 /* SDLSubscribeWaypoints.m */; };
-		DA9F7E8B1DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E891DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA9F7E8C1DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E8A1DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.m */; };
-		DA9F7E8F1DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E8D1DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA9F7E901DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E8E1DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.m */; };
-		DA9F7E931DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E911DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DA9F7E941DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E921DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.m */; };
+		DA9F7E6F1DCBFFDB00ACAE48 /* SDLGetWayPoints.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E6D1DCBFFDB00ACAE48 /* SDLGetWayPoints.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA9F7E701DCBFFDB00ACAE48 /* SDLGetWayPoints.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E6E1DCBFFDB00ACAE48 /* SDLGetWayPoints.m */; };
+		DA9F7E731DCC004C00ACAE48 /* SDLGetWayPointsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E711DCC004C00ACAE48 /* SDLGetWayPointsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA9F7E741DCC004C00ACAE48 /* SDLGetWayPointsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E721DCC004C00ACAE48 /* SDLGetWayPointsResponse.m */; };
+		DA9F7E7F1DCC028B00ACAE48 /* SDLOnWayPointChange.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E7D1DCC028B00ACAE48 /* SDLOnWayPointChange.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA9F7E801DCC028B00ACAE48 /* SDLOnWayPointChange.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E7E1DCC028B00ACAE48 /* SDLOnWayPointChange.m */; };
+		DA9F7E831DCC047200ACAE48 /* SDLWayPointType.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E811DCC047200ACAE48 /* SDLWayPointType.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA9F7E841DCC047200ACAE48 /* SDLWayPointType.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E821DCC047200ACAE48 /* SDLWayPointType.m */; };
+		DA9F7E871DCC049900ACAE48 /* SDLSubscribeWayPoints.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E851DCC049900ACAE48 /* SDLSubscribeWayPoints.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA9F7E881DCC049900ACAE48 /* SDLSubscribeWayPoints.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E861DCC049900ACAE48 /* SDLSubscribeWayPoints.m */; };
+		DA9F7E8B1DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E891DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA9F7E8C1DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E8A1DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.m */; };
+		DA9F7E8F1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E8D1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA9F7E901DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E8E1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.m */; };
+		DA9F7E931DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E911DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DA9F7E941DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E921DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.m */; };
 		DA9F7E991DCC052C00ACAE48 /* SDLLocationCoordinate.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E951DCC052C00ACAE48 /* SDLLocationCoordinate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DA9F7E9A1DCC052C00ACAE48 /* SDLLocationCoordinate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA9F7E961DCC052C00ACAE48 /* SDLLocationCoordinate.m */; };
 		DA9F7E9B1DCC052C00ACAE48 /* SDLLocationDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = DA9F7E971DCC052C00ACAE48 /* SDLLocationDetails.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2138,22 +2138,22 @@
 		DA9F7E661DCBFAD400ACAE48 /* SDLOasisAddress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOasisAddress.m; sourceTree = "<group>"; };
 		DA9F7E691DCBFB0700ACAE48 /* SDLDeliveryMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeliveryMode.h; sourceTree = "<group>"; };
 		DA9F7E6A1DCBFB0700ACAE48 /* SDLDeliveryMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDeliveryMode.m; sourceTree = "<group>"; };
-		DA9F7E6D1DCBFFDB00ACAE48 /* SDLGetWaypoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLGetWaypoints.h; sourceTree = "<group>"; };
-		DA9F7E6E1DCBFFDB00ACAE48 /* SDLGetWaypoints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLGetWaypoints.m; sourceTree = "<group>"; };
-		DA9F7E711DCC004C00ACAE48 /* SDLGetWaypointsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLGetWaypointsResponse.h; sourceTree = "<group>"; };
-		DA9F7E721DCC004C00ACAE48 /* SDLGetWaypointsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLGetWaypointsResponse.m; sourceTree = "<group>"; };
-		DA9F7E7D1DCC028B00ACAE48 /* SDLOnWaypointChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnWaypointChange.h; sourceTree = "<group>"; };
-		DA9F7E7E1DCC028B00ACAE48 /* SDLOnWaypointChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnWaypointChange.m; sourceTree = "<group>"; };
-		DA9F7E811DCC047200ACAE48 /* SDLWaypointType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLWaypointType.h; sourceTree = "<group>"; };
-		DA9F7E821DCC047200ACAE48 /* SDLWaypointType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLWaypointType.m; sourceTree = "<group>"; };
-		DA9F7E851DCC049900ACAE48 /* SDLSubscribeWaypoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeWaypoints.h; sourceTree = "<group>"; };
-		DA9F7E861DCC049900ACAE48 /* SDLSubscribeWaypoints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeWaypoints.m; sourceTree = "<group>"; };
-		DA9F7E891DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeWaypointsResponse.h; sourceTree = "<group>"; };
-		DA9F7E8A1DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeWaypointsResponse.m; sourceTree = "<group>"; };
-		DA9F7E8D1DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeWaypointsResponse.h; sourceTree = "<group>"; };
-		DA9F7E8E1DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnsubscribeWaypointsResponse.m; sourceTree = "<group>"; };
-		DA9F7E911DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeWaypoints.h; sourceTree = "<group>"; };
-		DA9F7E921DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnsubscribeWaypoints.m; sourceTree = "<group>"; };
+		DA9F7E6D1DCBFFDB00ACAE48 /* SDLGetWayPoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLGetWayPoints.h; sourceTree = "<group>"; };
+		DA9F7E6E1DCBFFDB00ACAE48 /* SDLGetWayPoints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLGetWayPoints.m; sourceTree = "<group>"; };
+		DA9F7E711DCC004C00ACAE48 /* SDLGetWayPointsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLGetWayPointsResponse.h; sourceTree = "<group>"; };
+		DA9F7E721DCC004C00ACAE48 /* SDLGetWayPointsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLGetWayPointsResponse.m; sourceTree = "<group>"; };
+		DA9F7E7D1DCC028B00ACAE48 /* SDLOnWayPointChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnWayPointChange.h; sourceTree = "<group>"; };
+		DA9F7E7E1DCC028B00ACAE48 /* SDLOnWayPointChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLOnWayPointChange.m; sourceTree = "<group>"; };
+		DA9F7E811DCC047200ACAE48 /* SDLWayPointType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLWayPointType.h; sourceTree = "<group>"; };
+		DA9F7E821DCC047200ACAE48 /* SDLWayPointType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLWayPointType.m; sourceTree = "<group>"; };
+		DA9F7E851DCC049900ACAE48 /* SDLSubscribeWayPoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeWayPoints.h; sourceTree = "<group>"; };
+		DA9F7E861DCC049900ACAE48 /* SDLSubscribeWayPoints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeWayPoints.m; sourceTree = "<group>"; };
+		DA9F7E891DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSubscribeWayPointsResponse.h; sourceTree = "<group>"; };
+		DA9F7E8A1DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeWayPointsResponse.m; sourceTree = "<group>"; };
+		DA9F7E8D1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeWayPointsResponse.h; sourceTree = "<group>"; };
+		DA9F7E8E1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnsubscribeWayPointsResponse.m; sourceTree = "<group>"; };
+		DA9F7E911DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLUnsubscribeWayPoints.h; sourceTree = "<group>"; };
+		DA9F7E921DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLUnsubscribeWayPoints.m; sourceTree = "<group>"; };
 		DA9F7E951DCC052C00ACAE48 /* SDLLocationCoordinate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLLocationCoordinate.h; sourceTree = "<group>"; };
 		DA9F7E961DCC052C00ACAE48 /* SDLLocationCoordinate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLLocationCoordinate.m; sourceTree = "<group>"; };
 		DA9F7E971DCC052C00ACAE48 /* SDLLocationDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLLocationDetails.h; sourceTree = "<group>"; };
@@ -2939,8 +2939,8 @@
 				5D00AC6E1F1511B9004000D9 /* SDLGetSystemCapability.m */,
 				5D61FAC81A84238A00846EE7 /* SDLGetVehicleData.h */,
 				5D61FAC91A84238A00846EE7 /* SDLGetVehicleData.m */,
-				DA9F7E6D1DCBFFDB00ACAE48 /* SDLGetWaypoints.h */,
-				DA9F7E6E1DCBFFDB00ACAE48 /* SDLGetWaypoints.m */,
+				DA9F7E6D1DCBFFDB00ACAE48 /* SDLGetWayPoints.h */,
+				DA9F7E6E1DCBFFDB00ACAE48 /* SDLGetWayPoints.m */,
 				5D61FAFF1A84238A00846EE7 /* SDLListFiles.h */,
 				5D61FB001A84238A00846EE7 /* SDLListFiles.m */,
 				5D61FB381A84238B00846EE7 /* SDLPerformAudioPassThru.h */,
@@ -2981,8 +2981,8 @@
 				5D61FBC11A84238B00846EE7 /* SDLSubscribeButton.m */,
 				5D61FBC41A84238B00846EE7 /* SDLSubscribeVehicleData.h */,
 				5D61FBC51A84238B00846EE7 /* SDLSubscribeVehicleData.m */,
-				DA9F7E851DCC049900ACAE48 /* SDLSubscribeWaypoints.h */,
-				DA9F7E861DCC049900ACAE48 /* SDLSubscribeWaypoints.m */,
+				DA9F7E851DCC049900ACAE48 /* SDLSubscribeWayPoints.h */,
+				DA9F7E861DCC049900ACAE48 /* SDLSubscribeWayPoints.m */,
 				5D61FBCA1A84238B00846EE7 /* SDLSyncPData.h */,
 				5D61FBCB1A84238B00846EE7 /* SDLSyncPData.m */,
 				5D61FBD21A84238B00846EE7 /* SDLSystemRequest.h */,
@@ -2993,8 +2993,8 @@
 				5D61FBFB1A84238C00846EE7 /* SDLUnsubscribeButton.m */,
 				5D61FBFE1A84238C00846EE7 /* SDLUnsubscribeVehicleData.h */,
 				5D61FBFF1A84238C00846EE7 /* SDLUnsubscribeVehicleData.m */,
-				DA9F7E911DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.h */,
-				DA9F7E921DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.m */,
+				DA9F7E911DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.h */,
+				DA9F7E921DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.m */,
 				5D61FC041A84238C00846EE7 /* SDLUpdateTurnList.h */,
 				5D61FC051A84238C00846EE7 /* SDLUpdateTurnList.m */,
 			);
@@ -3040,8 +3040,8 @@
 				5D00AC721F151CFE004000D9 /* SDLGetSystemCapabilityResponse.m */,
 				5D61FACA1A84238A00846EE7 /* SDLGetVehicleDataResponse.h */,
 				5D61FACB1A84238A00846EE7 /* SDLGetVehicleDataResponse.m */,
-				DA9F7E711DCC004C00ACAE48 /* SDLGetWaypointsResponse.h */,
-				DA9F7E721DCC004C00ACAE48 /* SDLGetWaypointsResponse.m */,
+				DA9F7E711DCC004C00ACAE48 /* SDLGetWayPointsResponse.h */,
+				DA9F7E721DCC004C00ACAE48 /* SDLGetWayPointsResponse.m */,
 				5D61FB011A84238A00846EE7 /* SDLListFilesResponse.h */,
 				5D61FB021A84238A00846EE7 /* SDLListFilesResponse.m */,
 				5D61FB3A1A84238B00846EE7 /* SDLPerformAudioPassThruResponse.h */,
@@ -3082,8 +3082,8 @@
 				5D61FBC31A84238B00846EE7 /* SDLSubscribeButtonResponse.m */,
 				5D61FBC61A84238B00846EE7 /* SDLSubscribeVehicleDataResponse.h */,
 				5D61FBC71A84238B00846EE7 /* SDLSubscribeVehicleDataResponse.m */,
-				DA9F7E891DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.h */,
-				DA9F7E8A1DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.m */,
+				DA9F7E891DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.h */,
+				DA9F7E8A1DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.m */,
 				5D61FBCC1A84238B00846EE7 /* SDLSyncPDataResponse.h */,
 				5D61FBCD1A84238B00846EE7 /* SDLSyncPDataResponse.m */,
 				5D61FBD41A84238B00846EE7 /* SDLSystemRequestResponse.h */,
@@ -3094,8 +3094,8 @@
 				5D61FBFD1A84238C00846EE7 /* SDLUnsubscribeButtonResponse.m */,
 				5D61FC001A84238C00846EE7 /* SDLUnsubscribeVehicleDataResponse.h */,
 				5D61FC011A84238C00846EE7 /* SDLUnsubscribeVehicleDataResponse.m */,
-				DA9F7E8D1DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.h */,
-				DA9F7E8E1DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.m */,
+				DA9F7E8D1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.h */,
+				DA9F7E8E1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.m */,
 				5D61FC061A84238C00846EE7 /* SDLUpdateTurnListResponse.h */,
 				5D61FC071A84238C00846EE7 /* SDLUpdateTurnListResponse.m */,
 			);
@@ -3361,8 +3361,8 @@
 				5D61FC211A84238C00846EE7 /* SDLVrCapabilities.m */,
 				5D61FC241A84238C00846EE7 /* SDLWarningLightStatus.h */,
 				5D61FC251A84238C00846EE7 /* SDLWarningLightStatus.m */,
-				DA9F7E811DCC047200ACAE48 /* SDLWaypointType.h */,
-				DA9F7E821DCC047200ACAE48 /* SDLWaypointType.m */,
+				DA9F7E811DCC047200ACAE48 /* SDLWayPointType.h */,
+				DA9F7E821DCC047200ACAE48 /* SDLWayPointType.m */,
 				5D61FC261A84238C00846EE7 /* SDLWiperStatus.h */,
 				5D61FC271A84238C00846EE7 /* SDLWiperStatus.m */,
 				8B7B31981F2F7B5700BDC38D /* SDLVideoStreamingCodec.h */,
@@ -3452,8 +3452,8 @@
 				5D61FB331A84238B00846EE7 /* SDLOnTouchEvent.m */,
 				5D61FB341A84238B00846EE7 /* SDLOnVehicleData.h */,
 				5D61FB351A84238B00846EE7 /* SDLOnVehicleData.m */,
-				DA9F7E7D1DCC028B00ACAE48 /* SDLOnWaypointChange.h */,
-				DA9F7E7E1DCC028B00ACAE48 /* SDLOnWaypointChange.m */,
+				DA9F7E7D1DCC028B00ACAE48 /* SDLOnWayPointChange.h */,
+				DA9F7E7E1DCC028B00ACAE48 /* SDLOnWayPointChange.m */,
 			);
 			name = Notification;
 			sourceTree = "<group>";
@@ -4321,7 +4321,7 @@
 				5D61FCC91A84238C00846EE7 /* SDLIgnitionStableStatus.h in Headers */,
 				DA9F7E6B1DCBFB0700ACAE48 /* SDLDeliveryMode.h in Headers */,
 				E9C32B941AB20BA200F283AF /* SDLStreamDelegate.h in Headers */,
-				DA9F7E871DCC049900ACAE48 /* SDLSubscribeWaypoints.h in Headers */,
+				DA9F7E871DCC049900ACAE48 /* SDLSubscribeWayPoints.h in Headers */,
 				5D61FDBB1A84238C00846EE7 /* SDLSystemAction.h in Headers */,
 				5D61FC9C1A84238C00846EE7 /* SDLEmergencyEventType.h in Headers */,
 				5D61FD131A84238C00846EE7 /* SDLOnLanguageChange.h in Headers */,
@@ -4411,7 +4411,7 @@
 				5D61FC491A84238C00846EE7 /* SDLAudioType.h in Headers */,
 				5D61FC761A84238C00846EE7 /* SDLDeleteFile.h in Headers */,
 				5D61FD211A84238C00846EE7 /* SDLOnVehicleData.h in Headers */,
-				DA9F7E731DCC004C00ACAE48 /* SDLGetWaypointsResponse.h in Headers */,
+				DA9F7E731DCC004C00ACAE48 /* SDLGetWayPointsResponse.h in Headers */,
 				88EED8381F33AE1700E6C42E /* SDLHapticRect.h in Headers */,
 				5DD67CC31E68AE82009CD394 /* SDLLogFileModuleMap.h in Headers */,
 				EED5C9FE1F4D18D100F04000 /* SDLH264Packetizer.h in Headers */,
@@ -4463,7 +4463,7 @@
 				5D61FC981A84238C00846EE7 /* SDLECallInfo.h in Headers */,
 				5D9FDA921F2A7D3400A495C8 /* bson_object.h in Headers */,
 				5D61FD7B1A84238C00846EE7 /* SDLScrollableMessage.h in Headers */,
-				DA9F7E931DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.h in Headers */,
+				DA9F7E931DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.h in Headers */,
 				5D61FD3D1A84238C00846EE7 /* SDLPrimaryAudioSource.h in Headers */,
 				DAC5725C1D10B81E0004288B /* SDLTouch.h in Headers */,
 				5D6F7A2E1BC5650B0070BF37 /* SDLLifecycleConfiguration.h in Headers */,
@@ -4486,7 +4486,7 @@
 				5D61FD651A84238C00846EE7 /* SDLResetGlobalPropertiesResponse.h in Headers */,
 				DA9F7E671DCBFAD400ACAE48 /* SDLOasisAddress.h in Headers */,
 				5D61FD611A84238C00846EE7 /* SDLRequestType.h in Headers */,
-				DA9F7E8B1DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.h in Headers */,
+				DA9F7E8B1DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.h in Headers */,
 				5D61FCEC1A84238C00846EE7 /* SDLListFiles.h in Headers */,
 				5D2F58081D0717D5001085CE /* SDLManagerDelegate.h in Headers */,
 				5D61FC881A84238C00846EE7 /* SDLDiagnosticMessage.h in Headers */,
@@ -4549,7 +4549,7 @@
 				5D61FE011A84238C00846EE7 /* SDLVehicleDataNotificationStatus.h in Headers */,
 				5D61FDC91A84238C00846EE7 /* SDLTextField.h in Headers */,
 				5D6F7A351BC5B9B60070BF37 /* SDLLockScreenViewController.h in Headers */,
-				DA9F7E7F1DCC028B00ACAE48 /* SDLOnWaypointChange.h in Headers */,
+				DA9F7E7F1DCC028B00ACAE48 /* SDLOnWayPointChange.h in Headers */,
 				5D61FCE41A84238C00846EE7 /* SDLKeyboardProperties.h in Headers */,
 				5D61FDED1A84238C00846EE7 /* SDLUnsubscribeVehicleDataResponse.h in Headers */,
 				5D4631041F2120A30092EFDC /* SDLControlFramePayloadType.h in Headers */,
@@ -4557,7 +4557,7 @@
 				5D61FCCF1A84238C00846EE7 /* SDLImageField.h in Headers */,
 				5D535DC51B72473800CF7760 /* SDLGlobals.h in Headers */,
 				5D79A03B1CE36F030035797B /* SDLUploadFileOperation.h in Headers */,
-				DA9F7E6F1DCBFFDB00ACAE48 /* SDLGetWaypoints.h in Headers */,
+				DA9F7E6F1DCBFFDB00ACAE48 /* SDLGetWayPoints.h in Headers */,
 				5D61FD231A84238C00846EE7 /* SDLParameterPermissions.h in Headers */,
 				5D61FCB91A84238C00846EE7 /* SDLGlobalProperty.h in Headers */,
 				5D61FE051A84238C00846EE7 /* SDLVehicleDataResultCode.h in Headers */,
@@ -4621,7 +4621,7 @@
 				5D4631101F2135850092EFDC /* SDLControlFramePayloadConstants.h in Headers */,
 				5D7F87EF1CE3C294002DD7C4 /* SDLFileManagerConstants.h in Headers */,
 				5D61FCAD1A84238C00846EE7 /* SDLFunctionID.h in Headers */,
-				DA9F7E831DCC047200ACAE48 /* SDLWaypointType.h in Headers */,
+				DA9F7E831DCC047200ACAE48 /* SDLWayPointType.h in Headers */,
 				5D61FDF51A84238C00846EE7 /* SDLV1ProtocolHeader.h in Headers */,
 				5DBF06351E64A9FE00A5CF03 /* SDLLogConstants.h in Headers */,
 				DAC572671D10C5640004288B /* CGPoint_Util.h in Headers */,
@@ -4638,7 +4638,7 @@
 				5DBF06311E64A9C600A5CF03 /* SDLLogModel.h in Headers */,
 				5D7F87EB1CE3C1A1002DD7C4 /* SDLDeleteFileOperation.h in Headers */,
 				5D61FCFC1A84238C00846EE7 /* SDLNames.h in Headers */,
-				DA9F7E8F1DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.h in Headers */,
+				DA9F7E8F1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.h in Headers */,
 				5D61FCFD1A84238C00846EE7 /* SDLObjectWithPriority.h in Headers */,
 				DAC5726C1D11B4840004288B /* SDLTouchManagerDelegate.h in Headers */,
 				5D61FD3F1A84238C00846EE7 /* SDLPrioritizedObjectCollection.h in Headers */,
@@ -4868,7 +4868,7 @@
 				5DA8A0EA1E955FE00039C50D /* SDLLogModel.m in Sources */,
 				5DA8A0E91E955F710039C50D /* SDLStreamingMediaManagerConstants.m in Sources */,
 				332A914F1CED9CC60043824C /* SDLAppInfo.m in Sources */,
-				DA9F7E841DCC047200ACAE48 /* SDLWaypointType.m in Sources */,
+				DA9F7E841DCC047200ACAE48 /* SDLWayPointType.m in Sources */,
 				5D61FC561A84238C00846EE7 /* SDLButtonName.m in Sources */,
 				5D61FCC21A84238C00846EE7 /* SDLHMILevel.m in Sources */,
 				5D61FDEC1A84238C00846EE7 /* SDLUnsubscribeVehicleData.m in Sources */,
@@ -4899,7 +4899,7 @@
 				5D61FD0C1A84238C00846EE7 /* SDLOnEncodedSyncPData.m in Sources */,
 				5D61FD0A1A84238C00846EE7 /* SDLOnDriverDistraction.m in Sources */,
 				5D61FCED1A84238C00846EE7 /* SDLListFiles.m in Sources */,
-				DA9F7E801DCC028B00ACAE48 /* SDLOnWaypointChange.m in Sources */,
+				DA9F7E801DCC028B00ACAE48 /* SDLOnWayPointChange.m in Sources */,
 				5D61FC6E1A84238C00846EE7 /* SDLCreateInteractionChoiceSetResponse.m in Sources */,
 				5D61FD061A84238C00846EE7 /* SDLOnButtonPress.m in Sources */,
 				5D61FD5E1A84238C00846EE7 /* SDLRegisterAppInterface.m in Sources */,
@@ -4933,7 +4933,7 @@
 				5D61FDFE1A84238C00846EE7 /* SDLVehicleDataActiveStatus.m in Sources */,
 				5D61FCD01A84238C00846EE7 /* SDLImageField.m in Sources */,
 				5D61FC3C1A84238C00846EE7 /* SDLAlertManeuverResponse.m in Sources */,
-				DA9F7E741DCC004C00ACAE48 /* SDLGetWaypointsResponse.m in Sources */,
+				DA9F7E741DCC004C00ACAE48 /* SDLGetWayPointsResponse.m in Sources */,
 				5D61FD4D1A84238C00846EE7 /* SDLProtocolMessageDisassembler.m in Sources */,
 				5D61FD4B1A84238C00846EE7 /* SDLProtocolMessageAssembler.m in Sources */,
 				5D61FCC41A84238C00846EE7 /* SDLHMIPermissions.m in Sources */,
@@ -4976,7 +4976,7 @@
 				5D61FCF71A84238C00846EE7 /* SDLMediaClockFormat.m in Sources */,
 				5D61FD8A1A84238C00846EE7 /* SDLSetGlobalPropertiesResponse.m in Sources */,
 				5D61FC4C1A84238C00846EE7 /* SDLBeltStatus.m in Sources */,
-				DA9F7E8C1DCC04B000ACAE48 /* SDLSubscribeWaypointsResponse.m in Sources */,
+				DA9F7E8C1DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.m in Sources */,
 				5D61FDA41A84238C00846EE7 /* SDLSoftButtonType.m in Sources */,
 				5D00AC6C1F141339004000D9 /* SDLSystemCapability.m in Sources */,
 				5D61FC521A84238C00846EE7 /* SDLButtonCapabilities.m in Sources */,
@@ -5069,7 +5069,7 @@
 				5D61FCCA1A84238C00846EE7 /* SDLIgnitionStableStatus.m in Sources */,
 				5D61FCFB1A84238C00846EE7 /* SDLMyKey.m in Sources */,
 				5D61FCAA1A84238C00846EE7 /* SDLFileType.m in Sources */,
-				DA9F7E901DCC04C000ACAE48 /* SDLUnsubscribeWaypointsResponse.m in Sources */,
+				DA9F7E901DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.m in Sources */,
 				5DE372A21ACB2ED300849FAA /* SDLHMICapabilities.m in Sources */,
 				5D61FDD41A84238C00846EE7 /* SDLTouchEvent.m in Sources */,
 				5D61FD881A84238C00846EE7 /* SDLSetGlobalProperties.m in Sources */,
@@ -5081,13 +5081,13 @@
 				5D61FCB81A84238C00846EE7 /* SDLGetVehicleDataResponse.m in Sources */,
 				5D61FC661A84238C00846EE7 /* SDLCompassDirection.m in Sources */,
 				5D61FD841A84238C00846EE7 /* SDLSetDisplayLayout.m in Sources */,
-				DA9F7E701DCBFFDB00ACAE48 /* SDLGetWaypoints.m in Sources */,
+				DA9F7E701DCBFFDB00ACAE48 /* SDLGetWayPoints.m in Sources */,
 				5D00AC741F151CFE004000D9 /* SDLGetSystemCapabilityResponse.m in Sources */,
 				5D61FE001A84238C00846EE7 /* SDLVehicleDataEventStatus.m in Sources */,
 				5D61FDC41A84238C00846EE7 /* SDLTBTState.m in Sources */,
 				5D61FDA61A84238C00846EE7 /* SDLSpeak.m in Sources */,
 				5D4631111F2135850092EFDC /* SDLControlFramePayloadConstants.m in Sources */,
-				DA9F7E881DCC049900ACAE48 /* SDLSubscribeWaypoints.m in Sources */,
+				DA9F7E881DCC049900ACAE48 /* SDLSubscribeWayPoints.m in Sources */,
 				5D61FDDE1A84238C00846EE7 /* SDLTTSChunk.m in Sources */,
 				5D61FD9E1A84238C00846EE7 /* SDLSliderResponse.m in Sources */,
 				5D61FC5C1A84238C00846EE7 /* SDLChangeRegistration.m in Sources */,
@@ -5194,7 +5194,7 @@
 				5D61FC931A84238C00846EE7 /* SDLDisplayType.m in Sources */,
 				5D61FCE31A84238C00846EE7 /* SDLKeyboardLayout.m in Sources */,
 				5D61FE0C1A84238C00846EE7 /* SDLVehicleType.m in Sources */,
-				DA9F7E941DCC04E400ACAE48 /* SDLUnsubscribeWaypoints.m in Sources */,
+				DA9F7E941DCC04E400ACAE48 /* SDLUnsubscribeWayPoints.m in Sources */,
 				5D61FDCC1A84238C00846EE7 /* SDLTextFieldName.m in Sources */,
 				5D61FC751A84238C00846EE7 /* SDLDeleteCommandResponse.m in Sources */,
 				5DA3F3711BC4489A0026F2D0 /* SDLManager.m in Sources */,
diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec
index b14c8785f..3aca1eaeb 100644
--- a/SmartDeviceLink.podspec
+++ b/SmartDeviceLink.podspec
@@ -174,7 +174,7 @@ ss.public_header_files = [
 'SmartDeviceLink/SDLOnTBTClientState.h',
 'SmartDeviceLink/SDLOnTouchEvent.h',
 'SmartDeviceLink/SDLOnVehicleData.h',
-'SmartDeviceLink/SDLOnWaypointChange.h',
+'SmartDeviceLink/SDLOnWayPointChange.h',
 'SmartDeviceLink/SDLParameterPermissions.h',
 'SmartDeviceLink/SDLPerformAudioPassThru.h',
 'SmartDeviceLink/SDLPerformAudioPassThruResponse.h',
@@ -309,7 +309,7 @@ ss.public_header_files = [
 'SmartDeviceLink/SDLVrCapabilities.h',
 'SmartDeviceLink/SDLVrHelpItem.h',
 'SmartDeviceLink/SDLWarningLightStatus.h',
-'SmartDeviceLink/SDLWaypointType.h',
+'SmartDeviceLink/SDLWayPointType.h',
 'SmartDeviceLink/SDLWiperStatus.h',
 'SmartDeviceLink/SmartDeviceLink.h',
 ]
diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m
index ed8f32d02..c18cdc2cb 100644
--- a/SmartDeviceLink/SDLFunctionID.m
+++ b/SmartDeviceLink/SDLFunctionID.m
@@ -71,9 +71,9 @@ NS_ASSUME_NONNULL_BEGIN
                          @38: SDLNameSystemRequest,
                          @39: SDLNameSendLocation,
                          @40: SDLNameDialNumber,
-                         @45: SDLNameGetWaypoints,
-                         @46: SDLNameSubscribeWaypoints,
-                         @47: SDLNameUnsubscribeWaypoints,
+                         @45: SDLNameGetWayPoints,
+                         @46: SDLNameSubscribeWayPoints,
+                         @47: SDLNameUnsubscribeWayPoints,
                          @48: SDLNameGetSystemCapability,
                          @49: SDLNameSendHapticData,
                          @32768: SDLNameOnHMIStatus,
@@ -91,7 +91,7 @@ NS_ASSUME_NONNULL_BEGIN
                          @32780: SDLNameOnTouchEvent,
                          @32781: SDLNameOnSystemRequest,
                          @32782: SDLNameOnHashChange,
-                         @32784: SDLNameOnWaypointChange,
+                         @32784: SDLNameOnWayPointChange,
                          @65536: SDLNameEncodedSyncPData,
                          @65537: SDLNameSyncPData,
                          @98304: SDLNameOnEncodedSyncPData,
diff --git a/SmartDeviceLink/SDLGetWaypoints.h b/SmartDeviceLink/SDLGetWayPoints.h
index cd07aab2c..be84df565 100644
--- a/SmartDeviceLink/SDLGetWaypoints.h
+++ b/SmartDeviceLink/SDLGetWayPoints.h
@@ -3,13 +3,13 @@
 
 #import "SDLRPCRequest.h"
 
-#import "SDLWaypointType.h"
+#import "SDLWayPointType.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface SDLGetWayPoints : SDLRPCRequest
 
-- (instancetype)initWithType:(SDLWaypointType)type;
+- (instancetype)initWithType:(SDLWayPointType)type;
 
 /**
  * To request for either the destination
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * Required
  */
-@property (nullable, strong, nonatomic) SDLWaypointType waypointType;
+@property (nullable, strong, nonatomic) SDLWayPointType waypointType;
 
 @end
 
diff --git a/SmartDeviceLink/SDLGetWayPoints.m b/SmartDeviceLink/SDLGetWayPoints.m
new file mode 100644
index 000000000..74eba337c
--- /dev/null
+++ b/SmartDeviceLink/SDLGetWayPoints.m
@@ -0,0 +1,41 @@
+//  SDLGetWaypoints.m
+//
+
+#import "SDLGetWayPoints.h"
+
+#import "NSMutableDictionary+Store.h"
+#import "SDLNames.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation SDLGetWayPoints
+
+- (instancetype)init {
+    if (self = [super initWithName:SDLNameGetWayPoints]) {
+    }
+    return self;
+}
+
+
+- (instancetype)initWithType:(SDLWayPointType)type {
+    self = [self init];
+    if (!self) {
+        return nil;
+    }
+
+    self.waypointType = type;
+
+    return self;
+}
+
+- (void)setWaypointType:(nullable SDLWayPointType)waypointType {
+    [parameters sdl_setObject:waypointType forName:SDLNameWayPointType];
+}
+
+- (nullable SDLWayPointType)waypointType {
+    return [parameters sdl_objectForName:SDLNameWayPointType];
+}
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.h b/SmartDeviceLink/SDLGetWayPointsResponse.h
index ab3882192..ab3882192 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.h
+++ b/SmartDeviceLink/SDLGetWayPointsResponse.h
diff --git a/SmartDeviceLink/SDLGetWaypointsResponse.m b/SmartDeviceLink/SDLGetWayPointsResponse.m
index 1ac361ccf..b2f5e6291 100644
--- a/SmartDeviceLink/SDLGetWaypointsResponse.m
+++ b/SmartDeviceLink/SDLGetWayPointsResponse.m
@@ -1,7 +1,7 @@
 //  SDLGetWaypointsResponse.m
 //
 
-#import "SDLGetWaypointsResponse.h"
+#import "SDLGetWayPointsResponse.h"
 
 #import "NSMutableDictionary+Store.h"
 #import "SDLLocationDetails.h"
@@ -12,17 +12,17 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLGetWayPointsResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameGetWaypoints]) {
+    if (self = [super initWithName:SDLNameGetWayPoints]) {
     }
     return self;
 }
 
 - (void)setWaypoints:(nullable NSArray<SDLLocationDetails *> *)waypoints {
-    [parameters sdl_setObject:waypoints forName:SDLNameWaypoints];
+    [parameters sdl_setObject:waypoints forName:SDLNameWayPoints];
 }
 
 - (nullable NSArray<SDLLocationDetails *> *)waypoints {
-    return [parameters sdl_objectsForName:SDLNameWaypoints ofClass:SDLLocationDetails.class];
+    return [parameters sdl_objectsForName:SDLNameWayPoints ofClass:SDLLocationDetails.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLGetWaypoints.m b/SmartDeviceLink/SDLGetWaypoints.m
deleted file mode 100644
index bbdc4d1ac..000000000
--- a/SmartDeviceLink/SDLGetWaypoints.m
+++ /dev/null
@@ -1,41 +0,0 @@
-//  SDLGetWaypoints.m
-//
-
-#import "SDLGetWaypoints.h"
-
-#import "NSMutableDictionary+Store.h"
-#import "SDLNames.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@implementation SDLGetWayPoints
-
-- (instancetype)init {
-    if (self = [super initWithName:SDLNameGetWaypoints]) {
-    }
-    return self;
-}
-
-
-- (instancetype)initWithType:(SDLWaypointType)type {
-    self = [self init];
-    if (!self) {
-        return nil;
-    }
-
-    self.waypointType = type;
-
-    return self;
-}
-
-- (void)setWaypointType:(nullable SDLWaypointType)waypointType {
-    [parameters sdl_setObject:waypointType forName:SDLNameWaypointType];
-}
-
-- (nullable SDLWaypointType)waypointType {
-    return [parameters sdl_objectForName:SDLNameWaypointType];
-}
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h
index 1a3cd54bb..91bdbab8c 100644
--- a/SmartDeviceLink/SDLNames.h
+++ b/SmartDeviceLink/SDLNames.h
@@ -133,8 +133,8 @@ extern SDLName const SDLNameGenericResponse;
 extern SDLName const SDLNameGetDTCs;
 extern SDLName const SDLNameGetSystemCapability;
 extern SDLName const SDLNameGetVehicleData;
-extern SDLName const SDLNameGetWaypoints;
-extern SDLName const SDLNameGetWaypointsEnabled;
+extern SDLName const SDLNameGetWayPoints;
+extern SDLName const SDLNameGetWayPointsEnabled;
 extern SDLName const SDLNameGPS;
 extern SDLName const SDLNameGraphic;
 extern SDLName const SDLNameGraphicSupported;
@@ -278,7 +278,7 @@ extern SDLName const SDLNameOnSystemRequest;
 extern SDLName const SDLNameOnTBTClientState;
 extern SDLName const SDLNameOnTouchEvent;
 extern SDLName const SDLNameOnVehicleData;
-extern SDLName const SDLNameOnWaypointChange;
+extern SDLName const SDLNameOnWayPointChange;
 extern SDLName const SDLNameOperationName;
 extern SDLName const SDLNameOS;
 extern SDLName const SDLNameOSVersion;
@@ -394,7 +394,7 @@ extern SDLName const SDLNameSubLocality;
 extern SDLName const SDLNameSubscribe;
 extern SDLName const SDLNameSubscribeButton;
 extern SDLName const SDLNameSubscribeVehicleData;
-extern SDLName const SDLNameSubscribeWaypoints;
+extern SDLName const SDLNameSubscribeWayPoints;
 extern SDLName const SDLNameSubThoroughfare;
 extern SDLName const SDLNameSuccess;
 extern SDLName const SDLNameSupportedDiagnosticModes;
@@ -438,7 +438,7 @@ extern SDLName const SDLNameUnregisterAppInterface;
 extern SDLName const SDLNameUnsubscribe;
 extern SDLName const SDLNameUnsubscribeButton;
 extern SDLName const SDLNameUnsubscribeVehicleData;
-extern SDLName const SDLNameUnsubscribeWaypoints;
+extern SDLName const SDLNameUnsubscribeWayPoints;
 extern SDLName const SDLNameUpdateMode;
 extern SDLName const SDLNameUpdateTurnList;
 extern SDLName const SDLNameUpDownAvailable;
@@ -466,8 +466,8 @@ extern SDLName const SDLNameVRCommands;
 extern SDLName const SDLNameVRHelp;
 extern SDLName const SDLNameVRHelpTitle;
 extern SDLName const SDLNameVRSynonyms;
-extern SDLName const SDLNameWaypoints;
-extern SDLName const SDLNameWaypointType;
+extern SDLName const SDLNameWayPoints;
+extern SDLName const SDLNameWayPointType;
 extern SDLName const SDLNameWidth;
 extern SDLName const SDLNameWiperStatus;
 extern SDLName const SDLNameX;
diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m
index 264bac81a..084d3397f 100644
--- a/SmartDeviceLink/SDLNames.m
+++ b/SmartDeviceLink/SDLNames.m
@@ -130,8 +130,8 @@ SDLName const SDLNameGenericResponse = @"GenericResponse";
 SDLName const SDLNameGetDTCs = @"GetDTCs";
 SDLName const SDLNameGetSystemCapability = @"GetSystemCapability";
 SDLName const SDLNameGetVehicleData = @"GetVehicleData";
-SDLName const SDLNameGetWaypoints = @"GetWayPoints";
-SDLName const SDLNameGetWaypointsEnabled = @"getWayPointsEnabled";
+SDLName const SDLNameGetWayPoints = @"GetWayPoints";
+SDLName const SDLNameGetWayPointsEnabled = @"getWayPointsEnabled";
 SDLName const SDLNameGPS = @"gps";
 SDLName const SDLNameGraphic = @"graphic";
 SDLName const SDLNameGraphicSupported = @"graphicSupported";
@@ -272,7 +272,7 @@ SDLName const SDLNameOnSystemRequest = @"OnSystemRequest";
 SDLName const SDLNameOnTBTClientState = @"OnTBTClientState";
 SDLName const SDLNameOnTouchEvent = @"OnTouchEvent";
 SDLName const SDLNameOnVehicleData = @"OnVehicleData";
-SDLName const SDLNameOnWaypointChange = @"OnWayPointChange";
+SDLName const SDLNameOnWayPointChange = @"OnWayPointChange";
 SDLName const SDLNameOperationName = @"name";
 SDLName const SDLNameOS = @"os";
 SDLName const SDLNameOSVersion = @"osVersion";
@@ -388,7 +388,7 @@ SDLName const SDLNameSubLocality = @"subLocality";
 SDLName const SDLNameSubscribe = @"Subscribe";
 SDLName const SDLNameSubscribeButton = @"SubscribeButton";
 SDLName const SDLNameSubscribeVehicleData = @"SubscribeVehicleData";
-SDLName const SDLNameSubscribeWaypoints = @"SubscribeWayPoints";
+SDLName const SDLNameSubscribeWayPoints = @"SubscribeWayPoints";
 SDLName const SDLNameSubThoroughfare = @"subThoroughfare";
 SDLName const SDLNameSuccess = @"success";
 SDLName const SDLNameSupportedDiagnosticModes = @"supportedDiagModes";
@@ -433,7 +433,7 @@ SDLName const SDLNameUnregisterAppInterface = @"UnregisterAppInterface";
 SDLName const SDLNameUnsubscribe = @"Unsubscribe";
 SDLName const SDLNameUnsubscribeButton = @"UnsubscribeButton";
 SDLName const SDLNameUnsubscribeVehicleData = @"UnsubscribeVehicleData";
-SDLName const SDLNameUnsubscribeWaypoints = @"UnsubscribeWayPoints";
+SDLName const SDLNameUnsubscribeWayPoints = @"UnsubscribeWayPoints";
 SDLName const SDLNameUpdateMode = @"updateMode";
 SDLName const SDLNameUpdateTurnList = @"UpdateTurnList";
 SDLName const SDLNameUpDownAvailable = @"upDownAvailable";
@@ -461,8 +461,8 @@ SDLName const SDLNameVRCommands = @"vrCommands";
 SDLName const SDLNameVRHelp = @"vrHelp";
 SDLName const SDLNameVRHelpTitle = @"vrHelpTitle";
 SDLName const SDLNameVRSynonyms = @"vrSynonyms";
-SDLName const SDLNameWaypoints = @"wayPoints";
-SDLName const SDLNameWaypointType = @"wayPointType";
+SDLName const SDLNameWayPoints = @"wayPoints";
+SDLName const SDLNameWayPointType = @"wayPointType";
 SDLName const SDLNameWidth = @"width";
 SDLName const SDLNameWiperStatus = @"wiperStatus";
 SDLName const SDLNameX = @"x";
diff --git a/SmartDeviceLink/SDLNavigationCapability.m b/SmartDeviceLink/SDLNavigationCapability.m
index c86f6f494..ffacc2d52 100644
--- a/SmartDeviceLink/SDLNavigationCapability.m
+++ b/SmartDeviceLink/SDLNavigationCapability.m
@@ -36,11 +36,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)setGetWayPointsEnabled:(nullable NSNumber *)getWayPointsEnabled {
-    [store sdl_setObject:getWayPointsEnabled forName:SDLNameGetWaypointsEnabled];
+    [store sdl_setObject:getWayPointsEnabled forName:SDLNameGetWayPointsEnabled];
 }
 
 - (nullable NSNumber *)getWayPointsEnabled {
-    return [store sdl_objectForName:SDLNameGetWaypointsEnabled];
+    return [store sdl_objectForName:SDLNameGetWayPointsEnabled];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLNotificationDispatcher.m b/SmartDeviceLink/SDLNotificationDispatcher.m
index 81fbeee76..3da6e790a 100644
--- a/SmartDeviceLink/SDLNotificationDispatcher.m
+++ b/SmartDeviceLink/SDLNotificationDispatcher.m
@@ -234,7 +234,7 @@ NS_ASSUME_NONNULL_BEGIN
     [self postRPCResponseNotification:SDLDidReceiveSubscribeVehicleDataResponse response:response];
 }
 
-- (void)onSubscribeWayPointsResponse:(SDLSubscribeWaypointsResponse *)response {
+- (void)onSubscribeWayPointsResponse:(SDLSubscribeWayPointsResponse *)response {
     [self postRPCResponseNotification:SDLDidReceiveSubscribeWaypointsResponse response:response];
 }
 
@@ -258,7 +258,7 @@ NS_ASSUME_NONNULL_BEGIN
     [self postRPCResponseNotification:SDLDidReceiveUnsubscribeVehicleDataResponse response:response];
 }
 
-- (void)onUnsubscribeWayPointsResponse:(SDLUnsubscribeWaypointsResponse *)response {
+- (void)onUnsubscribeWayPointsResponse:(SDLUnsubscribeWayPointsResponse *)response {
     [self postRPCResponseNotification:SDLDidReceiveUnsubscribeWaypointsResponse response:response];
 }
 
@@ -326,7 +326,7 @@ NS_ASSUME_NONNULL_BEGIN
     [self postRPCNotificationNotification:SDLDidReceiveVehicleDataNotification notification:notification];
 }
 
-- (void)onOnWayPointChange:(SDLOnWaypointChange *)notification {
+- (void)onOnWayPointChange:(SDLOnWayPointChange *)notification {
     [self postRPCNotificationNotification:SDLDidReceiveWaypointNotification notification:notification];
 }
 
diff --git a/SmartDeviceLink/SDLOnWaypointChange.h b/SmartDeviceLink/SDLOnWayPointChange.h
index f05eca64c..bfcbff1a4 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.h
+++ b/SmartDeviceLink/SDLOnWayPointChange.h
@@ -1,4 +1,4 @@
-//  SDLOnWaypointChange.h
+//  SDLOnWayPointChange.h
 //
 
 #import "SDLRPCNotification.h"
diff --git a/SmartDeviceLink/SDLOnWaypointChange.m b/SmartDeviceLink/SDLOnWayPointChange.m
index f0bf46795..70c7c4242 100644
--- a/SmartDeviceLink/SDLOnWaypointChange.m
+++ b/SmartDeviceLink/SDLOnWayPointChange.m
@@ -1,7 +1,7 @@
-//  SDLOnWaypointChange.m
+//  SDLOnWayPointChange.m
 //
 
-#import "SDLOnWaypointChange.h"
+#import "SDLOnWayPointChange.h"
 
 #import "NSMutableDictionary+Store.h"
 #import "SDLLocationDetails.h"
@@ -12,17 +12,17 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLOnWayPointChange
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameOnWaypointChange]) {
+    if (self = [super initWithName:SDLNameOnWayPointChange]) {
     }
     return self;
 }
 
 - (void)setWaypoints:(NSArray<SDLLocationDetails *> *)waypoints {
-    [parameters sdl_setObject:waypoints forName:SDLNameWaypoints];
+    [parameters sdl_setObject:waypoints forName:SDLNameWayPoints];
 }
 
 - (NSArray<SDLLocationDetails *> *)waypoints {
-    return [parameters sdl_objectsForName:SDLNameWaypoints ofClass:SDLLocationDetails.class];
+    return [parameters sdl_objectsForName:SDLNameWayPoints ofClass:SDLLocationDetails.class];
 }
 
 @end
diff --git a/SmartDeviceLink/SDLProxyListener.h b/SmartDeviceLink/SDLProxyListener.h
index a4b1e3c43..64c177579 100644
--- a/SmartDeviceLink/SDLProxyListener.h
+++ b/SmartDeviceLink/SDLProxyListener.h
@@ -42,7 +42,7 @@
 @class SDLOnTBTClientState;
 @class SDLOnTouchEvent;
 @class SDLOnVehicleData;
-@class SDLOnWaypointChange;
+@class SDLOnWayPointChange;
 @class SDLPerformAudioPassThruResponse;
 @class SDLPerformInteractionResponse;
 @class SDLPutFileResponse;
@@ -62,13 +62,13 @@
 @class SDLSpeakResponse;
 @class SDLSubscribeButtonResponse;
 @class SDLSubscribeVehicleDataResponse;
-@class SDLSubscribeWaypointsResponse;
+@class SDLSubscribeWayPointsResponse;
 @class SDLSyncPDataResponse;
 @class SDLUpdateTurnListResponse;
 @class SDLUnregisterAppInterfaceResponse;
 @class SDLUnsubscribeButtonResponse;
 @class SDLUnsubscribeVehicleDataResponse;
-@class SDLUnsubscribeWaypointsResponse;
+@class SDLUnsubscribeWayPointsResponse;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -119,7 +119,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (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;
@@ -139,13 +139,13 @@ NS_ASSUME_NONNULL_BEGIN
 - (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 d7fd129bc..d7fd129bc 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.h
+++ b/SmartDeviceLink/SDLSubscribeWayPoints.h
diff --git a/SmartDeviceLink/SDLSubscribeWaypoints.m b/SmartDeviceLink/SDLSubscribeWayPoints.m
index e4b9876d2..cec91c636 100644
--- a/SmartDeviceLink/SDLSubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLSubscribeWayPoints.m
@@ -1,7 +1,7 @@
 //  SDLSubscribeWaypoints.m
 //
 
-#import "SDLSubscribeWaypoints.h"
+#import "SDLSubscribeWayPoints.h"
 
 #import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLSubscribeWayPoints
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameSubscribeWaypoints]) {
+    if (self = [super initWithName:SDLNameSubscribeWayPoints]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h b/SmartDeviceLink/SDLSubscribeWayPointsResponse.h
index 86a1f58d2..86a1f58d2 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.h
+++ b/SmartDeviceLink/SDLSubscribeWayPointsResponse.h
diff --git a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m b/SmartDeviceLink/SDLSubscribeWayPointsResponse.m
index 1353490a8..11aa5a04b 100644
--- a/SmartDeviceLink/SDLSubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLSubscribeWayPointsResponse.m
@@ -2,7 +2,7 @@
 //  SDLSubscribeWaypointsResponse.m
 //
 
-#import "SDLSubscribeWaypointsResponse.h"
+#import "SDLSubscribeWayPointsResponse.h"
 
 #import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLSubscribeWayPointsResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameSubscribeWaypoints]) {
+    if (self = [super initWithName:SDLNameSubscribeWayPoints]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.h b/SmartDeviceLink/SDLUnsubscribeWayPoints.h
index 5edce6bf5..5edce6bf5 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.h
+++ b/SmartDeviceLink/SDLUnsubscribeWayPoints.h
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypoints.m b/SmartDeviceLink/SDLUnsubscribeWayPoints.m
index 83ffaf16b..4504eba66 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypoints.m
+++ b/SmartDeviceLink/SDLUnsubscribeWayPoints.m
@@ -1,7 +1,7 @@
 //  SDLUnsubscribeWaypoints.m
 //
 
-#import "SDLUnsubscribeWaypoints.h"
+#import "SDLUnsubscribeWayPoints.h"
 
 #import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLUnsubscribeWayPoints
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameUnsubscribeWaypoints]) {
+    if (self = [super initWithName:SDLNameUnsubscribeWayPoints]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h b/SmartDeviceLink/SDLUnsubscribeWayPointsResponse.h
index 5919546e2..5919546e2 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.h
+++ b/SmartDeviceLink/SDLUnsubscribeWayPointsResponse.h
diff --git a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m b/SmartDeviceLink/SDLUnsubscribeWayPointsResponse.m
index 89bb290d7..2db5d017f 100644
--- a/SmartDeviceLink/SDLUnsubscribeWaypointsResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeWayPointsResponse.m
@@ -1,7 +1,7 @@
 //  SDLUnsubscribeWaypointsResponse.m
 //
 
-#import "SDLUnsubscribeWaypointsResponse.h"
+#import "SDLUnsubscribeWayPointsResponse.h"
 
 #import "NSMutableDictionary+Store.h"
 #import "SDLNames.h"
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLUnsubscribeWayPointsResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameUnsubscribeWaypoints]) {
+    if (self = [super initWithName:SDLNameUnsubscribeWayPoints]) {
     }
     return self;
 }
diff --git a/SmartDeviceLink/SDLWayPointType.h b/SmartDeviceLink/SDLWayPointType.h
new file mode 100644
index 000000000..6659b79a3
--- /dev/null
+++ b/SmartDeviceLink/SDLWayPointType.h
@@ -0,0 +1,9 @@
+//  SDLWaypointType.h
+//
+
+#import "SDLEnum.h"
+
+typedef SDLEnum SDLWayPointType SDL_SWIFT_ENUM;
+
+extern SDLWayPointType const SDLWayPointTypeAll;
+extern SDLWayPointType const SDLWayPointTypeDestination;
diff --git a/SmartDeviceLink/SDLWayPointType.m b/SmartDeviceLink/SDLWayPointType.m
new file mode 100644
index 000000000..bfed8bc66
--- /dev/null
+++ b/SmartDeviceLink/SDLWayPointType.m
@@ -0,0 +1,7 @@
+//  SDLWayPointType.m
+//
+
+#import "SDLWayPointType.h"
+
+SDLWayPointType const SDLWayPointTypeAll = @"ALL";
+SDLWayPointType const SDLWayPointTypeDestination = @"DESTINATION";
diff --git a/SmartDeviceLink/SDLWaypointType.h b/SmartDeviceLink/SDLWaypointType.h
deleted file mode 100644
index 6ce9807b2..000000000
--- a/SmartDeviceLink/SDLWaypointType.h
+++ /dev/null
@@ -1,9 +0,0 @@
-//  SDLWaypointType.h
-//
-
-#import "SDLEnum.h"
-
-typedef SDLEnum SDLWaypointType SDL_SWIFT_ENUM;
-
-extern SDLWaypointType const SDLWaypointTypeAll;
-extern SDLWaypointType const SDLWaypointTypeDestination;
diff --git a/SmartDeviceLink/SDLWaypointType.m b/SmartDeviceLink/SDLWaypointType.m
deleted file mode 100644
index 9303fbb7b..000000000
--- a/SmartDeviceLink/SDLWaypointType.m
+++ /dev/null
@@ -1,7 +0,0 @@
-//  SDLWaypointType.m
-//
-
-#import "SDLWaypointType.h"
-
-SDLWaypointType const SDLWaypointTypeAll = @"ALL";
-SDLWaypointType const SDLWaypointTypeDestination = @"DESTINATION";
diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h
index 62824df42..3f72f59ff 100644
--- a/SmartDeviceLink/SmartDeviceLink.h
+++ b/SmartDeviceLink/SmartDeviceLink.h
@@ -63,7 +63,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLGetDTCs.h"
 #import "SDLGetSystemCapability.h"
 #import "SDLGetVehicleData.h"
-#import "SDLGetWaypoints.h"
+#import "SDLGetWayPoints.h"
 #import "SDLListFiles.h"
 #import "SDLPerformAudioPassThru.h"
 #import "SDLPerformInteraction.h"
@@ -84,12 +84,12 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLSpeak.h"
 #import "SDLSubscribeButton.h"
 #import "SDLSubscribeVehicleData.h"
-#import "SDLSubscribeWaypoints.h"
+#import "SDLSubscribeWayPoints.h"
 #import "SDLSyncPData.h"
 #import "SDLUnregisterAppInterface.h"
 #import "SDLUnsubscribeButton.h"
 #import "SDLUnsubscribeVehicleData.h"
-#import "SDLUnsubscribeWaypoints.h"
+#import "SDLUnsubscribeWayPoints.h"
 #import "SDLUpdateTurnList.h"
 
 // Responses
@@ -111,7 +111,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLGetDTCsResponse.h"
 #import "SDLGetSystemCapabilityResponse.h"
 #import "SDLGetVehicleDataResponse.h"
-#import "SDLGetWaypointsResponse.h"
+#import "SDLGetWayPointsResponse.h"
 #import "SDLListFilesResponse.h"
 #import "SDLPerformAudioPassThruResponse.h"
 #import "SDLPerformInteractionResponse.h"
@@ -132,12 +132,12 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLSpeakResponse.h"
 #import "SDLSubscribeButtonResponse.h"
 #import "SDLSubscribeVehicleDataResponse.h"
-#import "SDLSubscribeWaypointsResponse.h"
+#import "SDLSubscribeWayPointsResponse.h"
 #import "SDLSyncPDataResponse.h"
 #import "SDLUnregisterAppInterfaceResponse.h"
 #import "SDLUnsubscribeButtonResponse.h"
 #import "SDLUnsubscribeVehicleDataResponse.h"
-#import "SDLUnsubscribeWaypointsResponse.h"
+#import "SDLUnsubscribeWayPointsResponse.h"
 #import "SDLUpdateTurnListResponse.h"
 
 // Notifications
@@ -159,7 +159,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLOnTBTClientState.h"
 #import "SDLOnTouchEvent.h"
 #import "SDLOnVehicleData.h"
-#import "SDLOnWaypointChange.h"
+#import "SDLOnWayPointChange.h"
 
 // Structs
 #import "SDLAirbagStatus.h"
@@ -291,7 +291,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[];
 #import "SDLVideoStreamingProtocol.h"
 #import "SDLVrCapabilities.h"
 #import "SDLWarningLightStatus.h"
-#import "SDLWaypointType.h"
+#import "SDLWayPointType.h"
 #import "SDLWiperStatus.h"
 
 // Developer API
diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
index 0d7821202..51145a6f6 100644
--- a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
+++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
@@ -57,9 +57,9 @@ describe(@"GetFunctionName Tests", ^ {
         expect([functionID functionNameForId:38]).to(equal(SDLNameSystemRequest));
         expect([functionID functionNameForId:39]).to(equal(SDLNameSendLocation));
         expect([functionID functionNameForId:40]).to(equal(SDLNameDialNumber));
-        expect([functionID functionNameForId:45]).to(equal(SDLNameGetWaypoints));
-        expect([functionID functionNameForId:46]).to(equal(SDLNameSubscribeWaypoints));
-        expect([functionID functionNameForId:47]).to(equal(SDLNameUnsubscribeWaypoints));
+        expect([functionID functionNameForId:45]).to(equal(SDLNameGetWayPoints));
+        expect([functionID functionNameForId:46]).to(equal(SDLNameSubscribeWayPoints));
+        expect([functionID functionNameForId:47]).to(equal(SDLNameUnsubscribeWayPoints));
         expect([functionID functionNameForId:48]).to(equal(SDLNameGetSystemCapability));
         expect([functionID functionNameForId:49]).to(equal(SDLNameSendHapticData));
         expect([functionID functionNameForId:32768]).to(equal(SDLNameOnHMIStatus));
@@ -77,7 +77,7 @@ describe(@"GetFunctionName Tests", ^ {
         expect([functionID functionNameForId:32780]).to(equal(SDLNameOnTouchEvent));
         expect([functionID functionNameForId:32781]).to(equal(SDLNameOnSystemRequest));
         expect([functionID functionNameForId:32782]).to(equal(SDLNameOnHashChange));
-        expect([functionID functionNameForId:32784]).to(equal(SDLNameOnWaypointChange));
+        expect([functionID functionNameForId:32784]).to(equal(SDLNameOnWayPointChange));
         
         //Not listed in Spec
         expect([functionID functionNameForId:65536]).to(equal(SDLNameEncodedSyncPData));
@@ -130,9 +130,9 @@ describe(@"GetFunctionID Tests", ^ {
         expect([functionID functionIdForName:SDLNameSystemRequest]).to(equal(@38));
         expect([functionID functionIdForName:SDLNameSendLocation]).to(equal(@39));
         expect([functionID functionIdForName:SDLNameDialNumber]).to(equal(@40));
-        expect([functionID functionIdForName:SDLNameGetWaypoints]).to(equal(@45));
-        expect([functionID functionIdForName:SDLNameSubscribeWaypoints]).to(equal(@46));
-        expect([functionID functionIdForName:SDLNameUnsubscribeWaypoints]).to(equal(@47));
+        expect([functionID functionIdForName:SDLNameGetWayPoints]).to(equal(@45));
+        expect([functionID functionIdForName:SDLNameSubscribeWayPoints]).to(equal(@46));
+        expect([functionID functionIdForName:SDLNameUnsubscribeWayPoints]).to(equal(@47));
         expect([functionID functionIdForName:SDLNameGetSystemCapability]).to(equal(@48));
         expect([functionID functionIdForName:SDLNameSendHapticData]).to(equal(@49));
         expect([functionID functionIdForName:SDLNameOnHMIStatus]).to(equal(@32768));
@@ -150,7 +150,7 @@ describe(@"GetFunctionID Tests", ^ {
         expect([functionID functionIdForName:SDLNameOnTouchEvent]).to(equal(@32780));
         expect([functionID functionIdForName:SDLNameOnSystemRequest]).to(equal(@32781));
         expect([functionID functionIdForName:SDLNameOnHashChange]).to(equal(@32782));
-        expect([functionID functionIdForName:SDLNameOnWaypointChange]).to(equal(@32784));
+        expect([functionID functionIdForName:SDLNameOnWayPointChange]).to(equal(@32784));
         
         //Not listed in Spec
         expect([functionID functionIdForName:SDLNameEncodedSyncPData]).to(equal(@65536));
diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWaypointTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWaypointTypeSpec.m
index 85fed576f..3f4599950 100644
--- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWaypointTypeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWaypointTypeSpec.m
@@ -1,4 +1,4 @@
-//  SDLWaypointTypeSpec.m
+//  SDLWayPointTypeSpec.m
 //
 
 #import <Foundation/Foundation.h>
@@ -6,14 +6,14 @@
 #import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
 
-#import "SDLWaypointType.h"
+#import "SDLWayPointType.h"
 
-QuickSpecBegin(SDLWaypointTypeSpec)
+QuickSpecBegin(SDLWayPointTypeSpec)
 
 describe(@"Individual Enum Value Tests", ^ {
     it(@"Should match internal values", ^ {
-        expect(SDLWaypointTypeAll).to(equal(@"ALL"));
-        expect(SDLWaypointTypeDestination).to(equal(@"DESTINATION"));
+        expect(SDLWayPointTypeAll).to(equal(@"ALL"));
+        expect(SDLWayPointTypeDestination).to(equal(@"DESTINATION"));
     });
 });
 
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
index 7bf1ff54d..bee2e3cda 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m
@@ -1,4 +1,4 @@
-//  SDLOnWaypointChangeSpec.m
+//  SDLOnWayPointChangeSpec.m
 //
 
 #import <Foundation/Foundation.h>
@@ -6,7 +6,7 @@
 #import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
 
-#import "SDLOnWaypointChange.h"
+#import "SDLOnWayPointChange.h"
 
 #import "SDLImage.h"
 #import "SDLLocationCoordinate.h"
@@ -14,7 +14,7 @@
 #import "SDLNames.h"
 #import "SDLOasisAddress.h"
 
-QuickSpecBegin(SDLOnWaypointChangeSpec)
+QuickSpecBegin(SDLOnWayPointChangeSpec)
 
 describe(@"Getter/Setter Tests", ^ {
     __block SDLOnWayPointChange* testNotification = nil;
@@ -65,10 +65,10 @@ describe(@"Getter/Setter Tests", ^ {
                 
                 NSDictionary *initDict = @{SDLNameNotification : @{
                                                    SDLNameParameters: @{
-                                                           SDLNameWaypoints: someWaypoints
+                                                           SDLNameWayPoints: someWaypoints
                                                            }
                                                    },
-                                           SDLNameOperationName:SDLNameOnWaypointChange
+                                           SDLNameOperationName:SDLNameOnWayPointChange
                                            };
                 
                 testNotification = [[SDLOnWayPointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]];
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
index 677a09e16..45946f405 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m
@@ -9,7 +9,7 @@
 #import "SDLGetWaypoints.h"
 
 #import "SDLNames.h"
-#import "SDLWaypointType.h"
+#import "SDLWayPointType.h"
 
 QuickSpecBegin(SDLGetWaypointsSpec)
 
@@ -17,19 +17,19 @@ describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
         SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] init];
         
-        testRequest.waypointType = SDLWaypointTypeAll;
+        testRequest.waypointType = SDLWayPointTypeAll;
         
-        expect(testRequest.waypointType).to(equal(SDLWaypointTypeAll));
+        expect(testRequest.waypointType).to(equal(SDLWayPointTypeAll));
     });
     
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary* dict = [@{SDLNameRequest:
                                            @{SDLNameParameters:
-                                                 @{SDLNameWaypointType:SDLWaypointTypeAll},
-                                             SDLNameOperationName:SDLNameGetWaypoints}} mutableCopy];
+                                                 @{SDLNameWayPointType:SDLWayPointTypeAll},
+                                             SDLNameOperationName:SDLNameGetWayPoints}} mutableCopy];
         SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] initWithDictionary:dict];
         
-        expect(testRequest.waypointType).to(equal(SDLWaypointTypeAll));
+        expect(testRequest.waypointType).to(equal(SDLWayPointTypeAll));
     });
     
     it(@"Should return nil if not set", ^ {
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetSystemCapabilitiesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetSystemCapabilitiesResponseSpec.m
index 4a4adf953..d87c4ed41 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetSystemCapabilitiesResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetSystemCapabilitiesResponseSpec.m
@@ -30,7 +30,7 @@ describe(@"Initialization tests", ^{
         NSDictionary *dict = @{SDLNameResponse: @{
                                        SDLNameParameters: @{
                                                SDLNameSystemCapability: @{SDLNameSystemCapabilityType: @"NAVIGATION",
-                                                                         SDLNameNavigationCapability: @{SDLNameGetWaypointsEnabled: @(NO),
+                                                                         SDLNameNavigationCapability: @{SDLNameGetWayPointsEnabled: @(NO),
                                                                                                         SDLNameSendLocationEnabled: @(YES)}}
                                                }
                                        }
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
index 54e557050..9b5f0b873 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m
@@ -65,7 +65,7 @@ describe(@"Getter/Setter Tests", ^ {
                 
                 NSDictionary *initDict = @{SDLNameResponse : @{
                                                    SDLNameParameters: @{
-                                                           SDLNameWaypoints: someWaypoints
+                                                           SDLNameWayPoints: someWaypoints
                                                            }
                                                    }
                                            };
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationCapabilitySpec.m
index a11d2ee82..99c85cdc8 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationCapabilitySpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationCapabilitySpec.m
@@ -23,7 +23,7 @@ describe(@"Getter/Setter Tests", ^ {
 
 describe(@"Initialization tests", ^{
     it(@"Should get correctly when initialized with a dictionary", ^ {
-        NSDictionary *dict = @{SDLNameGetWaypointsEnabled: @(YES),
+        NSDictionary *dict = @{SDLNameGetWayPointsEnabled: @(YES),
                                        SDLNameSendLocationEnabled: @(YES)};
         SDLNavigationCapability* testStruct = [[SDLNavigationCapability alloc] initWithDictionary:dict];
 
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m
index 070eb774e..36f3c0e8e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m
@@ -40,7 +40,7 @@ describe(@"Getter/Setter Tests", ^ {
 describe(@"Initialization tests", ^{
     it(@"Should get correctly when initialized with a dictionary", ^ {
         NSMutableDictionary* dict = [@{SDLNameSystemCapabilityType: @"NAVIGATION",
-                                       SDLNameNavigationCapability: @{SDLNameGetWaypointsEnabled: @(NO),
+                                       SDLNameNavigationCapability: @{SDLNameGetWayPointsEnabled: @(NO),
                                                                      SDLNameSendLocationEnabled: @(YES)},
                                        SDLNamePhoneCapability: @{SDLNameDialNumberEnabled: @(YES)}} mutableCopy];
         SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] initWithDictionary:dict];