Fixes for APIs and naming

* Fix swift example warning
* Update SDLManagerDelegate didReceiveSystemInfo naming on Swift
* Fix file names for SDLImageResolution+StreamingVideoExtensions and SDLVideoStreamingCapability+StreamingVideoExtensions
* Fix documentation misspelling in SDLMenuCell
* Fix SDLSeekStreamingIndicator `seekIndicatorWithSeekTime` using a nullable parameter when it should be nonnull
* Deprecate old SDLStreamingMediaConfiguration initializer and replace it with one with new properties
* Update SDLStreamingVideoDelegate `videoStreamingDidUpdate` naming on Swift

21 files changed, 69 insertions, 44 deletions

diff --git a/Example Apps/Example Swift/MenuManager.swift b/Example Apps/Example Swift/MenuManager.swift
index 1da1f3ced..092670559 100644
--- a/Example Apps/Example Swift/MenuManager.swift
+++ b/Example Apps/Example Swift/MenuManager.swift
@@ -72,7 +72,7 @@ private extension MenuManager {
 
     /// A list of all possible vehicle data types
     static var allVehicleDataTypes: [String] {
-        return [ACAccelerationPedalPositionMenuName, ACAirbagStatusMenuName, ACBeltStatusMenuName, ACBodyInformationMenuName, ACClusterModeStatusMenuName, ACDeviceStatusMenuName, ACDriverBrakingMenuName, ACECallInfoMenuName, ACElectronicParkBrakeStatus, ACEmergencyEventMenuName, ACEngineOilLifeMenuName, ACEngineTorqueMenuName, ACExternalTemperatureMenuName, ACFuelLevelMenuName, ACFuelLevelStateMenuName, ACFuelRangeMenuName, ACGearStatusMenuName, ACGPSMenuName, ACHeadLampStatusMenuName, ACInstantFuelConsumptionMenuName, ACMyKeyMenuName, ACOdometerMenuName, ACPRNDLMenuName, ACRPMMenuName, ACSpeedMenuName, ACSteeringWheelAngleMenuName, ACTirePressureMenuName, ACTurnSignalMenuName, ACVINMenuName, ACWiperStatusMenuName]
+        return [ACAccelerationPedalPositionMenuName, ACAirbagStatusMenuName, ACBeltStatusMenuName, ACBodyInformationMenuName, ACClusterModeStatusMenuName, ACDeviceStatusMenuName, ACDriverBrakingMenuName, ACECallInfoMenuName, ACElectronicParkBrakeStatus, ACEmergencyEventMenuName, ACEngineOilLifeMenuName, ACEngineTorqueMenuName, ACFuelLevelMenuName, ACFuelLevelStateMenuName, ACFuelRangeMenuName, ACGearStatusMenuName, ACGPSMenuName, ACHeadLampStatusMenuName, ACInstantFuelConsumptionMenuName, ACMyKeyMenuName, ACOdometerMenuName, ACPRNDLMenuName, ACRPMMenuName, ACSpeedMenuName, ACSteeringWheelAngleMenuName, ACTirePressureMenuName, ACTurnSignalMenuName, ACVINMenuName, ACWiperStatusMenuName]
     }
 
     /// Menu item that shows a custom menu (i.e. a Perform Interaction Choice Set) when selected
diff --git a/Example Apps/Example Swift/ProxyManager.swift b/Example Apps/Example Swift/ProxyManager.swift
index 6c04e57fa..e5e21c4a2 100644
--- a/Example Apps/Example Swift/ProxyManager.swift
+++ b/Example Apps/Example Swift/ProxyManager.swift
@@ -238,7 +238,7 @@ extension ProxyManager: SDLManagerDelegate {
     /// Called when connected module information becomes available
     /// - Parameter systemInfo: The connected module's information
     /// - Returns: True to continue connecting, false to disconnect immediately
-    func didReceive(systemInfo: SDLSystemInfo) -> Bool {
+    func didReceiveSystemInfo(_ systemInfo: SDLSystemInfo) -> Bool {
         SDLLog.d("Example app got system info: \(systemInfo)")
         return true
     }
diff --git a/Example Apps/Example Swift/VehicleDataManager.swift b/Example Apps/Example Swift/VehicleDataManager.swift
index b9647ceb2..618c74a93 100644
--- a/Example Apps/Example Swift/VehicleDataManager.swift
+++ b/Example Apps/Example Swift/VehicleDataManager.swift
@@ -187,8 +187,6 @@ extension VehicleDataManager {
             vehicleDataDescription = vehicleData.engineOilLife?.description ?? notAvailable
         case ACEngineTorqueMenuName:
             vehicleDataDescription = vehicleData.engineTorque?.description ?? notAvailable
-        case ACExternalTemperatureMenuName:
-            vehicleDataDescription = vehicleData.externalTemperature?.description ?? notAvailable
         case ACFuelLevelMenuName:
             vehicleDataDescription = vehicleData.fuelRange?.first?.level?.description ?? notAvailable
         case ACFuelLevelStateMenuName:
diff --git a/Example Apps/Shared/AppConstants.h b/Example Apps/Shared/AppConstants.h
index b06009fa7..36f25b4b7 100644
--- a/Example Apps/Shared/AppConstants.h
+++ b/Example Apps/Shared/AppConstants.h
@@ -108,7 +108,6 @@ extern NSString * const ACElectronicParkBrakeStatus;
 extern NSString * const ACEmergencyEventMenuName;
 extern NSString * const ACEngineOilLifeMenuName;
 extern NSString * const ACEngineTorqueMenuName;
-extern NSString * const ACExternalTemperatureMenuName;
 extern NSString * const ACFuelLevelMenuName;
 extern NSString * const ACFuelLevelStateMenuName;
 extern NSString * const ACFuelRangeMenuName;
diff --git a/Example Apps/Shared/AppConstants.m b/Example Apps/Shared/AppConstants.m
index 69447b16d..20afa0b6c 100644
--- a/Example Apps/Shared/AppConstants.m
+++ b/Example Apps/Shared/AppConstants.m
@@ -105,7 +105,6 @@ NSString * const ACElectronicParkBrakeStatus = @"Electronic Parking Brake Status
 NSString * const ACEmergencyEventMenuName = @"Emergency Event";
 NSString * const ACEngineOilLifeMenuName = @"Engine Oil Life";
 NSString * const ACEngineTorqueMenuName = @"Engine Torque";
-NSString * const ACExternalTemperatureMenuName = @"External Temperature";
 NSString * const ACFuelLevelMenuName = @"Fuel Level";
 NSString * const ACFuelLevelStateMenuName = @"Fuel Level State";
 NSString * const ACFuelRangeMenuName = @"Fuel Range";
diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index a1eed6e51..b9841e65a 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -1723,10 +1723,10 @@
 		B3A9DB0625D497FB00CDFD21 /* SDLAppCapabilityType.m in Sources */ = {isa = PBXBuildFile; fileRef = B3A9DB0425D497FB00CDFD21 /* SDLAppCapabilityType.m */; };
 		B3A9DB0725D497FB00CDFD21 /* SDLAppCapabilityType.h in Headers */ = {isa = PBXBuildFile; fileRef = B3A9DB0525D497FB00CDFD21 /* SDLAppCapabilityType.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B3A9DB0F25D4A30D00CDFD21 /* SDLAppCapabilityTypeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = B3A9DB0E25D4A30C00CDFD21 /* SDLAppCapabilityTypeSpec.m */; };
-		B3A9DB1625D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = B3A9DB1425D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.h */; };
-		B3A9DB1725D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = B3A9DB1525D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.m */; };
-		B3A9DB2025D4BBB800CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = B3A9DB1E25D4BBB700CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.h */; };
-		B3A9DB2125D4BBB800CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = B3A9DB1F25D4BBB800CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.m */; };
+		B3A9DB1625D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = B3A9DB1425D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.h */; };
+		B3A9DB1725D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = B3A9DB1525D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.m */; };
+		B3A9DB2025D4BBB800CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = B3A9DB1E25D4BBB700CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.h */; };
+		B3A9DB2125D4BBB800CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = B3A9DB1F25D4BBB800CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.m */; };
 		B3A9DB2825D4C3B000CDFD21 /* SDLOnAppCapabilityUpdated.h in Headers */ = {isa = PBXBuildFile; fileRef = B3A9DB2625D4C3B000CDFD21 /* SDLOnAppCapabilityUpdated.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B3A9DB2925D4C3B000CDFD21 /* SDLOnAppCapabilityUpdated.m in Sources */ = {isa = PBXBuildFile; fileRef = B3A9DB2725D4C3B000CDFD21 /* SDLOnAppCapabilityUpdated.m */; };
 		B3DF19ED251225300090D7BA /* TestSmartConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B3DF19EB251225300090D7BA /* TestSmartConnectionManager.m */; };
