1 files changed, 67 insertions, 58 deletions

diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
index 6ad213dee..c72ebbf5e 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -5,7 +5,8 @@
 #import "SDLUnsubscribeVehicleDataResponse.h"
 
 #import "NSMutableDictionary+Store.h"
-#import "SDLNames.h"
+#import "SDLRPCParameterNames.h"
+#import "SDLRPCFunctionNames.h"
 #import "SDLVehicleDataResult.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -13,233 +14,241 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation SDLUnsubscribeVehicleDataResponse
 
 - (instancetype)init {
-    if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) {
+    if (self = [super initWithName:SDLRPCFunctionNameUnsubscribeVehicleData]) {
     }
     return self;
 }
 
 - (void)setGps:(nullable SDLVehicleDataResult *)gps {
-    [parameters sdl_setObject:gps forName:SDLNameGPS];
+    [parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS];
 }
 
 - (nullable SDLVehicleDataResult *)gps {
-    return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameGPS ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setSpeed:(nullable SDLVehicleDataResult *)speed {
-    [parameters sdl_setObject:speed forName:SDLNameSpeed];
+    [parameters sdl_setObject:speed forName:SDLRPCParameterNameSpeed];
 }
 
 - (nullable SDLVehicleDataResult *)speed {
-    return [parameters sdl_objectForName:SDLNameSpeed ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameSpeed ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setRpm:(nullable SDLVehicleDataResult *)rpm {
-    [parameters sdl_setObject:rpm forName:SDLNameRPM];
+    [parameters sdl_setObject:rpm forName:SDLRPCParameterNameRPM];
 }
 
 - (nullable SDLVehicleDataResult *)rpm {
-    return [parameters sdl_objectForName:SDLNameRPM ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameRPM ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setFuelLevel:(nullable SDLVehicleDataResult *)fuelLevel {
-    [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel];
+    [parameters sdl_setObject:fuelLevel forName:SDLRPCParameterNameFuelLevel];
 }
 
 - (nullable SDLVehicleDataResult *)fuelLevel {
-    return [parameters sdl_objectForName:SDLNameFuelLevel ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevel ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setFuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State {
-    [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState];
+    [parameters sdl_setObject:fuelLevel_State forName:SDLRPCParameterNameFuelLevelState];
 }
 
 - (nullable SDLVehicleDataResult *)fuelLevel_State {
-    return [parameters sdl_objectForName:SDLNameFuelLevelState ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevelState ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setFuelRange:(nullable SDLVehicleDataResult *)fuelRange {
-    [parameters sdl_setObject:fuelRange forName:SDLNameFuelRange];
+    [parameters sdl_setObject:fuelRange forName:SDLRPCParameterNameFuelRange];
 }
 
 - (nullable SDLVehicleDataResult *)fuelRange {
-    return [parameters sdl_objectForName:SDLNameFuelRange ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameFuelRange ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setInstantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption {
-    [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption];
+    [parameters sdl_setObject:instantFuelConsumption forName:SDLRPCParameterNameInstantFuelConsumption];
 }
 
 - (nullable SDLVehicleDataResult *)instantFuelConsumption {
-    return [parameters sdl_objectForName:SDLNameInstantFuelConsumption ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameInstantFuelConsumption ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setExternalTemperature:(nullable SDLVehicleDataResult *)externalTemperature {
-    [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature];
+    [parameters sdl_setObject:externalTemperature forName:SDLRPCParameterNameExternalTemperature];
 }
 
 - (nullable SDLVehicleDataResult *)externalTemperature {
-    return [parameters sdl_objectForName:SDLNameExternalTemperature ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameExternalTemperature ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setPrndl:(nullable SDLVehicleDataResult *)prndl {
-    [parameters sdl_setObject:prndl forName:SDLNamePRNDL];
+    [parameters sdl_setObject:prndl forName:SDLRPCParameterNamePRNDL];
 }
 
 - (nullable SDLVehicleDataResult *)prndl {
-    return [parameters sdl_objectForName:SDLNamePRNDL ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNamePRNDL ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setTirePressure:(nullable SDLVehicleDataResult *)tirePressure {
-    [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure];
+    [parameters sdl_setObject:tirePressure forName:SDLRPCParameterNameTirePressure];
 }
 
 - (nullable SDLVehicleDataResult *)tirePressure {
-    return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameTirePressure ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setOdometer:(nullable SDLVehicleDataResult *)odometer {
-    [parameters sdl_setObject:odometer forName:SDLNameOdometer];
+    [parameters sdl_setObject:odometer forName:SDLRPCParameterNameOdometer];
 }
 
 - (nullable SDLVehicleDataResult *)odometer {
-    return [parameters sdl_objectForName:SDLNameOdometer ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameOdometer ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setBeltStatus:(nullable SDLVehicleDataResult *)beltStatus {
-    [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus];
+    [parameters sdl_setObject:beltStatus forName:SDLRPCParameterNameBeltStatus];
 }
 
 - (nullable SDLVehicleDataResult *)beltStatus {
-    return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameBeltStatus ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setBodyInformation:(nullable SDLVehicleDataResult *)bodyInformation {
-    [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation];
+    [parameters sdl_setObject:bodyInformation forName:SDLRPCParameterNameBodyInformation];
 }
 
 - (nullable SDLVehicleDataResult *)bodyInformation {
-    return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameBodyInformation ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setDeviceStatus:(nullable SDLVehicleDataResult *)deviceStatus {
-    [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus];
+    [parameters sdl_setObject:deviceStatus forName:SDLRPCParameterNameDeviceStatus];
 }
 
 - (nullable SDLVehicleDataResult *)deviceStatus {
-    return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameDeviceStatus ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setDriverBraking:(nullable SDLVehicleDataResult *)driverBraking {
-    [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking];
+    [parameters sdl_setObject:driverBraking forName:SDLRPCParameterNameDriverBraking];
 }
 
 - (nullable SDLVehicleDataResult *)driverBraking {
-    return [parameters sdl_objectForName:SDLNameDriverBraking ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameDriverBraking ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setWiperStatus:(nullable SDLVehicleDataResult *)wiperStatus {
-    [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus];
+    [parameters sdl_setObject:wiperStatus forName:SDLRPCParameterNameWiperStatus];
 }
 
 - (nullable SDLVehicleDataResult *)wiperStatus {
-    return [parameters sdl_objectForName:SDLNameWiperStatus ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameWiperStatus ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setHeadLampStatus:(nullable SDLVehicleDataResult *)headLampStatus {
-    [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus];
+    [parameters sdl_setObject:headLampStatus forName:SDLRPCParameterNameHeadLampStatus];
 }
 
 - (nullable SDLVehicleDataResult *)headLampStatus {
-    return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameHeadLampStatus ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setEngineOilLife:(nullable SDLVehicleDataResult *)engineOilLife {
-    [parameters sdl_setObject:engineOilLife forName:SDLNameEngineOilLife];
+    [parameters sdl_setObject:engineOilLife forName:SDLRPCParameterNameEngineOilLife];
 }
 
 - (nullable SDLVehicleDataResult *)engineOilLife {
-    return [parameters sdl_objectForName:SDLNameEngineOilLife];
+    return [parameters sdl_objectForName:SDLRPCParameterNameEngineOilLife ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setEngineTorque:(nullable SDLVehicleDataResult *)engineTorque {
-    [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque];
+    [parameters sdl_setObject:engineTorque forName:SDLRPCParameterNameEngineTorque];
 }
 
 - (nullable SDLVehicleDataResult *)engineTorque {
-    return [parameters sdl_objectForName:SDLNameEngineTorque ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameEngineTorque ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setAccPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition {
-    [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition];
+    [parameters sdl_setObject:accPedalPosition forName:SDLRPCParameterNameAccelerationPedalPosition];
 }
 
 - (nullable SDLVehicleDataResult *)accPedalPosition {
-    return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameAccelerationPedalPosition ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setSteeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle {
-    [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle];
+    [parameters sdl_setObject:steeringWheelAngle forName:SDLRPCParameterNameSteeringWheelAngle];
 }
 
 - (nullable SDLVehicleDataResult *)steeringWheelAngle {
-    return [parameters sdl_objectForName:SDLNameSteeringWheelAngle ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameSteeringWheelAngle ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setECallInfo:(nullable SDLVehicleDataResult *)eCallInfo {
-    [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo];
+    [parameters sdl_setObject:eCallInfo forName:SDLRPCParameterNameECallInfo];
 }
 
 - (nullable SDLVehicleDataResult *)eCallInfo {
-    return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameECallInfo ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setAirbagStatus:(nullable SDLVehicleDataResult *)airbagStatus {
-    [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus];
+    [parameters sdl_setObject:airbagStatus forName:SDLRPCParameterNameAirbagStatus];
 }
 
 - (nullable SDLVehicleDataResult *)airbagStatus {
-    return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameAirbagStatus ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setEmergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent {
-    [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent];
+    [parameters sdl_setObject:emergencyEvent forName:SDLRPCParameterNameEmergencyEvent];
 }
 
 - (nullable SDLVehicleDataResult *)emergencyEvent {
-    return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameEmergencyEvent ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setClusterModes:(nullable SDLVehicleDataResult *)clusterModes {
-    [parameters sdl_setObject:clusterModes forName:SDLNameClusterModes];
+    [parameters sdl_setObject:clusterModes forName:SDLRPCParameterNameClusterModes];
 }
 
 - (nullable SDLVehicleDataResult *)clusterModes {
-    return [parameters sdl_objectForName:SDLNameClusterModes ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameClusterModes ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setMyKey:(nullable SDLVehicleDataResult *)myKey {
-    [parameters sdl_setObject:myKey forName:SDLNameMyKey];
+    [parameters sdl_setObject:myKey forName:SDLRPCParameterNameMyKey];
 }
 
 - (nullable SDLVehicleDataResult *)myKey {
-    return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameMyKey ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setElectronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus {
-    [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLNameElectronicParkBrakeStatus];
+    [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLRPCParameterNameElectronicParkBrakeStatus];
 }
 
 - (nullable SDLVehicleDataResult *)electronicParkBrakeStatus {
-    return [parameters sdl_objectForName:SDLNameElectronicParkBrakeStatus ofClass:[SDLVehicleDataResult class]];
+    return [parameters sdl_objectForName:SDLRPCParameterNameElectronicParkBrakeStatus ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 - (void)setTurnSignal:(nullable SDLVehicleDataResult *)turnSignal {
-    [parameters sdl_setObject:turnSignal forName:SDLNameTurnSignal];
+    [parameters sdl_setObject:turnSignal forName:SDLRPCParameterNameTurnSignal];
 }
 
 - (nullable SDLVehicleDataResult *)turnSignal {
-    return [parameters sdl_objectForName:SDLNameTurnSignal ofClass:SDLVehicleDataResult.class];
+    return [parameters sdl_objectForName:SDLRPCParameterNameTurnSignal ofClass:SDLVehicleDataResult.class error:nil];
+}
+
+- (void)setCloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID {
+    [parameters sdl_setObject:cloudAppVehicleID forName:SDLRPCParameterNameCloudAppVehicleID];
+}
+
+- (nullable SDLVehicleDataResult *)cloudAppVehicleID {
+    return [parameters sdl_objectForName:SDLRPCParameterNameCloudAppVehicleID ofClass:SDLVehicleDataResult.class error:nil];
 }
 
 @end