summaryrefslogtreecommitdiff
path: root/SmartDeviceLink
diff options
context:
space:
mode:
Diffstat (limited to 'SmartDeviceLink')
-rw-r--r--SmartDeviceLink/SDLAddCommand.m3
-rw-r--r--SmartDeviceLink/SDLAddCommandResponse.m2
-rw-r--r--SmartDeviceLink/SDLAddSubMenu.m2
-rw-r--r--SmartDeviceLink/SDLAddSubMenuResponse.m2
-rw-r--r--SmartDeviceLink/SDLAirbagStatus.m3
-rw-r--r--SmartDeviceLink/SDLAlert.m2
-rw-r--r--SmartDeviceLink/SDLAlertManeuver.m2
-rw-r--r--SmartDeviceLink/SDLAlertManeuverResponse.m2
-rw-r--r--SmartDeviceLink/SDLAlertResponse.m2
-rw-r--r--SmartDeviceLink/SDLAppInfo.m1
-rw-r--r--SmartDeviceLink/SDLAudioPassThruCapabilities.m2
-rw-r--r--SmartDeviceLink/SDLBeltStatus.m3
-rw-r--r--SmartDeviceLink/SDLBodyInformation.m3
-rw-r--r--SmartDeviceLink/SDLButtonCapabilities.m3
-rw-r--r--SmartDeviceLink/SDLChangeRegistration.m2
-rw-r--r--SmartDeviceLink/SDLChangeRegistrationResponse.m2
-rw-r--r--SmartDeviceLink/SDLChoice.m3
-rw-r--r--SmartDeviceLink/SDLClusterModeStatus.m3
-rw-r--r--SmartDeviceLink/SDLCreateInteractionChoiceSet.m2
-rw-r--r--SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m2
-rw-r--r--SmartDeviceLink/SDLDIDResult.m3
-rw-r--r--SmartDeviceLink/SDLDeleteCommand.m2
-rw-r--r--SmartDeviceLink/SDLDeleteCommandResponse.m2
-rw-r--r--SmartDeviceLink/SDLDeleteFile.m2
-rw-r--r--SmartDeviceLink/SDLDeleteFileResponse.m2
-rw-r--r--SmartDeviceLink/SDLDeleteInteractionChoiceSet.m2
-rw-r--r--SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m2
-rw-r--r--SmartDeviceLink/SDLDeleteSubMenu.m2
-rw-r--r--SmartDeviceLink/SDLDeleteSubMenuResponse.m2
-rw-r--r--SmartDeviceLink/SDLDeviceInfo.m3
-rw-r--r--SmartDeviceLink/SDLDeviceStatus.m3
-rw-r--r--SmartDeviceLink/SDLDiagnosticMessage.m2
-rw-r--r--SmartDeviceLink/SDLDiagnosticMessageResponse.m2
-rw-r--r--SmartDeviceLink/SDLDialNumber.m2
-rw-r--r--SmartDeviceLink/SDLDialNumberResponse.m2
-rw-r--r--SmartDeviceLink/SDLDisplayCapabilities.m3
-rw-r--r--SmartDeviceLink/SDLECallInfo.m2
-rw-r--r--SmartDeviceLink/SDLEmergencyEvent.m3
-rw-r--r--SmartDeviceLink/SDLEncodedSyncPData.m2
-rw-r--r--SmartDeviceLink/SDLEncodedSyncPDataResponse.m2
-rw-r--r--SmartDeviceLink/SDLEndAudioPassThru.m2
-rw-r--r--SmartDeviceLink/SDLEndAudioPassThruResponse.m2
-rw-r--r--SmartDeviceLink/SDLGPSData.m3
-rw-r--r--SmartDeviceLink/SDLGenericResponse.m2
-rw-r--r--SmartDeviceLink/SDLGetDTCs.m2
-rw-r--r--SmartDeviceLink/SDLGetDTCsResponse.m2
-rw-r--r--SmartDeviceLink/SDLGetVehicleData.m2
-rw-r--r--SmartDeviceLink/SDLGetVehicleDataResponse.m2
-rw-r--r--SmartDeviceLink/SDLHMICapabilities.m3
-rw-r--r--SmartDeviceLink/SDLHMIPermissions.m2
-rw-r--r--SmartDeviceLink/SDLHeadLampStatus.m3
-rw-r--r--SmartDeviceLink/SDLImage.m2
-rw-r--r--SmartDeviceLink/SDLImageField.m3
-rw-r--r--SmartDeviceLink/SDLImageResolution.m2
-rw-r--r--SmartDeviceLink/SDLKeyboardProperties.m3
-rw-r--r--SmartDeviceLink/SDLListFiles.m2
-rw-r--r--SmartDeviceLink/SDLListFilesResponse.m2
-rw-r--r--SmartDeviceLink/SDLMenuParams.m2
-rw-r--r--SmartDeviceLink/SDLMyKey.m3
-rw-r--r--SmartDeviceLink/SDLOnAppInterfaceUnregistered.m3
-rw-r--r--SmartDeviceLink/SDLOnAudioPassThru.m2
-rw-r--r--SmartDeviceLink/SDLOnButtonEvent.m3
-rw-r--r--SmartDeviceLink/SDLOnButtonPress.m3
-rw-r--r--SmartDeviceLink/SDLOnCommand.m3
-rw-r--r--SmartDeviceLink/SDLOnDriverDistraction.m3
-rw-r--r--SmartDeviceLink/SDLOnEncodedSyncPData.m3
-rw-r--r--SmartDeviceLink/SDLOnHMIStatus.m3
-rw-r--r--SmartDeviceLink/SDLOnHashChange.m2
-rw-r--r--SmartDeviceLink/SDLOnKeyboardInput.m3
-rw-r--r--SmartDeviceLink/SDLOnLanguageChange.m3
-rw-r--r--SmartDeviceLink/SDLOnPermissionsChange.m3
-rw-r--r--SmartDeviceLink/SDLOnSyncPData.m2
-rw-r--r--SmartDeviceLink/SDLOnSystemRequest.m3
-rw-r--r--SmartDeviceLink/SDLOnTBTClientState.m3
-rw-r--r--SmartDeviceLink/SDLOnTouchEvent.m3
-rw-r--r--SmartDeviceLink/SDLOnVehicleData.m2
-rw-r--r--SmartDeviceLink/SDLParameterPermissions.m2
-rw-r--r--SmartDeviceLink/SDLPerformAudioPassThru.m3
-rw-r--r--SmartDeviceLink/SDLPerformAudioPassThruResponse.m2
-rw-r--r--SmartDeviceLink/SDLPerformInteraction.m2
-rw-r--r--SmartDeviceLink/SDLPerformInteractionResponse.m3
-rw-r--r--SmartDeviceLink/SDLPermissionItem.m3
-rw-r--r--SmartDeviceLink/SDLPresetBankCapabilities.m2
-rw-r--r--SmartDeviceLink/SDLPutFile.m3
-rw-r--r--SmartDeviceLink/SDLPutFileResponse.m2
-rw-r--r--SmartDeviceLink/SDLRPCMessage.h1
-rw-r--r--SmartDeviceLink/SDLRPCMessage.m3
-rw-r--r--SmartDeviceLink/SDLRPCNotification.m2
-rw-r--r--SmartDeviceLink/SDLRPCRequest.m2
-rw-r--r--SmartDeviceLink/SDLRPCResponse.m2
-rw-r--r--SmartDeviceLink/SDLRPCStruct.h2
-rw-r--r--SmartDeviceLink/SDLRPCStruct.m1
-rw-r--r--SmartDeviceLink/SDLReadDID.m2
-rw-r--r--SmartDeviceLink/SDLReadDIDResponse.m2
-rw-r--r--SmartDeviceLink/SDLRegisterAppInterface.m2
-rw-r--r--SmartDeviceLink/SDLRegisterAppInterfaceResponse.m3
-rw-r--r--SmartDeviceLink/SDLResetGlobalProperties.m2
-rw-r--r--SmartDeviceLink/SDLResetGlobalPropertiesResponse.m2
-rw-r--r--SmartDeviceLink/SDLScreenParams.m3
-rw-r--r--SmartDeviceLink/SDLScrollableMessage.m2
-rw-r--r--SmartDeviceLink/SDLScrollableMessageResponse.m2
-rw-r--r--SmartDeviceLink/SDLSendLocation.m3
-rw-r--r--SmartDeviceLink/SDLSendLocationResponse.m3
-rw-r--r--SmartDeviceLink/SDLSetAppIcon.m2
-rw-r--r--SmartDeviceLink/SDLSetAppIconResponse.m2
-rw-r--r--SmartDeviceLink/SDLSetDisplayLayout.m2
-rw-r--r--SmartDeviceLink/SDLSetDisplayLayoutResponse.m3
-rw-r--r--SmartDeviceLink/SDLSetGlobalProperties.m2
-rw-r--r--SmartDeviceLink/SDLSetGlobalPropertiesResponse.m2
-rw-r--r--SmartDeviceLink/SDLSetMediaClockTimer.m3
-rw-r--r--SmartDeviceLink/SDLSetMediaClockTimerResponse.m2
-rw-r--r--SmartDeviceLink/SDLShow.m2
-rw-r--r--SmartDeviceLink/SDLShowConstantTBT.m3
-rw-r--r--SmartDeviceLink/SDLShowConstantTBTResponse.m3
-rw-r--r--SmartDeviceLink/SDLShowResponse.m2
-rw-r--r--SmartDeviceLink/SDLSingleTireStatus.m3
-rw-r--r--SmartDeviceLink/SDLSlider.m2
-rw-r--r--SmartDeviceLink/SDLSliderResponse.m2
-rw-r--r--SmartDeviceLink/SDLSoftButton.m3
-rw-r--r--SmartDeviceLink/SDLSoftButtonCapabilities.m2
-rw-r--r--SmartDeviceLink/SDLSpeak.m2
-rw-r--r--SmartDeviceLink/SDLSpeakResponse.m2
-rw-r--r--SmartDeviceLink/SDLStartTime.m2
-rw-r--r--SmartDeviceLink/SDLSubscribeButton.m3
-rw-r--r--SmartDeviceLink/SDLSubscribeButtonResponse.m2
-rw-r--r--SmartDeviceLink/SDLSubscribeVehicleData.m2
-rw-r--r--SmartDeviceLink/SDLSubscribeVehicleDataResponse.m3
-rw-r--r--SmartDeviceLink/SDLSyncMsgVersion.m2
-rw-r--r--SmartDeviceLink/SDLSyncPData.m2
-rw-r--r--SmartDeviceLink/SDLSyncPDataResponse.m2
-rw-r--r--SmartDeviceLink/SDLSystemRequest.m3
-rw-r--r--SmartDeviceLink/SDLSystemRequestResponse.m2
-rw-r--r--SmartDeviceLink/SDLTTSChunk.m3
-rw-r--r--SmartDeviceLink/SDLTextField.m2
-rw-r--r--SmartDeviceLink/SDLTireStatus.m3
-rw-r--r--SmartDeviceLink/SDLTouchCoord.m2
-rw-r--r--SmartDeviceLink/SDLTouchEvent.m2
-rw-r--r--SmartDeviceLink/SDLTouchEventCapabilities.m2
-rw-r--r--SmartDeviceLink/SDLTurn.m3
-rw-r--r--SmartDeviceLink/SDLUnregisterAppInterface.m2
-rw-r--r--SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m2
-rw-r--r--SmartDeviceLink/SDLUnsubscribeButton.m3
-rw-r--r--SmartDeviceLink/SDLUnsubscribeButtonResponse.m2
-rw-r--r--SmartDeviceLink/SDLUnsubscribeVehicleData.m2
-rw-r--r--SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m3
-rw-r--r--SmartDeviceLink/SDLUpdateTurnList.m2
-rw-r--r--SmartDeviceLink/SDLUpdateTurnListResponse.m2
-rw-r--r--SmartDeviceLink/SDLVehicleDataResult.m3
-rw-r--r--SmartDeviceLink/SDLVehicleType.m2
-rw-r--r--SmartDeviceLink/SDLVrHelpItem.m2
150 files changed, 148 insertions, 204 deletions
diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m
index 576065ee1..688f76b31 100644
--- a/SmartDeviceLink/SDLAddCommand.m
+++ b/SmartDeviceLink/SDLAddCommand.m
@@ -6,8 +6,7 @@
#import "SDLImage.h"
#import "SDLMenuParams.h"
-
-
+#import "SDLNames.h"
@implementation SDLAddCommand
diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m
index 7728f3f29..bd01431ac 100644
--- a/SmartDeviceLink/SDLAddCommandResponse.m
+++ b/SmartDeviceLink/SDLAddCommandResponse.m
@@ -2,7 +2,7 @@
#import "SDLAddCommandResponse.h"
-
+#import "SDLNames.h"
@implementation SDLAddCommandResponse
diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m
index 027be936f..d69960acc 100644
--- a/SmartDeviceLink/SDLAddSubMenu.m
+++ b/SmartDeviceLink/SDLAddSubMenu.m
@@ -2,7 +2,7 @@
#import "SDLAddSubMenu.h"
-
+#import "SDLNames.h"
@implementation SDLAddSubMenu
diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m
index beb587057..27c1a136b 100644
--- a/SmartDeviceLink/SDLAddSubMenuResponse.m
+++ b/SmartDeviceLink/SDLAddSubMenuResponse.m
@@ -2,7 +2,7 @@
#import "SDLAddSubMenuResponse.h"
-
+#import "SDLNames.h"
@implementation SDLAddSubMenuResponse
diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m
index 77f7db7e7..be2d7d1ed 100644
--- a/SmartDeviceLink/SDLAirbagStatus.m
+++ b/SmartDeviceLink/SDLAirbagStatus.m
@@ -2,10 +2,9 @@
#import "SDLAirbagStatus.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataEventStatus.h"
-
@implementation SDLAirbagStatus
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m
index bd86192ba..40d9407ba 100644
--- a/SmartDeviceLink/SDLAlert.m
+++ b/SmartDeviceLink/SDLAlert.m
@@ -2,7 +2,7 @@
#import "SDLAlert.h"
-
+#import "SDLNames.h"
#import "SDLSoftButton.h"
#import "SDLTTSChunk.h"
diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m
index f14044fb8..c3e90c6ad 100644
--- a/SmartDeviceLink/SDLAlertManeuver.m
+++ b/SmartDeviceLink/SDLAlertManeuver.m
@@ -4,7 +4,7 @@
#import "SDLAlertManeuver.h"
-
+#import "SDLNames.h"
#import "SDLSoftButton.h"
#import "SDLTTSChunk.h"
diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m
index ef1343b9d..1a6537248 100644
--- a/SmartDeviceLink/SDLAlertManeuverResponse.m
+++ b/SmartDeviceLink/SDLAlertManeuverResponse.m
@@ -3,7 +3,7 @@
#import "SDLAlertManeuverResponse.h"
-
+#import "SDLNames.h"
@implementation SDLAlertManeuverResponse
diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m
index 07fa747dc..f83ce4853 100644
--- a/SmartDeviceLink/SDLAlertResponse.m
+++ b/SmartDeviceLink/SDLAlertResponse.m
@@ -3,7 +3,7 @@
#import "SDLAlertResponse.h"
-
+#import "SDLNames.h"
@implementation SDLAlertResponse
diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m
index e4e52d5eb..00eca0d8d 100644
--- a/SmartDeviceLink/SDLAppInfo.m
+++ b/SmartDeviceLink/SDLAppInfo.m
@@ -3,6 +3,7 @@
#import "SDLAppInfo.h"
+#import "SDLNames.h"
@implementation SDLAppInfo
diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
index fd050ae98..eee93af8c 100644
--- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m
+++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m
@@ -6,7 +6,7 @@
#import "SDLAudioType.h"
#import "SDLBitsPerSample.h"
-
+#import "SDLNames.h"
#import "SDLSamplingRate.h"
diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m
index 8c285cb65..d471af81b 100644
--- a/SmartDeviceLink/SDLBeltStatus.m
+++ b/SmartDeviceLink/SDLBeltStatus.m
@@ -3,10 +3,9 @@
#import "SDLBeltStatus.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataEventStatus.h"
-
@implementation SDLBeltStatus
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m
index e0bd64a72..607559ee6 100644
--- a/SmartDeviceLink/SDLBodyInformation.m
+++ b/SmartDeviceLink/SDLBodyInformation.m
@@ -6,8 +6,7 @@
#import "SDLIgnitionStableStatus.h"
#import "SDLIgnitionStatus.h"
-
-
+#import "SDLNames.h"
@implementation SDLBodyInformation
diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m
index 16909f739..d5a87f70e 100644
--- a/SmartDeviceLink/SDLButtonCapabilities.m
+++ b/SmartDeviceLink/SDLButtonCapabilities.m
@@ -4,8 +4,7 @@
#import "SDLButtonCapabilities.h"
#import "SDLButtonName.h"
-
-
+#import "SDLNames.h"
@implementation SDLButtonCapabilities
diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m
index 636cbefad..064c68d6c 100644
--- a/SmartDeviceLink/SDLChangeRegistration.m
+++ b/SmartDeviceLink/SDLChangeRegistration.m
@@ -5,7 +5,7 @@
#import "SDLChangeRegistration.h"
#import "SDLLanguage.h"
-
+#import "SDLNames.h"
@implementation SDLChangeRegistration
diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m
index 4f2510086..d0d819b1f 100644
--- a/SmartDeviceLink/SDLChangeRegistrationResponse.m
+++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m
@@ -4,7 +4,7 @@
#import "SDLChangeRegistrationResponse.h"
-
+#import "SDLNames.h"
@implementation SDLChangeRegistrationResponse
diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m
index 288931007..6230a736f 100644
--- a/SmartDeviceLink/SDLChoice.m
+++ b/SmartDeviceLink/SDLChoice.m
@@ -4,8 +4,7 @@
#import "SDLChoice.h"
#import "SDLImage.h"
-
-
+#import "SDLNames.h"
@implementation SDLChoice
diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m
index e915c646e..4dcbabdd3 100644
--- a/SmartDeviceLink/SDLClusterModeStatus.m
+++ b/SmartDeviceLink/SDLClusterModeStatus.m
@@ -4,11 +4,10 @@
#import "SDLClusterModeStatus.h"
#import "SDLCarModeStatus.h"
-
+#import "SDLNames.h"
#import "SDLPowerModeQualificationStatus.h"
#import "SDLPowerModeStatus.h"
-
@implementation SDLClusterModeStatus
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
index 538c64977..e07b2905f 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m
@@ -5,7 +5,7 @@
#import "SDLCreateInteractionChoiceSet.h"
#import "SDLChoice.h"
-
+#import "SDLNames.h"
@implementation SDLCreateInteractionChoiceSet
diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
index 8ba418474..397549ef1 100644
--- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
+++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m
@@ -4,7 +4,7 @@
#import "SDLCreateInteractionChoiceSetResponse.h"
-
+#import "SDLNames.h"
@implementation SDLCreateInteractionChoiceSetResponse
diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m
index 4c3382e44..a5f6cc2f9 100644
--- a/SmartDeviceLink/SDLDIDResult.m
+++ b/SmartDeviceLink/SDLDIDResult.m
@@ -3,10 +3,9 @@
#import "SDLDIDResult.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataResultCode.h"
-
@implementation SDLDIDResult
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m
index 1efd2e3da..0033d67fd 100644
--- a/SmartDeviceLink/SDLDeleteCommand.m
+++ b/SmartDeviceLink/SDLDeleteCommand.m
@@ -4,7 +4,7 @@
#import "SDLDeleteCommand.h"
-
+#import "SDLNames.h"
@implementation SDLDeleteCommand
diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.m b/SmartDeviceLink/SDLDeleteCommandResponse.m
index b64398469..181a767c6 100644
--- a/SmartDeviceLink/SDLDeleteCommandResponse.m
+++ b/SmartDeviceLink/SDLDeleteCommandResponse.m
@@ -4,7 +4,7 @@
#import "SDLDeleteCommandResponse.h"
-
+#import "SDLNames.h"
@implementation SDLDeleteCommandResponse
diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m
index d98bde7a4..d0f39d35c 100644
--- a/SmartDeviceLink/SDLDeleteFile.m
+++ b/SmartDeviceLink/SDLDeleteFile.m
@@ -4,7 +4,7 @@
#import "SDLDeleteFile.h"
-
+#import "SDLNames.h"
@implementation SDLDeleteFile
diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m
index 193e8c13f..bd08e5182 100644
--- a/SmartDeviceLink/SDLDeleteFileResponse.m
+++ b/SmartDeviceLink/SDLDeleteFileResponse.m
@@ -4,7 +4,7 @@
#import "SDLDeleteFileResponse.h"
-
+#import "SDLNames.h"
@implementation SDLDeleteFileResponse
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
index a70a24176..3e525f974 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m
@@ -4,7 +4,7 @@
#import "SDLDeleteInteractionChoiceSet.h"
-
+#import "SDLNames.h"
@implementation SDLDeleteInteractionChoiceSet
diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
index c25ed3355..bbae6f5f1 100644
--- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
+++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m
@@ -4,7 +4,7 @@
#import "SDLDeleteInteractionChoiceSetResponse.h"
-
+#import "SDLNames.h"
@implementation SDLDeleteInteractionChoiceSetResponse
diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m
index 8638120e2..7f4c65213 100644
--- a/SmartDeviceLink/SDLDeleteSubMenu.m
+++ b/SmartDeviceLink/SDLDeleteSubMenu.m
@@ -4,7 +4,7 @@
#import "SDLDeleteSubMenu.h"
-
+#import "SDLNames.h"
@implementation SDLDeleteSubMenu
diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.m b/SmartDeviceLink/SDLDeleteSubMenuResponse.m
index 25826eb4a..55f58e39e 100644
--- a/SmartDeviceLink/SDLDeleteSubMenuResponse.m
+++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.m
@@ -4,7 +4,7 @@
#import "SDLDeleteSubMenuResponse.h"
-
+#import "SDLNames.h"
@implementation SDLDeleteSubMenuResponse
diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m
index efaca3792..e19b9c42d 100644
--- a/SmartDeviceLink/SDLDeviceInfo.m
+++ b/SmartDeviceLink/SDLDeviceInfo.m
@@ -3,8 +3,7 @@
#import "SDLDeviceInfo.h"
-
-
+#import "SDLNames.h"
@implementation SDLDeviceInfo
diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m
index 9c51e5d7e..32acd20cf 100644
--- a/SmartDeviceLink/SDLDeviceStatus.m
+++ b/SmartDeviceLink/SDLDeviceStatus.m
@@ -4,10 +4,9 @@
#import "SDLDeviceStatus.h"
#import "SDLDeviceLevelStatus.h"
-
+#import "SDLNames.h"
#import "SDLPrimaryAudioSource.h"
-
@implementation SDLDeviceStatus
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m
index fa0f40ca5..f4cb39e52 100644
--- a/SmartDeviceLink/SDLDiagnosticMessage.m
+++ b/SmartDeviceLink/SDLDiagnosticMessage.m
@@ -4,7 +4,7 @@
#import "SDLDiagnosticMessage.h"
-
+#import "SDLNames.h"
@implementation SDLDiagnosticMessage
diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
index 809e10fa7..cf399a9e9 100644
--- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m
+++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m
@@ -3,7 +3,7 @@
#import "SDLDiagnosticMessageResponse.h"
-
+#import "SDLNames.h"
@implementation SDLDiagnosticMessageResponse
diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m
index d46d91c33..12eb3f4ce 100644
--- a/SmartDeviceLink/SDLDialNumber.m
+++ b/SmartDeviceLink/SDLDialNumber.m
@@ -4,7 +4,7 @@
#import "SDLDialNumber.h"
-
+#import "SDLNames.h"
@implementation SDLDialNumber
diff --git a/SmartDeviceLink/SDLDialNumberResponse.m b/SmartDeviceLink/SDLDialNumberResponse.m
index dca7115b6..649edb9c5 100644
--- a/SmartDeviceLink/SDLDialNumberResponse.m
+++ b/SmartDeviceLink/SDLDialNumberResponse.m
@@ -4,7 +4,7 @@
#import "SDLDialNumberResponse.h"
-
+#import "SDLNames.h"
@implementation SDLDialNumberResponse
diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m
index d1e8af52f..dcf589956 100644
--- a/SmartDeviceLink/SDLDisplayCapabilities.m
+++ b/SmartDeviceLink/SDLDisplayCapabilities.m
@@ -6,11 +6,10 @@
#import "SDLDisplayType.h"
#import "SDLImageField.h"
#import "SDLMediaClockFormat.h"
-
+#import "SDLNames.h"
#import "SDLScreenParams.h"
#import "SDLTextField.h"
-
@implementation SDLDisplayCapabilities
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m
index 7205c9d22..067117cc7 100644
--- a/SmartDeviceLink/SDLECallInfo.m
+++ b/SmartDeviceLink/SDLECallInfo.m
@@ -4,7 +4,7 @@
#import "SDLECallInfo.h"
#import "SDLECallConfirmationStatus.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataNotificationStatus.h"
diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m
index 5bb2afaed..4f4bf0526 100644
--- a/SmartDeviceLink/SDLEmergencyEvent.m
+++ b/SmartDeviceLink/SDLEmergencyEvent.m
@@ -5,10 +5,9 @@
#import "SDLEmergencyEventType.h"
#import "SDLFuelCutoffStatus.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataEventStatus.h"
-
@implementation SDLEmergencyEvent
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m
index 5461c5343..1f30e59e7 100644
--- a/SmartDeviceLink/SDLEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLEncodedSyncPData.m
@@ -4,7 +4,7 @@
#import "SDLEncodedSyncPData.h"
-
+#import "SDLNames.h"
@implementation SDLEncodedSyncPData
diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
index ae021b1c1..92f0c6e5e 100644
--- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
+++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m
@@ -4,7 +4,7 @@
#import "SDLEncodedSyncPDataResponse.h"
-
+#import "SDLNames.h"
@implementation SDLEncodedSyncPDataResponse
diff --git a/SmartDeviceLink/SDLEndAudioPassThru.m b/SmartDeviceLink/SDLEndAudioPassThru.m
index 8c4c59edb..ef684d270 100644
--- a/SmartDeviceLink/SDLEndAudioPassThru.m
+++ b/SmartDeviceLink/SDLEndAudioPassThru.m
@@ -4,7 +4,7 @@
#import "SDLEndAudioPassThru.h"
-
+#import "SDLNames.h"
@implementation SDLEndAudioPassThru
diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SmartDeviceLink/SDLEndAudioPassThruResponse.m
index 1d73a804a..cd6ac15bd 100644
--- a/SmartDeviceLink/SDLEndAudioPassThruResponse.m
+++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.m
@@ -4,7 +4,7 @@
#import "SDLEndAudioPassThruResponse.h"
-
+#import "SDLNames.h"
@implementation SDLEndAudioPassThruResponse
diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m
index 096285d8e..2ae666db3 100644
--- a/SmartDeviceLink/SDLGPSData.m
+++ b/SmartDeviceLink/SDLGPSData.m
@@ -5,8 +5,7 @@
#import "SDLCompassDirection.h"
#import "SDLDimension.h"
-
-
+#import "SDLNames.h"
@implementation SDLGPSData
diff --git a/SmartDeviceLink/SDLGenericResponse.m b/SmartDeviceLink/SDLGenericResponse.m
index e3efaaeb8..7c58493ff 100644
--- a/SmartDeviceLink/SDLGenericResponse.m
+++ b/SmartDeviceLink/SDLGenericResponse.m
@@ -4,7 +4,7 @@
#import "SDLGenericResponse.h"
-
+#import "SDLNames.h"
@implementation SDLGenericResponse
diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m
index 2425630a1..f56e2ec6a 100644
--- a/SmartDeviceLink/SDLGetDTCs.m
+++ b/SmartDeviceLink/SDLGetDTCs.m
@@ -4,7 +4,7 @@
#import "SDLGetDTCs.h"
-
+#import "SDLNames.h"
@implementation SDLGetDTCs
diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m
index 6d8d1bec1..32a0a19be 100644
--- a/SmartDeviceLink/SDLGetDTCsResponse.m
+++ b/SmartDeviceLink/SDLGetDTCsResponse.m
@@ -4,7 +4,7 @@
#import "SDLGetDTCsResponse.h"
-
+#import "SDLNames.h"
@implementation SDLGetDTCsResponse
diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m
index 13c287349..8d2f1eeaf 100644
--- a/SmartDeviceLink/SDLGetVehicleData.m
+++ b/SmartDeviceLink/SDLGetVehicleData.m
@@ -4,7 +4,7 @@
#import "SDLGetVehicleData.h"
-
+#import "SDLNames.h"
@implementation SDLGetVehicleData
diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m
index c32a93dd9..a273a441d 100644
--- a/SmartDeviceLink/SDLGetVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m
@@ -15,7 +15,7 @@
#import "SDLGPSData.h"
#import "SDLHeadLampStatus.h"
#import "SDLMyKey.h"
-
+#import "SDLNames.h"
#import "SDLPRNDL.h"
#import "SDLTireStatus.h"
#import "SDLVehicleDataEventStatus.h"
diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m
index a758f3c0a..e0556d458 100644
--- a/SmartDeviceLink/SDLHMICapabilities.m
+++ b/SmartDeviceLink/SDLHMICapabilities.m
@@ -4,8 +4,7 @@
#import "SDLHMICapabilities.h"
-
-
+#import "SDLNames.h"
@implementation SDLHMICapabilities
diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m
index 868d5414d..a0b047fce 100644
--- a/SmartDeviceLink/SDLHMIPermissions.m
+++ b/SmartDeviceLink/SDLHMIPermissions.m
@@ -5,7 +5,7 @@
#import "SDLHMIPermissions.h"
#import "SDLHMILevel.h"
-
+#import "SDLNames.h"
@implementation SDLHMIPermissions
diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m
index 07509cb36..b203450b6 100644
--- a/SmartDeviceLink/SDLHeadLampStatus.m
+++ b/SmartDeviceLink/SDLHeadLampStatus.m
@@ -4,8 +4,7 @@
#import "SDLHeadLampStatus.h"
#import "SDLAmbientLightStatus.h"
-
-
+#import "SDLNames.h"
@implementation SDLHeadLampStatus
diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m
index 94b52b1a1..385564ba3 100644
--- a/SmartDeviceLink/SDLImage.m
+++ b/SmartDeviceLink/SDLImage.m
@@ -4,7 +4,7 @@
#import "SDLImage.h"
#import "SDLImageType.h"
-
+#import "SDLNames.h"
@implementation SDLImage
diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m
index 7b26c2a9b..4c8562ad7 100644
--- a/SmartDeviceLink/SDLImageField.m
+++ b/SmartDeviceLink/SDLImageField.m
@@ -6,8 +6,7 @@
#import "SDLFileType.h"
#import "SDLImageFieldName.h"
#import "SDLImageResolution.h"
-
-
+#import "SDLNames.h"
@implementation SDLImageField
diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m
index 997933950..f1459158a 100644
--- a/SmartDeviceLink/SDLImageResolution.m
+++ b/SmartDeviceLink/SDLImageResolution.m
@@ -4,7 +4,7 @@
#import "SDLImageResolution.h"
-
+#import "SDLNames.h"
@implementation SDLImageResolution
diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m
index c33adbd0b..53b7ae81f 100644
--- a/SmartDeviceLink/SDLKeyboardProperties.m
+++ b/SmartDeviceLink/SDLKeyboardProperties.m
@@ -6,8 +6,7 @@
#import "SDLKeyboardLayout.h"
#import "SDLKeypressMode.h"
#import "SDLLanguage.h"
-
-
+#import "SDLNames.h"
@implementation SDLKeyboardProperties
diff --git a/SmartDeviceLink/SDLListFiles.m b/SmartDeviceLink/SDLListFiles.m
index a8a756a7b..550a52116 100644
--- a/SmartDeviceLink/SDLListFiles.m
+++ b/SmartDeviceLink/SDLListFiles.m
@@ -4,7 +4,7 @@
#import "SDLListFiles.h"
-
+#import "SDLNames.h"
@implementation SDLListFiles
diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m
index 1c24853fa..87b3df8e3 100644
--- a/SmartDeviceLink/SDLListFilesResponse.m
+++ b/SmartDeviceLink/SDLListFilesResponse.m
@@ -4,7 +4,7 @@
#import "SDLListFilesResponse.h"
-
+#import "SDLNames.h"
@implementation SDLListFilesResponse
diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m
index c020698d7..44d8019e7 100644
--- a/SmartDeviceLink/SDLMenuParams.m
+++ b/SmartDeviceLink/SDLMenuParams.m
@@ -4,7 +4,7 @@
#import "SDLMenuParams.h"
-
+#import "SDLNames.h"
@implementation SDLMenuParams
diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m
index 9e70f7662..55848812f 100644
--- a/SmartDeviceLink/SDLMyKey.m
+++ b/SmartDeviceLink/SDLMyKey.m
@@ -3,10 +3,9 @@
#import "SDLMyKey.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataStatus.h"
-
@implementation SDLMyKey
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
index 216c4783d..440a8c23b 100644
--- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
+++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
@@ -4,8 +4,7 @@
#import "SDLOnAppInterfaceUnregistered.h"
#import "SDLAppInterfaceUnregisteredReason.h"
-
-
+#import "SDLNames.h"
@implementation SDLOnAppInterfaceUnregistered
diff --git a/SmartDeviceLink/SDLOnAudioPassThru.m b/SmartDeviceLink/SDLOnAudioPassThru.m
index 4f8df6c54..56de15a26 100644
--- a/SmartDeviceLink/SDLOnAudioPassThru.m
+++ b/SmartDeviceLink/SDLOnAudioPassThru.m
@@ -4,7 +4,7 @@
#import "SDLOnAudioPassThru.h"
-
+#import "SDLNames.h"
@implementation SDLOnAudioPassThru
diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m
index 9fcf65225..9568a608c 100644
--- a/SmartDeviceLink/SDLOnButtonEvent.m
+++ b/SmartDeviceLink/SDLOnButtonEvent.m
@@ -5,8 +5,7 @@
#import "SDLButtonEventMode.h"
#import "SDLButtonName.h"
-
-
+#import "SDLNames.h"
@implementation SDLOnButtonEvent
diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m
index fe5df171a..103413258 100644
--- a/SmartDeviceLink/SDLOnButtonPress.m
+++ b/SmartDeviceLink/SDLOnButtonPress.m
@@ -5,8 +5,7 @@
#import "SDLButtonName.h"
#import "SDLButtonPressMode.h"
-
-
+#import "SDLNames.h"
@implementation SDLOnButtonPress
diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m
index 06312e87c..075e74044 100644
--- a/SmartDeviceLink/SDLOnCommand.m
+++ b/SmartDeviceLink/SDLOnCommand.m
@@ -3,10 +3,9 @@
#import "SDLOnCommand.h"
-
+#import "SDLNames.h"
#import "SDLTriggerSource.h"
-
@implementation SDLOnCommand
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink/SDLOnDriverDistraction.m
index 4ecd386dc..0394172b0 100644
--- a/SmartDeviceLink/SDLOnDriverDistraction.m
+++ b/SmartDeviceLink/SDLOnDriverDistraction.m
@@ -3,10 +3,9 @@
#import "SDLOnDriverDistraction.h"
+#import "SDLNames.h"
#import "SDLDriverDistractionState.h"
-
-
@implementation SDLOnDriverDistraction
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m
index 16286dedb..f9ce20dd8 100644
--- a/SmartDeviceLink/SDLOnEncodedSyncPData.m
+++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m
@@ -3,8 +3,7 @@
#import "SDLOnEncodedSyncPData.h"
-
-
+#import "SDLNames.h"
@implementation SDLOnEncodedSyncPData
diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m
index 04be9b5ba..3948384a6 100644
--- a/SmartDeviceLink/SDLOnHMIStatus.m
+++ b/SmartDeviceLink/SDLOnHMIStatus.m
@@ -5,10 +5,9 @@
#import "SDLAudioStreamingState.h"
#import "SDLHMILevel.h"
-
+#import "SDLNames.h"
#import "SDLSystemContext.h"
-
@implementation SDLOnHMIStatus
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnHashChange.m b/SmartDeviceLink/SDLOnHashChange.m
index 81460d000..6f9b62dc9 100644
--- a/SmartDeviceLink/SDLOnHashChange.m
+++ b/SmartDeviceLink/SDLOnHashChange.m
@@ -4,7 +4,7 @@
#import "SDLOnHashChange.h"
-
+#import "SDLNames.h"
@implementation SDLOnHashChange
diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m
index 3d8dd4a25..c66cb09ff 100644
--- a/SmartDeviceLink/SDLOnKeyboardInput.m
+++ b/SmartDeviceLink/SDLOnKeyboardInput.m
@@ -4,8 +4,7 @@
#import "SDLOnKeyboardInput.h"
#import "SDLKeyboardEvent.h"
-
-
+#import "SDLNames.h"
@implementation SDLOnKeyboardInput
diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m
index d7dc28c13..f5ea69f8a 100644
--- a/SmartDeviceLink/SDLOnLanguageChange.m
+++ b/SmartDeviceLink/SDLOnLanguageChange.m
@@ -4,8 +4,7 @@
#import "SDLOnLanguageChange.h"
#import "SDLLanguage.h"
-
-
+#import "SDLNames.h"
@implementation SDLOnLanguageChange
diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m
index 65d6eb06c..6e1701672 100644
--- a/SmartDeviceLink/SDLOnPermissionsChange.m
+++ b/SmartDeviceLink/SDLOnPermissionsChange.m
@@ -3,10 +3,9 @@
#import "SDLOnPermissionsChange.h"
-
+#import "SDLNames.h"
#import "SDLPermissionItem.h"
-
@implementation SDLOnPermissionsChange
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m
index 51647d7ae..5432bfa04 100644
--- a/SmartDeviceLink/SDLOnSyncPData.m
+++ b/SmartDeviceLink/SDLOnSyncPData.m
@@ -4,7 +4,7 @@
#import "SDLOnSyncPData.h"
-
+#import "SDLNames.h"
@implementation SDLOnSyncPData
diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m
index 7b2fdf0b4..495ee551e 100644
--- a/SmartDeviceLink/SDLOnSystemRequest.m
+++ b/SmartDeviceLink/SDLOnSystemRequest.m
@@ -4,10 +4,9 @@
#import "SDLOnSystemRequest.h"
#import "SDLFileType.h"
-
+#import "SDLNames.h"
#import "SDLRequestType.h"
-
@implementation SDLOnSystemRequest
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m
index c7a19ed17..acc1d7bc2 100644
--- a/SmartDeviceLink/SDLOnTBTClientState.m
+++ b/SmartDeviceLink/SDLOnTBTClientState.m
@@ -3,10 +3,9 @@
#import "SDLOnTBTClientState.h"
-
+#import "SDLNames.h"
#import "SDLTBTState.h"
-
@implementation SDLOnTBTClientState
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m
index ca4a6d637..8b10c126d 100644
--- a/SmartDeviceLink/SDLOnTouchEvent.m
+++ b/SmartDeviceLink/SDLOnTouchEvent.m
@@ -3,11 +3,10 @@
#import "SDLOnTouchEvent.h"
-
+#import "SDLNames.h"
#import "SDLTouchEvent.h"
#import "SDLTouchType.h"
-
@implementation SDLOnTouchEvent
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m
index 169241610..b5981bd1d 100644
--- a/SmartDeviceLink/SDLOnVehicleData.m
+++ b/SmartDeviceLink/SDLOnVehicleData.m
@@ -14,7 +14,7 @@
#import "SDLGPSData.h"
#import "SDLHeadLampStatus.h"
#import "SDLMyKey.h"
-
+#import "SDLNames.h"
#import "SDLPRNDL.h"
#import "SDLTireStatus.h"
#import "SDLVehicleDataEventStatus.h"
diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m
index 1f883aca4..655d6b68e 100644
--- a/SmartDeviceLink/SDLParameterPermissions.m
+++ b/SmartDeviceLink/SDLParameterPermissions.m
@@ -4,7 +4,7 @@
#import "SDLParameterPermissions.h"
-
+#import "SDLNames.h"
@implementation SDLParameterPermissions
diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m
index 827567799..4214d9c67 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThru.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -6,11 +6,10 @@
#import "SDLAudioType.h"
#import "SDLBitsPerSample.h"
-
+#import "SDLNames.h"
#import "SDLSamplingRate.h"
#import "SDLTTSChunk.h"
-
@implementation SDLPerformAudioPassThru
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
index f3900a15f..5ea120d5d 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m
@@ -4,7 +4,7 @@
#import "SDLPerformAudioPassThruResponse.h"
-
+#import "SDLNames.h"
@implementation SDLPerformAudioPassThruResponse
diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m
index eba2e4ef0..4f3272b04 100644
--- a/SmartDeviceLink/SDLPerformInteraction.m
+++ b/SmartDeviceLink/SDLPerformInteraction.m
@@ -6,7 +6,7 @@
#import "SDLInteractionMode.h"
#import "SDLLayoutMode.h"
-
+#import "SDLNames.h"
#import "SDLTTSChunk.h"
#import "SDLVRHelpItem.h"
diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m
index 7fd053a2f..e2722d5bb 100644
--- a/SmartDeviceLink/SDLPerformInteractionResponse.m
+++ b/SmartDeviceLink/SDLPerformInteractionResponse.m
@@ -4,10 +4,9 @@
#import "SDLPerformInteractionResponse.h"
-
+#import "SDLNames.h"
#import "SDLTriggerSource.h"
-
@implementation SDLPerformInteractionResponse
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m
index 5f0ad6dcf..2b6a2ed61 100644
--- a/SmartDeviceLink/SDLPermissionItem.m
+++ b/SmartDeviceLink/SDLPermissionItem.m
@@ -4,10 +4,9 @@
#import "SDLPermissionItem.h"
#import "SDLHMIPermissions.h"
-
+#import "SDLNames.h"
#import "SDLParameterPermissions.h"
-
@implementation SDLPermissionItem
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m
index 7cdb57a45..146b3345e 100644
--- a/SmartDeviceLink/SDLPresetBankCapabilities.m
+++ b/SmartDeviceLink/SDLPresetBankCapabilities.m
@@ -4,7 +4,7 @@
#import "SDLPresetBankCapabilities.h"
-
+#import "SDLNames.h"
@implementation SDLPresetBankCapabilities
diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m
index 770b52789..e19c39b03 100644
--- a/SmartDeviceLink/SDLPutFile.m
+++ b/SmartDeviceLink/SDLPutFile.m
@@ -4,8 +4,7 @@
#import "SDLPutFile.h"
#import "SDLFileType.h"
-
-
+#import "SDLNames.h"
@implementation SDLPutFile
diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m
index 18f8b2fda..ee33a72ce 100644
--- a/SmartDeviceLink/SDLPutFileResponse.m
+++ b/SmartDeviceLink/SDLPutFileResponse.m
@@ -4,7 +4,7 @@
#import "SDLPutFileResponse.h"
-
+#import "SDLNames.h"
@implementation SDLPutFileResponse
diff --git a/SmartDeviceLink/SDLRPCMessage.h b/SmartDeviceLink/SDLRPCMessage.h
index f13fbc8b3..fc5f577ef 100644
--- a/SmartDeviceLink/SDLRPCMessage.h
+++ b/SmartDeviceLink/SDLRPCMessage.h
@@ -4,7 +4,6 @@
#import "SDLEnum.h"
#import "SDLRPCStruct.h"
-#import "SDLNames.h"
@interface SDLRPCMessage : SDLRPCStruct {
NSMutableDictionary *function;
diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m
index 35e211338..d93780111 100644
--- a/SmartDeviceLink/SDLRPCMessage.m
+++ b/SmartDeviceLink/SDLRPCMessage.m
@@ -4,8 +4,7 @@
#import "SDLRPCMessage.h"
-
-
+#import "SDLNames.h"
@implementation SDLRPCMessage
diff --git a/SmartDeviceLink/SDLRPCNotification.m b/SmartDeviceLink/SDLRPCNotification.m
index e72b3a574..6ef2f6b97 100644
--- a/SmartDeviceLink/SDLRPCNotification.m
+++ b/SmartDeviceLink/SDLRPCNotification.m
@@ -4,7 +4,7 @@
#import "SDLRPCNotification.h"
-
+#import "SDLNames.h"
@implementation SDLRPCNotification
diff --git a/SmartDeviceLink/SDLRPCRequest.m b/SmartDeviceLink/SDLRPCRequest.m
index 3cb7af4f6..7f4f10c76 100644
--- a/SmartDeviceLink/SDLRPCRequest.m
+++ b/SmartDeviceLink/SDLRPCRequest.m
@@ -4,7 +4,7 @@
#import "SDLRPCRequest.h"
-
+#import "SDLNames.h"
@implementation SDLRPCRequest
diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m
index bebb2253a..953f47a28 100644
--- a/SmartDeviceLink/SDLRPCResponse.m
+++ b/SmartDeviceLink/SDLRPCResponse.m
@@ -4,7 +4,7 @@
#import "SDLRPCResponse.h"
-
+#import "SDLNames.h"
#import "SDLResult.h"
@implementation SDLRPCResponse
diff --git a/SmartDeviceLink/SDLRPCStruct.h b/SmartDeviceLink/SDLRPCStruct.h
index 3348e496c..e6b3bcccb 100644
--- a/SmartDeviceLink/SDLRPCStruct.h
+++ b/SmartDeviceLink/SDLRPCStruct.h
@@ -4,8 +4,6 @@
#import <Foundation/Foundation.h>
-#import "SDLNames.h"
-
@interface SDLRPCStruct : NSObject {
NSMutableDictionary *store;
}
diff --git a/SmartDeviceLink/SDLRPCStruct.m b/SmartDeviceLink/SDLRPCStruct.m
index c0c91b5dd..f035c86b1 100644
--- a/SmartDeviceLink/SDLRPCStruct.m
+++ b/SmartDeviceLink/SDLRPCStruct.m
@@ -5,6 +5,7 @@
#import "SDLRPCStruct.h"
#import "SDLEnum.h"
+#import "SDLNames.h"
@implementation SDLRPCStruct
diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m
index cbb826d19..7f1bde9f9 100644
--- a/SmartDeviceLink/SDLReadDID.m
+++ b/SmartDeviceLink/SDLReadDID.m
@@ -4,7 +4,7 @@
#import "SDLReadDID.h"
-
+#import "SDLNames.h"
@implementation SDLReadDID
diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m
index e928ff812..f1eca420e 100644
--- a/SmartDeviceLink/SDLReadDIDResponse.m
+++ b/SmartDeviceLink/SDLReadDIDResponse.m
@@ -5,7 +5,7 @@
#import "SDLReadDIDResponse.h"
#import "SDLDIDResult.h"
-
+#import "SDLNames.h"
@implementation SDLReadDIDResponse
diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m
index d05613aee..4a95b1790 100644
--- a/SmartDeviceLink/SDLRegisterAppInterface.m
+++ b/SmartDeviceLink/SDLRegisterAppInterface.m
@@ -8,7 +8,7 @@
#import "SDLAppInfo.h"
#import "SDLDeviceInfo.h"
#import "SDLLanguage.h"
-
+#import "SDLNames.h"
#import "SDLSyncMsgVersion.h"
#import "SDLTTSChunk.h"
diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
index 1cbe8fac4..84968e326 100644
--- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
@@ -10,7 +10,7 @@
#import "SDLHMICapabilities.h"
#import "SDLHMIZoneCapabilities.h"
#import "SDLLanguage.h"
-
+#import "SDLNames.h"
#import "SDLPrerecordedSpeech.h"
#import "SDLPresetBankCapabilities.h"
#import "SDLSoftButtonCapabilities.h"
@@ -19,7 +19,6 @@
#import "SDLVRCapabilities.h"
#import "SDLVehicleType.h"
-
@implementation SDLRegisterAppInterfaceResponse
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m
index 04664a9d0..aed000d30 100644
--- a/SmartDeviceLink/SDLResetGlobalProperties.m
+++ b/SmartDeviceLink/SDLResetGlobalProperties.m
@@ -5,7 +5,7 @@
#import "SDLResetGlobalProperties.h"
#import "SDLGlobalProperty.h"
-
+#import "SDLNames.h"
@implementation SDLResetGlobalProperties
diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
index abbe6a34c..0e1ff9775 100644
--- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
+++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m
@@ -4,7 +4,7 @@
#import "SDLResetGlobalPropertiesResponse.h"
-
+#import "SDLNames.h"
@implementation SDLResetGlobalPropertiesResponse
diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m
index c4bd6a0ba..2fb420eda 100644
--- a/SmartDeviceLink/SDLScreenParams.m
+++ b/SmartDeviceLink/SDLScreenParams.m
@@ -4,10 +4,9 @@
#import "SDLScreenParams.h"
#import "SDLImageResolution.h"
-
+#import "SDLNames.h"
#import "SDLTouchEventCapabilities.h"
-
@implementation SDLScreenParams
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m
index be829b463..5e5dbb7c9 100644
--- a/SmartDeviceLink/SDLScrollableMessage.m
+++ b/SmartDeviceLink/SDLScrollableMessage.m
@@ -4,7 +4,7 @@
#import "SDLScrollableMessage.h"
-
+#import "SDLNames.h"
#import "SDLSoftButton.h"
@implementation SDLScrollableMessage
diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.m b/SmartDeviceLink/SDLScrollableMessageResponse.m
index 66d0f78fb..17735c622 100644
--- a/SmartDeviceLink/SDLScrollableMessageResponse.m
+++ b/SmartDeviceLink/SDLScrollableMessageResponse.m
@@ -4,7 +4,7 @@
#import "SDLScrollableMessageResponse.h"
-
+#import "SDLNames.h"
@implementation SDLScrollableMessageResponse
diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m
index dcc51a132..da3d2c6dc 100644
--- a/SmartDeviceLink/SDLSendLocation.m
+++ b/SmartDeviceLink/SDLSendLocation.m
@@ -4,8 +4,7 @@
#import "SDLSendLocation.h"
-
-
+#import "SDLNames.h"
@implementation SDLSendLocation
diff --git a/SmartDeviceLink/SDLSendLocationResponse.m b/SmartDeviceLink/SDLSendLocationResponse.m
index 17a6626ef..5c4fa427d 100644
--- a/SmartDeviceLink/SDLSendLocationResponse.m
+++ b/SmartDeviceLink/SDLSendLocationResponse.m
@@ -4,8 +4,7 @@
#import "SDLSendLocationResponse.h"
-
-
+#import "SDLNames.h"
@implementation SDLSendLocationResponse
diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m
index cf118a9a2..e7216bb15 100644
--- a/SmartDeviceLink/SDLSetAppIcon.m
+++ b/SmartDeviceLink/SDLSetAppIcon.m
@@ -4,7 +4,7 @@
#import "SDLSetAppIcon.h"
-
+#import "SDLNames.h"
@implementation SDLSetAppIcon
diff --git a/SmartDeviceLink/SDLSetAppIconResponse.m b/SmartDeviceLink/SDLSetAppIconResponse.m
index 330bff069..daaeaf2a4 100644
--- a/SmartDeviceLink/SDLSetAppIconResponse.m
+++ b/SmartDeviceLink/SDLSetAppIconResponse.m
@@ -4,7 +4,7 @@
#import "SDLSetAppIconResponse.h"
-
+#import "SDLNames.h"
@implementation SDLSetAppIconResponse
diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m
index a029efcf0..6ac1cdf77 100644
--- a/SmartDeviceLink/SDLSetDisplayLayout.m
+++ b/SmartDeviceLink/SDLSetDisplayLayout.m
@@ -4,7 +4,7 @@
#import "SDLSetDisplayLayout.h"
-
+#import "SDLNames.h"
@implementation SDLSetDisplayLayout
diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
index 1d430654c..a396f307b 100644
--- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
+++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m
@@ -6,11 +6,10 @@
#import "SDLButtonCapabilities.h"
#import "SDLDisplayCapabilities.h"
-
+#import "SDLNames.h"
#import "SDLPresetBankCapabilities.h"
#import "SDLSoftButtonCapabilities.h"
-
@implementation SDLSetDisplayLayoutResponse
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m
index f8b109671..7692fc196 100644
--- a/SmartDeviceLink/SDLSetGlobalProperties.m
+++ b/SmartDeviceLink/SDLSetGlobalProperties.m
@@ -6,7 +6,7 @@
#import "SDLImage.h"
#import "SDLKeyboardProperties.h"
-
+#import "SDLNames.h"
#import "SDLTTSChunk.h"
#import "SDLVRHelpItem.h"
diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
index b0fbd699a..591e6c747 100644
--- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
+++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m
@@ -4,7 +4,7 @@
#import "SDLSetGlobalPropertiesResponse.h"
-
+#import "SDLNames.h"
@implementation SDLSetGlobalPropertiesResponse
diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m
index 899037e5b..9204b9087 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimer.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimer.m
@@ -4,11 +4,10 @@
#import "SDLSetMediaClockTimer.h"
-
+#import "SDLNames.h"
#import "SDLStartTime.h"
#import "SDLUpdateMode.h"
-
@implementation SDLSetMediaClockTimer
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
index 3627e1c26..fb7b0170d 100644
--- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
+++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m
@@ -4,7 +4,7 @@
#import "SDLSetMediaClockTimerResponse.h"
-
+#import "SDLNames.h"
@implementation SDLSetMediaClockTimerResponse
diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m
index 550de0d7a..362cc2778 100644
--- a/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink/SDLShow.m
@@ -5,7 +5,7 @@
#import "SDLShow.h"
#import "SDLImage.h"
-
+#import "SDLNames.h"
#import "SDLSoftButton.h"
#import "SDLTextAlignment.h"
diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m
index 7fe4f2d64..300089fb9 100644
--- a/SmartDeviceLink/SDLShowConstantTBT.m
+++ b/SmartDeviceLink/SDLShowConstantTBT.m
@@ -5,10 +5,9 @@
#import "SDLShowConstantTBT.h"
#import "SDLImage.h"
-
+#import "SDLNames.h"
#import "SDLSoftButton.h"
-
@implementation SDLShowConstantTBT
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m
index 9fc290c10..7552bbbf3 100644
--- a/SmartDeviceLink/SDLShowConstantTBTResponse.m
+++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m
@@ -3,8 +3,7 @@
#import "SDLShowConstantTBTResponse.h"
-
-
+#import "SDLNames.h"
@implementation SDLShowConstantTBTResponse
diff --git a/SmartDeviceLink/SDLShowResponse.m b/SmartDeviceLink/SDLShowResponse.m
index 4cd70124a..1310ee7b1 100644
--- a/SmartDeviceLink/SDLShowResponse.m
+++ b/SmartDeviceLink/SDLShowResponse.m
@@ -4,7 +4,7 @@
#import "SDLShowResponse.h"
-
+#import "SDLNames.h"
@implementation SDLShowResponse
diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m
index 1be2f3b86..b194b6c59 100644
--- a/SmartDeviceLink/SDLSingleTireStatus.m
+++ b/SmartDeviceLink/SDLSingleTireStatus.m
@@ -4,8 +4,7 @@
#import "SDLSingleTireStatus.h"
#import "SDLComponentVolumeStatus.h"
-
-
+#import "SDLNames.h"
@implementation SDLSingleTireStatus
diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m
index e8975d3fe..76d1ea7c2 100644
--- a/SmartDeviceLink/SDLSlider.m
+++ b/SmartDeviceLink/SDLSlider.m
@@ -4,7 +4,7 @@
#import "SDLSlider.h"
-
+#import "SDLNames.h"
@implementation SDLSlider
diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m
index 70d2626df..4f9f90f64 100644
--- a/SmartDeviceLink/SDLSliderResponse.m
+++ b/SmartDeviceLink/SDLSliderResponse.m
@@ -4,7 +4,7 @@
#import "SDLSliderResponse.h"
-
+#import "SDLNames.h"
@implementation SDLSliderResponse
diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m
index 2c5800ca9..ec86162c2 100644
--- a/SmartDeviceLink/SDLSoftButton.m
+++ b/SmartDeviceLink/SDLSoftButton.m
@@ -4,11 +4,10 @@
#import "SDLSoftButton.h"
#import "SDLImage.h"
-
+#import "SDLNames.h"
#import "SDLSoftButtonType.h"
#import "SDLSystemAction.h"
-
@implementation SDLSoftButton
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m
index 28ef7865c..2dd84d3c2 100644
--- a/SmartDeviceLink/SDLSoftButtonCapabilities.m
+++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m
@@ -4,7 +4,7 @@
#import "SDLSoftButtonCapabilities.h"
-
+#import "SDLNames.h"
@implementation SDLSoftButtonCapabilities
diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m
index 78292c089..173b7e6ac 100644
--- a/SmartDeviceLink/SDLSpeak.m
+++ b/SmartDeviceLink/SDLSpeak.m
@@ -4,7 +4,7 @@
#import "SDLSpeak.h"
-
+#import "SDLNames.h"
#import "SDLTTSChunk.h"
@implementation SDLSpeak
diff --git a/SmartDeviceLink/SDLSpeakResponse.m b/SmartDeviceLink/SDLSpeakResponse.m
index 7ad58d7f8..a6546ae9f 100644
--- a/SmartDeviceLink/SDLSpeakResponse.m
+++ b/SmartDeviceLink/SDLSpeakResponse.m
@@ -4,7 +4,7 @@
#import "SDLSpeakResponse.h"
-
+#import "SDLNames.h"
@implementation SDLSpeakResponse
diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m
index c3e1ebd29..5dfbaaaac 100644
--- a/SmartDeviceLink/SDLStartTime.m
+++ b/SmartDeviceLink/SDLStartTime.m
@@ -4,7 +4,7 @@
#import "SDLStartTime.h"
-
+#import "SDLNames.h"
@implementation SDLStartTime
diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m
index 0953754ec..12a2cfdd2 100644
--- a/SmartDeviceLink/SDLSubscribeButton.m
+++ b/SmartDeviceLink/SDLSubscribeButton.m
@@ -5,8 +5,7 @@
#import "SDLSubscribeButton.h"
#import "SDLButtonName.h"
-
-
+#import "SDLNames.h"
@implementation SDLSubscribeButton
diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.m b/SmartDeviceLink/SDLSubscribeButtonResponse.m
index aedad91de..892125c23 100644
--- a/SmartDeviceLink/SDLSubscribeButtonResponse.m
+++ b/SmartDeviceLink/SDLSubscribeButtonResponse.m
@@ -4,7 +4,7 @@
#import "SDLSubscribeButtonResponse.h"
-
+#import "SDLNames.h"
@implementation SDLSubscribeButtonResponse
diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m
index 13b581af8..86d927fed 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleData.m
@@ -4,7 +4,7 @@
#import "SDLSubscribeVehicleData.h"
-
+#import "SDLNames.h"
@implementation SDLSubscribeVehicleData
diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
index 9a666e8c9..6153947f4 100644
--- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m
@@ -4,10 +4,9 @@
#import "SDLSubscribeVehicleDataResponse.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataResult.h"
-
@implementation SDLSubscribeVehicleDataResponse
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m
index ce321cc75..40966a706 100644
--- a/SmartDeviceLink/SDLSyncMsgVersion.m
+++ b/SmartDeviceLink/SDLSyncMsgVersion.m
@@ -4,7 +4,7 @@
#import "SDLSyncMsgVersion.h"
-
+#import "SDLNames.h"
@implementation SDLSyncMsgVersion
diff --git a/SmartDeviceLink/SDLSyncPData.m b/SmartDeviceLink/SDLSyncPData.m
index 643580b0e..f387238b1 100644
--- a/SmartDeviceLink/SDLSyncPData.m
+++ b/SmartDeviceLink/SDLSyncPData.m
@@ -4,7 +4,7 @@
#import "SDLSyncPData.h"
-
+#import "SDLNames.h"
@implementation SDLSyncPData
diff --git a/SmartDeviceLink/SDLSyncPDataResponse.m b/SmartDeviceLink/SDLSyncPDataResponse.m
index 4f5ab24dd..f439b21f4 100644
--- a/SmartDeviceLink/SDLSyncPDataResponse.m
+++ b/SmartDeviceLink/SDLSyncPDataResponse.m
@@ -4,7 +4,7 @@
#import "SDLSyncPDataResponse.h"
-
+#import "SDLNames.h"
@implementation SDLSyncPDataResponse
diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m
index e82675600..70813ac8d 100644
--- a/SmartDeviceLink/SDLSystemRequest.m
+++ b/SmartDeviceLink/SDLSystemRequest.m
@@ -4,10 +4,9 @@
#import "SDLSystemRequest.h"
-
+#import "SDLNames.h"
#import "SDLRequestType.h"
-
@implementation SDLSystemRequest
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLSystemRequestResponse.m b/SmartDeviceLink/SDLSystemRequestResponse.m
index 57ddc6718..a13486a65 100644
--- a/SmartDeviceLink/SDLSystemRequestResponse.m
+++ b/SmartDeviceLink/SDLSystemRequestResponse.m
@@ -4,7 +4,7 @@
#import "SDLSystemRequestResponse.h"
-
+#import "SDLNames.h"
@implementation SDLSystemRequestResponse
diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m
index abe0a1d03..9379a44f8 100644
--- a/SmartDeviceLink/SDLTTSChunk.m
+++ b/SmartDeviceLink/SDLTTSChunk.m
@@ -3,10 +3,9 @@
#import "SDLTTSChunk.h"
-
+#import "SDLNames.h"
#import "SDLSpeechCapabilities.h"
-
@implementation SDLTTSChunk
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m
index ce7ab5d0a..9f0e805a7 100644
--- a/SmartDeviceLink/SDLTextField.m
+++ b/SmartDeviceLink/SDLTextField.m
@@ -4,7 +4,7 @@
#import "SDLTextField.h"
#import "SDLCharacterSet.h"
-
+#import "SDLNames.h"
#import "SDLTextFieldName.h"
diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m
index 0d3baaa84..911dda1a1 100644
--- a/SmartDeviceLink/SDLTireStatus.m
+++ b/SmartDeviceLink/SDLTireStatus.m
@@ -3,11 +3,10 @@
#import "SDLTireStatus.h"
-
+#import "SDLNames.h"
#import "SDLSingleTireStatus.h"
#import "SDLWarningLightStatus.h"
-
@implementation SDLTireStatus
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m
index 7ccb77bdf..a1da956f0 100644
--- a/SmartDeviceLink/SDLTouchCoord.m
+++ b/SmartDeviceLink/SDLTouchCoord.m
@@ -4,7 +4,7 @@
#import "SDLTouchCoord.h"
-
+#import "SDLNames.h"
@implementation SDLTouchCoord
diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m
index 74f49a2c5..18d188a21 100644
--- a/SmartDeviceLink/SDLTouchEvent.m
+++ b/SmartDeviceLink/SDLTouchEvent.m
@@ -4,7 +4,7 @@
#import "SDLTouchEvent.h"
-
+#import "SDLNames.h"
#import "SDLTouchCoord.h"
@implementation SDLTouchEvent
diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m
index 31b9cd951..8628e2253 100644
--- a/SmartDeviceLink/SDLTouchEventCapabilities.m
+++ b/SmartDeviceLink/SDLTouchEventCapabilities.m
@@ -4,7 +4,7 @@
#import "SDLTouchEventCapabilities.h"
-
+#import "SDLNames.h"
@implementation SDLTouchEventCapabilities
diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m
index 81e022db8..4eaf0ac4b 100644
--- a/SmartDeviceLink/SDLTurn.m
+++ b/SmartDeviceLink/SDLTurn.m
@@ -4,8 +4,7 @@
#import "SDLTurn.h"
#import "SDLImage.h"
-
-
+#import "SDLNames.h"
@implementation SDLTurn
diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.m b/SmartDeviceLink/SDLUnregisterAppInterface.m
index 91cb44f3c..efdf1773b 100644
--- a/SmartDeviceLink/SDLUnregisterAppInterface.m
+++ b/SmartDeviceLink/SDLUnregisterAppInterface.m
@@ -4,7 +4,7 @@
#import "SDLUnregisterAppInterface.h"
-
+#import "SDLNames.h"
@implementation SDLUnregisterAppInterface
diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
index 0e366aec7..e71723762 100644
--- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
+++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m
@@ -4,7 +4,7 @@
#import "SDLUnregisterAppInterfaceResponse.h"
-
+#import "SDLNames.h"
@implementation SDLUnregisterAppInterfaceResponse
diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m
index 88c24bd34..4f588e4ca 100644
--- a/SmartDeviceLink/SDLUnsubscribeButton.m
+++ b/SmartDeviceLink/SDLUnsubscribeButton.m
@@ -5,8 +5,7 @@
#import "SDLUnsubscribeButton.h"
#import "SDLButtonName.h"
-
-
+#import "SDLNames.h"
@implementation SDLUnsubscribeButton
diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
index 8fd89def6..1e94a7f7c 100644
--- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m
@@ -4,7 +4,7 @@
#import "SDLUnsubscribeButtonResponse.h"
-
+#import "SDLNames.h"
@implementation SDLUnsubscribeButtonResponse
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
index 00bbc4d2b..3a1370b84 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m
@@ -4,7 +4,7 @@
#import "SDLUnsubscribeVehicleData.h"
-
+#import "SDLNames.h"
@implementation SDLUnsubscribeVehicleData
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
index 88524d9e1..ed3c224e0 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m
@@ -4,10 +4,9 @@
#import "SDLUnsubscribeVehicleDataResponse.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataResult.h"
-
@implementation SDLUnsubscribeVehicleDataResponse
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m
index a8d62646d..950a47a11 100644
--- a/SmartDeviceLink/SDLUpdateTurnList.m
+++ b/SmartDeviceLink/SDLUpdateTurnList.m
@@ -4,7 +4,7 @@
#import "SDLUpdateTurnList.h"
-
+#import "SDLNames.h"
#import "SDLSoftButton.h"
#import "SDLTurn.h"
diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SmartDeviceLink/SDLUpdateTurnListResponse.m
index 09781ef3e..3184fb57e 100644
--- a/SmartDeviceLink/SDLUpdateTurnListResponse.m
+++ b/SmartDeviceLink/SDLUpdateTurnListResponse.m
@@ -4,7 +4,7 @@
#import "SDLUpdateTurnListResponse.h"
-
+#import "SDLNames.h"
@implementation SDLUpdateTurnListResponse
diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m
index 0100522e5..7a1c1c898 100644
--- a/SmartDeviceLink/SDLVehicleDataResult.m
+++ b/SmartDeviceLink/SDLVehicleDataResult.m
@@ -3,11 +3,10 @@
#import "SDLVehicleDataResult.h"
-
+#import "SDLNames.h"
#import "SDLVehicleDataResultCode.h"
#import "SDLVehicleDataType.h"
-
@implementation SDLVehicleDataResult
- (instancetype)init {
diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m
index aea0aa461..48204e812 100644
--- a/SmartDeviceLink/SDLVehicleType.m
+++ b/SmartDeviceLink/SDLVehicleType.m
@@ -4,7 +4,7 @@
#import "SDLVehicleType.h"
-
+#import "SDLNames.h"
@implementation SDLVehicleType
diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m
index d28b7563b..19275ba52 100644
--- a/SmartDeviceLink/SDLVrHelpItem.m
+++ b/SmartDeviceLink/SDLVrHelpItem.m
@@ -5,7 +5,7 @@
#import "SDLVRHelpItem.h"
#import "SDLImage.h"
-
+#import "SDLNames.h"
@implementation SDLVRHelpItem