@@ -3628,10 +3628,10 @@
 		B3A9DB0425D497FB00CDFD21 /* SDLAppCapabilityType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLAppCapabilityType.m; path = public/SDLAppCapabilityType.m; sourceTree = "<group>"; };
 		B3A9DB0525D497FB00CDFD21 /* SDLAppCapabilityType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDLAppCapabilityType.h; path = public/SDLAppCapabilityType.h; sourceTree = "<group>"; };
 		B3A9DB0E25D4A30C00CDFD21 /* SDLAppCapabilityTypeSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAppCapabilityTypeSpec.m; sourceTree = "<group>"; };
-		B3A9DB1425D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SDLImageResolution + StreamingVideoExtensions.h"; path = "private/SDLImageResolution + StreamingVideoExtensions.h"; sourceTree = "<group>"; };
-		B3A9DB1525D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SDLImageResolution + StreamingVideoExtensions.m"; path = "private/SDLImageResolution + StreamingVideoExtensions.m"; sourceTree = "<group>"; };
-		B3A9DB1E25D4BBB700CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SDLVideoStreamingCapability + StreamingVideoExtensions.h"; path = "private/SDLVideoStreamingCapability + StreamingVideoExtensions.h"; sourceTree = "<group>"; };
-		B3A9DB1F25D4BBB800CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SDLVideoStreamingCapability + StreamingVideoExtensions.m"; path = "private/SDLVideoStreamingCapability + StreamingVideoExtensions.m"; sourceTree = "<group>"; };
+		B3A9DB1425D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SDLImageResolution+StreamingVideoExtensions.h"; path = "private/SDLImageResolution+StreamingVideoExtensions.h"; sourceTree = "<group>"; };
+		B3A9DB1525D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SDLImageResolution+StreamingVideoExtensions.m"; path = "private/SDLImageResolution+StreamingVideoExtensions.m"; sourceTree = "<group>"; };
+		B3A9DB1E25D4BBB700CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SDLVideoStreamingCapability+StreamingVideoExtensions.h"; path = "private/SDLVideoStreamingCapability+StreamingVideoExtensions.h"; sourceTree = "<group>"; };
+		B3A9DB1F25D4BBB800CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SDLVideoStreamingCapability+StreamingVideoExtensions.m"; path = "private/SDLVideoStreamingCapability+StreamingVideoExtensions.m"; sourceTree = "<group>"; };
 		B3A9DB2625D4C3B000CDFD21 /* SDLOnAppCapabilityUpdated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDLOnAppCapabilityUpdated.h; path = public/SDLOnAppCapabilityUpdated.h; sourceTree = "<group>"; };
 		B3A9DB2725D4C3B000CDFD21 /* SDLOnAppCapabilityUpdated.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLOnAppCapabilityUpdated.m; path = public/SDLOnAppCapabilityUpdated.m; sourceTree = "<group>"; };
 		B3DF19EB251225300090D7BA /* TestSmartConnectionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestSmartConnectionManager.m; sourceTree = "<group>"; };
@@ -4586,14 +4586,12 @@
 			isa = PBXGroup;
 			children = (
 				8889C2E22559AE82004F5966 /* Audio */,
-				B3A9DB1425D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.h */,
-				B3A9DB1525D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.m */,
 				4ABB25D024F7E7630061BF55 /* SDLImageField+ScreenManagerExtensions.h */,
 				4ABB25D124F7E7630061BF55 /* SDLImageField+ScreenManagerExtensions.m */,
 				4ABB25D224F7E7630061BF55 /* SDLTextField+ScreenManagerExtensions.h */,
 				4ABB25CF24F7E7630061BF55 /* SDLTextField+ScreenManagerExtensions.m */,
-				B3A9DB1E25D4BBB700CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.h */,
-				B3A9DB1F25D4BBB800CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.m */,
+				B3A9DB1E25D4BBB700CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.h */,
+				B3A9DB1F25D4BBB800CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.m */,
 				4ABB25D324F7E7630061BF55 /* SDLWindowCapability+ScreenManagerExtensions.h */,
 				4ABB25CE24F7E7630061BF55 /* SDLWindowCapability+ScreenManagerExtensions.m */,
 			);
@@ -7064,9 +7062,9 @@
 				B30508FD2511E5EE008C5401 /* SDLStreamingVideoDelegate.h */,
 				B30508FF2511E60D008C5401 /* SDLVideoStreamingRange.h */,
 				B30509002511E60D008C5401 /* SDLVideoStreamingRange.m */,
-				5D0A7377203F0C9E0001595D /* Configuration */,
 				5D23C9441FCF59F400002CA5 /* AudioManager */,
 				5DCD7AD91FCCA5BF00A0FC7F /* CarWindow */,
+				5D0A7377203F0C9E0001595D /* Configuration */,
 				5DA5918E1F96820F003264C3 /* Focus / Haptic */,
 				DA8966E81E56938C00413EAB /* Lifecycle */,
 				DAC5724C1D0FE3B60004288B /* Touches */,
@@ -7110,6 +7108,8 @@
 			children = (
 				4ABB262224F7F3A30061BF55 /* CVPixelBufferRef+SDLUtil.h */,
 				4ABB262324F7F3A30061BF55 /* CVPixelBufferRef+SDLUtil.m */,
+				B3A9DB1425D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.h */,
+				B3A9DB1525D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.m */,
 				4ABB25FA24F7E8E10061BF55 /* SDLStreamingVideoScaleManager.h */,
 				4ABB25FB24F7E8E10061BF55 /* SDLStreamingVideoScaleManager.m */,
 			);
@@ -7218,7 +7218,7 @@
 				4ABB264B24F7F5580061BF55 /* SDLManagerDelegate.h in Headers */,
 				4A8BD28B24F934F3000945E3 /* SDLRGBColor.h in Headers */,
 				4ABB279624F7FF0B0061BF55 /* SDLKeyboardEvent.h in Headers */,
-				B3A9DB1625D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.h in Headers */,
+				B3A9DB1625D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.h in Headers */,
 				4ABB26FA24F7FB8F0061BF55 /* SDLAppServiceType.h in Headers */,
 				4ABB2A3C24F847980061BF55 /* SDLCreateInteractionChoiceSetResponse.h in Headers */,
 				4ABB29DC24F846880061BF55 /* SDLUnregisterAppInterface.h in Headers */,
@@ -7470,7 +7470,7 @@
 				4ABB284124F828630061BF55 /* SDLTurnSignal.h in Headers */,
 				4ABB299D24F845440061BF55 /* SDLScrollableMessage.h in Headers */,
 				4ABB261A24F7F3770061BF55 /* SDLFocusableItemLocator.h in Headers */,
-				B3A9DB2025D4BBB800CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.h in Headers */,
+				B3A9DB2025D4BBB800CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.h in Headers */,
 				4ABB257724F7E5E80061BF55 /* SDLDeleteChoicesOperation.h in Headers */,
 				4ABB24C124F592620061BF55 /* NSMapTable+Subscripting.h in Headers */,
 				4ABB2A2C24F847980061BF55 /* SDLChangeRegistrationResponse.h in Headers */,
@@ -8208,7 +8208,7 @@
 				4A8BD23C24F93135000945E3 /* SDLMediaServiceData.m in Sources */,
 				4ABB28DC24F82A6A0061BF55 /* SDLOnHashChange.m in Sources */,
 				4A8BD26424F933C7000945E3 /* SDLNavigationServiceManifest.m in Sources */,
-				B3A9DB1725D4AD1800CDFD21 /* SDLImageResolution + StreamingVideoExtensions.m in Sources */,
+				B3A9DB1725D4AD1800CDFD21 /* SDLImageResolution+StreamingVideoExtensions.m in Sources */,
 				4ABB29D824F846880061BF55 /* SDLSystemRequest.m in Sources */,
 				4ABB271B24F7FC4E0061BF55 /* SDLCharacterSet.m in Sources */,
 				4ABB26CB24F7FAAF0061BF55 /* SDLEnum.m in Sources */,
@@ -8338,7 +8338,7 @@
 				4ABB29ED24F847360061BF55 /* SDLUnsubscribeVehicleData.m in Sources */,
 				4ABB2A2124F847980061BF55 /* SDLButtonPressResponse.m in Sources */,
 				4ABB270224F7FB8F0061BF55 /* SDLButtonEventMode.m in Sources */,
-				B3A9DB2125D4BBB800CDFD21 /* SDLVideoStreamingCapability + StreamingVideoExtensions.m in Sources */,
+				B3A9DB2125D4BBB800CDFD21 /* SDLVideoStreamingCapability+StreamingVideoExtensions.m in Sources */,
 				4A8BD24C24F93135000945E3 /* SDLLocationDetails.m in Sources */,
 				4ABB275C24F7FE1F0061BF55 /* SDLFuelType.m in Sources */,
 				4ABB2B4324F84EF50061BF55 /* SDLDisplayCapabilities.m in Sources */,
diff --git a/SmartDeviceLink/private/SDLImageResolution + StreamingVideoExtensions.h b/SmartDeviceLink/private/SDLImageResolution+StreamingVideoExtensions.h
index bf1f98795..bf1f98795 100644
--- a/SmartDeviceLink/private/SDLImageResolution + StreamingVideoExtensions.h
+++ b/SmartDeviceLink/private/SDLImageResolution+StreamingVideoExtensions.h
diff --git a/SmartDeviceLink/private/SDLImageResolution + StreamingVideoExtensions.m b/SmartDeviceLink/private/SDLImageResolution+StreamingVideoExtensions.m
index 655386912..ce9b9941e 100644
--- a/SmartDeviceLink/private/SDLImageResolution + StreamingVideoExtensions.m
+++ b/SmartDeviceLink/private/SDLImageResolution+StreamingVideoExtensions.m
@@ -4,7 +4,7 @@
 
 #import "NSMutableDictionary+Store.h"
 #import "SDLRPCParameterNames.h"
-#import "SDLImageResolution + StreamingVideoExtensions.h"
+#import "SDLImageResolution+StreamingVideoExtensions.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SmartDeviceLink/private/SDLStreamingVideoLifecycleManager.m b/SmartDeviceLink/private/SDLStreamingVideoLifecycleManager.m
index 0bd15f084..f778a80e5 100644
--- a/SmartDeviceLink/private/SDLStreamingVideoLifecycleManager.m
+++ b/SmartDeviceLink/private/SDLStreamingVideoLifecycleManager.m
@@ -25,7 +25,7 @@
 #import "SDLGlobals.h"
 #import "SDLH264VideoEncoder.h"
 #import "SDLHMILevel.h"
-#import "SDLImageResolution + StreamingVideoExtensions.h"
+#import "SDLImageResolution+StreamingVideoExtensions.h"
 #import "SDLLifecycleConfiguration.h"
 #import "SDLLogMacros.h"
 #import "SDLOnAppCapabilityUpdated.h"
@@ -51,7 +51,7 @@
 #import "SDLTouchManager.h"
 #import "SDLVehicleType.h"
 #import "SDLVideoEncoderDelegate.h"
-#import "SDLVideoStreamingCapability + StreamingVideoExtensions.h"
+#import "SDLVideoStreamingCapability+StreamingVideoExtensions.h"
 
 static NSUInteger const FramesToSendOnBackground = 30;
 
diff --git a/SmartDeviceLink/private/SDLVideoStreamingCapability + StreamingVideoExtensions.h b/SmartDeviceLink/private/SDLVideoStreamingCapability+StreamingVideoExtensions.h
index bc966db4c..bc966db4c 100644
--- a/SmartDeviceLink/private/SDLVideoStreamingCapability + StreamingVideoExtensions.h
+++ b/SmartDeviceLink/private/SDLVideoStreamingCapability+StreamingVideoExtensions.h
diff --git a/SmartDeviceLink/private/SDLVideoStreamingCapability + StreamingVideoExtensions.m b/SmartDeviceLink/private/SDLVideoStreamingCapability+StreamingVideoExtensions.m
index 66bae1338..3e544709b 100644
--- a/SmartDeviceLink/private/SDLVideoStreamingCapability + StreamingVideoExtensions.m
+++ b/SmartDeviceLink/private/SDLVideoStreamingCapability+StreamingVideoExtensions.m
@@ -6,13 +6,13 @@
 //  Copyright © 2021 smartdevicelink. All rights reserved.
 //
 
-#import "SDLImageResolution + StreamingVideoExtensions.h"
-#import "SDLVideoStreamingCapability + StreamingVideoExtensions.h"
-#import "SDLVideoStreamingFormat.h"
+#import "SDLVideoStreamingCapability+StreamingVideoExtensions.h"
 
 #import "NSMutableDictionary+Store.h"
 #import "SDLRPCParameterNames.h"
+#import "SDLImageResolution+StreamingVideoExtensions.h"
 #import "SDLStreamingVideoScaleManager.h"
+#import "SDLVideoStreamingFormat.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SmartDeviceLink/public/SDLManagerDelegate.h b/SmartDeviceLink/public/SDLManagerDelegate.h
index 5b3d6a981..485eff74a 100644
--- a/SmartDeviceLink/public/SDLManagerDelegate.h
+++ b/SmartDeviceLink/public/SDLManagerDelegate.h
@@ -73,7 +73,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @param systemInfo The system information of the vehicle that this session is currently active on.
  * @return True if this session should continue, false if the session should end
  */
-- (BOOL)didReceiveSystemInfo:(SDLSystemInfo *)systemInfo NS_SWIFT_NAME(didReceive(systemInfo:));
+- (BOOL)didReceiveSystemInfo:(SDLSystemInfo *)systemInfo NS_SWIFT_NAME(didReceiveSystemInfo(_:));
 
 @end
 
diff --git a/SmartDeviceLink/public/SDLMenuCell.h b/SmartDeviceLink/public/SDLMenuCell.h
index fc539f5e3..7cedc5ad6 100644
--- a/SmartDeviceLink/public/SDLMenuCell.h
+++ b/SmartDeviceLink/public/SDLMenuCell.h
@@ -119,7 +119,7 @@ typedef void(^SDLMenuCellSelectionHandler)(SDLTriggerSource triggerSource);
  @param tertiaryText - tertiaryText
  @param icon The cell's image
  @param secondaryArtwork - secondaryArtwork
- @param layout The layout that the subCells will be layed out in if that submenu is entered
+ @param layout The layout that the subCells will be laid out in if that submenu is entered
  @param subCells The subcells that will appear when the cell is selected
  @return The menu cell
  */
diff --git a/SmartDeviceLink/public/SDLSeekStreamingIndicator.h b/SmartDeviceLink/public/SDLSeekStreamingIndicator.h
index 0cee5aeac..a9881278f 100644
--- a/SmartDeviceLink/public/SDLSeekStreamingIndicator.h
+++ b/SmartDeviceLink/public/SDLSeekStreamingIndicator.h
@@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @param seekTime - seekTime
  * @return A SDLSeekStreamingIndicator object
  */
-+ (instancetype)seekIndicatorWithSeekTime:(nullable NSNumber<SDLUInt> *)seekTime;
++ (instancetype)seekIndicatorWithSeekTime:(NSUInteger)seekTime;
 
 @property (strong, nonatomic) SDLSeekIndicatorType type;
 
diff --git a/SmartDeviceLink/public/SDLSeekStreamingIndicator.m b/SmartDeviceLink/public/SDLSeekStreamingIndicator.m
index a651cc6bf..e255118d7 100644
--- a/SmartDeviceLink/public/SDLSeekStreamingIndicator.m
+++ b/SmartDeviceLink/public/SDLSeekStreamingIndicator.m
@@ -56,8 +56,8 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-+ (instancetype)seekIndicatorWithSeekTime:(nullable NSNumber<SDLUInt> *)seekTime {
-    return [[self alloc] initWithType:SDLSeekIndicatorTypeTime seekTime:seekTime];
++ (instancetype)seekIndicatorWithSeekTime:(NSUInteger)seekTime {
+    return [[self alloc] initWithType:SDLSeekIndicatorTypeTime seekTime:@(seekTime)];
 }
 
 - (void)setType:(SDLSeekIndicatorType)type {
diff --git a/SmartDeviceLink/public/SDLStreamingMediaConfiguration.h b/SmartDeviceLink/public/SDLStreamingMediaConfiguration.h
index 73f692477..669e59319 100644
--- a/SmartDeviceLink/public/SDLStreamingMediaConfiguration.h
+++ b/SmartDeviceLink/public/SDLStreamingMediaConfiguration.h
@@ -124,7 +124,17 @@ typedef NS_ENUM(NSUInteger, SDLCarWindowRenderingType) {
  @param rootViewController The UIViewController with the content that is being streamed on, to use for haptics if needed and possible (only works for UIViews)
  @return The configuration
  */
-- (instancetype)initWithEncryptionFlag:(SDLStreamingEncryptionFlag)encryptionFlag videoSettings:(nullable NSDictionary<NSString *, id> *)videoSettings dataSource:(nullable id<SDLStreamingMediaManagerDataSource>)dataSource rootViewController:(nullable UIViewController *)rootViewController;
+- (instancetype)initWithEncryptionFlag:(SDLStreamingEncryptionFlag)encryptionFlag videoSettings:(nullable NSDictionary<NSString *, id> *)videoSettings dataSource:(nullable id<SDLStreamingMediaManagerDataSource>)dataSource rootViewController:(nullable UIViewController *)rootViewController __deprecated_msg("Use initWithEncryptionFlag:videoSettings:supportedLandscapeRange:supportedPortraitRange:dataSource:delegate:rootViewController:");
+
+/// Manually set all the properties to the streaming media configuration
+/// @param encryptionFlag The maximum encryption supported. If the connected head unit supports less than set here, it will still connect, but if it supports more than set here, it will not connect
+/// @param videoSettings Custom video encoder settings to be used in video streaming
+/// @param landscapeRange Set a landscape image dimension range and/or aspect ratio range that your app supports
+/// @param portraitRange Set a portrait image dimension range and/or aspect ratio range that your rootViewController supports
+/// @param dataSource Allows you to respond with preferred resolutions and/or formats
+/// @param delegate Provides a delegate with notifications about changes to the audio stream
+/// @param rootViewController A view controller that should be automatically streamed
+- (instancetype)initWithEncryptionFlag:(SDLStreamingEncryptionFlag)encryptionFlag videoSettings:(nullable NSDictionary<NSString *, id> *)videoSettings supportedLandscapeRange:(nullable SDLVideoStreamingRange *)landscapeRange supportedPortraitRange:(nullable SDLVideoStreamingRange *)portraitRange dataSource:(nullable id<SDLStreamingMediaManagerDataSource>)dataSource delegate:(nullable id<SDLStreamingVideoDelegate>)delegate rootViewController:(nullable UIViewController *)rootViewController;
 
 /**
  Create an insecure video streaming configuration. No security managers will be provided and the encryption flag will be set to None. If you'd like custom video encoder settings, you can set the property manually. This is equivalent to `init`.
diff --git a/SmartDeviceLink/public/SDLStreamingMediaConfiguration.m b/SmartDeviceLink/public/SDLStreamingMediaConfiguration.m
index 7438b2678..ad677d856 100644
--- a/SmartDeviceLink/public/SDLStreamingMediaConfiguration.m
+++ b/SmartDeviceLink/public/SDLStreamingMediaConfiguration.m
@@ -16,11 +16,11 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLStreamingMediaConfiguration
 
 - (instancetype)init {
-    return [self initWithEncryptionFlag:SDLStreamingEncryptionFlagNone videoSettings:nil dataSource:nil rootViewController:nil];
+    return [self initWithEncryptionFlag:SDLStreamingEncryptionFlagNone videoSettings:nil supportedLandscapeRange:nil supportedPortraitRange:nil dataSource:nil delegate:nil rootViewController:nil];
 }
 
 + (instancetype)secureConfiguration {
-    return [[self alloc] initWithEncryptionFlag:SDLStreamingEncryptionFlagAuthenticateAndEncrypt videoSettings:nil dataSource:nil rootViewController:nil];
+    return [[self alloc] initWithEncryptionFlag:SDLStreamingEncryptionFlagAuthenticateAndEncrypt videoSettings:nil supportedLandscapeRange:nil supportedPortraitRange:nil dataSource:nil delegate:nil rootViewController:nil];
 }
 
 + (instancetype)insecureConfiguration {
@@ -43,18 +43,37 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
+- (instancetype)initWithEncryptionFlag:(SDLStreamingEncryptionFlag)encryptionFlag videoSettings:(nullable NSDictionary<NSString *,id> *)videoSettings supportedLandscapeRange:(nullable SDLVideoStreamingRange *)landscapeRange supportedPortraitRange:(nullable SDLVideoStreamingRange *)portraitRange dataSource:(nullable id<SDLStreamingMediaManagerDataSource>)dataSource delegate:(nullable id<SDLStreamingVideoDelegate>)delegate rootViewController:(nullable UIViewController *)rootViewController {
+    if (!self) {
+        return nil;
+    }
+
+    _maximumDesiredEncryption = encryptionFlag;
+    _customVideoEncoderSettings = videoSettings;
+    _supportedLandscapeStreamingRange = landscapeRange;
+    _supportedPortraitStreamingRange = portraitRange;
+    _dataSource = dataSource;
+    _delegate = delegate;
+    _rootViewController = rootViewController;
+    _carWindowRenderingType = SDLCarWindowRenderingTypeLayer;
+    _enableForcedFramerateSync = YES;
+    _allowMultipleViewControllerOrientations = NO;
+
+    return self;
+}
+
 + (instancetype)autostreamingInsecureConfigurationWithInitialViewController:(UIViewController *)initialViewController {
-    return [[self alloc] initWithEncryptionFlag:SDLStreamingEncryptionFlagNone videoSettings:nil dataSource:nil rootViewController:initialViewController];
+    return [[self alloc] initWithEncryptionFlag:SDLStreamingEncryptionFlagNone videoSettings:nil supportedLandscapeRange:nil supportedPortraitRange:nil dataSource:nil delegate:nil rootViewController:initialViewController];
 }
 
 + (instancetype)autostreamingSecureConfigurationWithInitialViewController:(UIViewController *)initialViewController {
-    return [[self alloc] initWithEncryptionFlag:SDLStreamingEncryptionFlagAuthenticateAndEncrypt videoSettings:nil dataSource:nil rootViewController:initialViewController];
+    return [[self alloc] initWithEncryptionFlag:SDLStreamingEncryptionFlagAuthenticateAndEncrypt videoSettings:nil supportedLandscapeRange:nil supportedPortraitRange:nil dataSource:nil delegate:nil rootViewController:initialViewController];
 }
 
 #pragma mark NSCopying
 
 - (id)copyWithZone:(nullable NSZone *)zone {
-    SDLStreamingMediaConfiguration *newConfig = [[self.class allocWithZone:zone] initWithEncryptionFlag:_maximumDesiredEncryption videoSettings:_customVideoEncoderSettings dataSource:_dataSource rootViewController:_rootViewController];
+    SDLStreamingMediaConfiguration *newConfig = [[self.class allocWithZone:zone] initWithEncryptionFlag:_maximumDesiredEncryption videoSettings:_customVideoEncoderSettings supportedLandscapeRange:_supportedLandscapeStreamingRange supportedPortraitRange:_supportedPortraitStreamingRange dataSource:_dataSource delegate:_delegate rootViewController:_rootViewController];
 
     newConfig.carWindowRenderingType = self.carWindowRenderingType;
     newConfig.enableForcedFramerateSync = self.enableForcedFramerateSync;
diff --git a/SmartDeviceLink/public/SDLStreamingVideoDelegate.h b/SmartDeviceLink/public/SDLStreamingVideoDelegate.h
index 2fa23931c..fc9284c33 100644
--- a/SmartDeviceLink/public/SDLStreamingVideoDelegate.h
+++ b/SmartDeviceLink/public/SDLStreamingVideoDelegate.h
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol SDLStreamingVideoDelegate <NSObject>
 
-- (void)videoStreamingSizeDidUpdate:(CGSize)displaySize;
+- (void)videoStreamingSizeDidUpdate:(CGSize)displaySize NS_SWIFT_NAME(videoStreamingSizeDidUpdate(toSize:));
 
 @end
 
diff --git a/SmartDeviceLink/public/SDLVideoStreamingCapability.m b/SmartDeviceLink/public/SDLVideoStreamingCapability.m
index 7e9827aac..baee8a16f 100644
--- a/SmartDeviceLink/public/SDLVideoStreamingCapability.m
+++ b/SmartDeviceLink/public/SDLVideoStreamingCapability.m
@@ -6,7 +6,7 @@
 //  Copyright © 2017 smartdevicelink. All rights reserved.
 //
 
-#import "SDLImageResolution + StreamingVideoExtensions.h"
+#import "SDLImageResolution+StreamingVideoExtensions.h"
 #import "SDLVideoStreamingCapability.h"
 #import "SDLVideoStreamingFormat.h"
 
diff --git a/SmartDeviceLink/public/SDLVideoStreamingRange.m b/SmartDeviceLink/public/SDLVideoStreamingRange.m
index bf2e37183..ccdae6210 100644
--- a/SmartDeviceLink/public/SDLVideoStreamingRange.m
+++ b/SmartDeviceLink/public/SDLVideoStreamingRange.m
@@ -6,7 +6,7 @@
 //
 
 #import "SDLVideoStreamingRange.h"
-#import "SDLImageResolution + StreamingVideoExtensions.h"
+#import "SDLImageResolution+StreamingVideoExtensions.h"
 #import "SDLLogMacros.h"
 
 @implementation SDLVideoStreamingRange
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m
index ba627ed57..9d55055d9 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m
@@ -13,7 +13,7 @@
 
 #import "SDLRPCParameterNames.h"
 #import "SDLImageResolution.h"
-#import "SDLVideoStreamingCapability + StreamingVideoExtensions.h"
+#import "SDLVideoStreamingCapability+StreamingVideoExtensions.h"
 #import "SDLVideoStreamingCodec.h"
 #import "SDLVideoStreamingFormat.h"
 #import "SDLVideoStreamingProtocol.h"