lots of renaming per proposal amendment

13 files changed, 394 insertions, 396 deletions

diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index 74d28810e..5978ccc95 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -936,6 +936,12 @@
 		5DEE55C01B8509CB004F0D0F /* SDLURLRequestTaskSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DEE55BF1B8509CB004F0D0F /* SDLURLRequestTaskSpec.m */; };
 		5DF2BB9D1B94E38A00CE5994 /* SDLURLSessionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DF2BB9C1B94E38A00CE5994 /* SDLURLSessionSpec.m */; };
 		5DFFB9151BD7C89700DB3F04 /* SDLConnectionManagerType.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DFFB9141BD7C89700DB3F04 /* SDLConnectionManagerType.h */; };
+		8B06061F1F30BCED005ADB2F /* SDLMetadataType.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B06061D1F30BCED005ADB2F /* SDLMetadataType.h */; };
+		8B0606201F30BCED005ADB2F /* SDLMetadataType.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06061E1F30BCED005ADB2F /* SDLMetadataType.m */; };
+		8B0606221F30C108005ADB2F /* SDLMetadataTypeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0606211F30C108005ADB2F /* SDLMetadataTypeSpec.m */; };
+		8B0606291F3103CE005ADB2F /* SDLMetadataTags.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B0606271F3103CE005ADB2F /* SDLMetadataTags.h */; };
+		8B06062A1F3103CE005ADB2F /* SDLMetadataTags.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0606281F3103CE005ADB2F /* SDLMetadataTags.m */; };
+		8B06062C1F310ED2005ADB2F /* SDLMetadataTagsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06062B1F310ED2005ADB2F /* SDLMetadataTagsSpec.m */; };
 		8BD729A61F2A2CF30029AC93 /* SDLVideoStreamingCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729A41F2A2CF30029AC93 /* SDLVideoStreamingCodec.h */; };
 		8BD729A71F2A2CF30029AC93 /* SDLVideoStreamingCodec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD729A51F2A2CF30029AC93 /* SDLVideoStreamingCodec.m */; };
 		8BD729AA1F2A41F40029AC93 /* SDLVideoStreamingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD729A81F2A41F40029AC93 /* SDLVideoStreamingProtocol.h */; };
@@ -948,12 +954,6 @@
 		8BD729B71F2A75FD0029AC93 /* SDLVideoStreamingProtocolSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD729B61F2A75FD0029AC93 /* SDLVideoStreamingProtocolSpec.m */; };
 		8BF9DE071F2BAEEE004FFCBB /* SDLVideoStreamingFormatSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BF9DE061F2BAEEE004FFCBB /* SDLVideoStreamingFormatSpec.m */; };
 		8BF9DE091F2BAF0C004FFCBB /* SDLVideoStreamingCapabilitySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BF9DE081F2BAF0C004FFCBB /* SDLVideoStreamingCapabilitySpec.m */; };
-		8B06061F1F30BCED005ADB2F /* SDLTextFieldType.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B06061D1F30BCED005ADB2F /* SDLTextFieldType.h */; };
-		8B0606201F30BCED005ADB2F /* SDLTextFieldType.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06061E1F30BCED005ADB2F /* SDLTextFieldType.m */; };
-		8B0606221F30C108005ADB2F /* SDLTextFieldTypeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0606211F30C108005ADB2F /* SDLTextFieldTypeSpec.m */; };
-		8B0606291F3103CE005ADB2F /* SDLMetadataStruct.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B0606271F3103CE005ADB2F /* SDLMetadataStruct.h */; };
-		8B06062A1F3103CE005ADB2F /* SDLMetadataStruct.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B0606281F3103CE005ADB2F /* SDLMetadataStruct.m */; };
-		8B06062C1F310ED2005ADB2F /* SDLMetadataStructSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06062B1F310ED2005ADB2F /* SDLMetadataStructSpec.m */; };
 		97E26DEC1E807AD70074A3C7 /* SDLMutableDataQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 97E26DEA1E807AD70074A3C7 /* SDLMutableDataQueue.h */; };
 		97E26DED1E807AD70074A3C7 /* SDLMutableDataQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 97E26DEB1E807AD70074A3C7 /* SDLMutableDataQueue.m */; };
 		DA4353DF1D271FD10099B8C4 /* CGPointUtilSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353DE1D271FD10099B8C4 /* CGPointUtilSpec.m */; };
@@ -2047,6 +2047,12 @@
 		5DEE55BF1B8509CB004F0D0F /* SDLURLRequestTaskSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLURLRequestTaskSpec.m; path = "UtilitiesSpecs/HTTP Connection/SDLURLRequestTaskSpec.m"; sourceTree = "<group>"; };
 		5DF2BB9C1B94E38A00CE5994 /* SDLURLSessionSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLURLSessionSpec.m; path = "UtilitiesSpecs/HTTP Connection/SDLURLSessionSpec.m"; sourceTree = "<group>"; };
 		5DFFB9141BD7C89700DB3F04 /* SDLConnectionManagerType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLConnectionManagerType.h; sourceTree = "<group>"; };
+		8B06061D1F30BCED005ADB2F /* SDLMetadataType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMetadataType.h; sourceTree = "<group>"; };
+		8B06061E1F30BCED005ADB2F /* SDLMetadataType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMetadataType.m; sourceTree = "<group>"; };
+		8B0606211F30C108005ADB2F /* SDLMetadataTypeSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMetadataTypeSpec.m; sourceTree = "<group>"; };
+		8B0606271F3103CE005ADB2F /* SDLMetadataTags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMetadataTags.h; sourceTree = "<group>"; };
+		8B0606281F3103CE005ADB2F /* SDLMetadataTags.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMetadataTags.m; sourceTree = "<group>"; };
+		8B06062B1F310ED2005ADB2F /* SDLMetadataTagsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMetadataTagsSpec.m; sourceTree = "<group>"; };
 		8BD729A41F2A2CF30029AC93 /* SDLVideoStreamingCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVideoStreamingCodec.h; sourceTree = "<group>"; };
 		8BD729A51F2A2CF30029AC93 /* SDLVideoStreamingCodec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLVideoStreamingCodec.m; sourceTree = "<group>"; };
 		8BD729A81F2A41F40029AC93 /* SDLVideoStreamingProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVideoStreamingProtocol.h; sourceTree = "<group>"; };
@@ -2059,12 +2065,6 @@
 		8BD729B61F2A75FD0029AC93 /* SDLVideoStreamingProtocolSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLVideoStreamingProtocolSpec.m; sourceTree = "<group>"; };
 		8BF9DE061F2BAEEE004FFCBB /* SDLVideoStreamingFormatSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLVideoStreamingFormatSpec.m; sourceTree = "<group>"; };
 		8BF9DE081F2BAF0C004FFCBB /* SDLVideoStreamingCapabilitySpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLVideoStreamingCapabilitySpec.m; sourceTree = "<group>"; };
-		8B06061D1F30BCED005ADB2F /* SDLTextFieldType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTextFieldType.h; sourceTree = "<group>"; };
-		8B06061E1F30BCED005ADB2F /* SDLTextFieldType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTextFieldType.m; sourceTree = "<group>"; };
-		8B0606211F30C108005ADB2F /* SDLTextFieldTypeSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTextFieldTypeSpec.m; sourceTree = "<group>"; };
-		8B0606271F3103CE005ADB2F /* SDLMetadataStruct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMetadataStruct.h; sourceTree = "<group>"; };
-		8B0606281F3103CE005ADB2F /* SDLMetadataStruct.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMetadataStruct.m; sourceTree = "<group>"; };
-		8B06062B1F310ED2005ADB2F /* SDLMetadataStructSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMetadataStructSpec.m; sourceTree = "<group>"; };
 		97E26DEA1E807AD70074A3C7 /* SDLMutableDataQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMutableDataQueue.h; sourceTree = "<group>"; };
 		97E26DEB1E807AD70074A3C7 /* SDLMutableDataQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMutableDataQueue.m; sourceTree = "<group>"; };
 		DA4353DE1D271FD10099B8C4 /* CGPointUtilSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CGPointUtilSpec.m; path = UtilitiesSpecs/Touches/CGPointUtilSpec.m; sourceTree = "<group>"; };
@@ -2262,7 +2262,7 @@
 				162E82161A9BDE8A00906325 /* SDLTBTStateSpec.m */,
 				162E82171A9BDE8A00906325 /* SDLTextAlignmentSpec.m */,
 				162E82181A9BDE8A00906325 /* SDLTextFieldNameSpec.m */,
-				8B0606211F30C108005ADB2F /* SDLTextFieldTypeSpec.m */,
+				8B0606211F30C108005ADB2F /* SDLMetadataTypeSpec.m */,
 				162E82191A9BDE8A00906325 /* SDLTimerModeSpec.m */,
 				162E821A1A9BDE8A00906325 /* SDLTouchTypeSpec.m */,
 				162E821B1A9BDE8A00906325 /* SDLTriggerSource.m */,
@@ -2484,7 +2484,7 @@
 				8BF9DE061F2BAEEE004FFCBB /* SDLVideoStreamingFormatSpec.m */,
 				8BF9DE081F2BAF0C004FFCBB /* SDLVideoStreamingCapabilitySpec.m */,
 				162E82B61A9BDE8A00906325 /* SDLVrHelpItemSpec.m */,
-				8B06062B1F310ED2005ADB2F /* SDLMetadataStructSpec.m */,
+				8B06062B1F310ED2005ADB2F /* SDLMetadataTagsSpec.m */,
 			);
 			path = StructSpecs;
 			sourceTree = "<group>";
@@ -3073,8 +3073,8 @@
 				DA9F7E981DCC052C00ACAE48 /* SDLLocationDetails.m */,
 				5D61FB0B1A84238A00846EE7 /* SDLMenuParams.h */,
 				5D61FB0C1A84238A00846EE7 /* SDLMenuParams.m */,
-				8B0606271F3103CE005ADB2F /* SDLMetadataStruct.h */,
-				8B0606281F3103CE005ADB2F /* SDLMetadataStruct.m */,
+				8B0606271F3103CE005ADB2F /* SDLMetadataTags.h */,
+				8B0606281F3103CE005ADB2F /* SDLMetadataTags.m */,
 				5D61FB0D1A84238A00846EE7 /* SDLMyKey.h */,
 				5D61FB0E1A84238A00846EE7 /* SDLMyKey.m */,
 				5D00AC751F15283E004000D9 /* SDLNavigationCapability.h */,
@@ -3247,8 +3247,8 @@
 				5D61FBDB1A84238C00846EE7 /* SDLTextAlignment.m */,
 				5D61FBDE1A84238C00846EE7 /* SDLTextFieldName.h */,
 				5D61FBDF1A84238C00846EE7 /* SDLTextFieldName.m */,
-				8B06061D1F30BCED005ADB2F /* SDLTextFieldType.h */,
-				8B06061E1F30BCED005ADB2F /* SDLTextFieldType.m */,
+				8B06061D1F30BCED005ADB2F /* SDLMetadataType.h */,
+				8B06061E1F30BCED005ADB2F /* SDLMetadataType.m */,
 				5D61FBE01A84238C00846EE7 /* SDLTimerMode.h */,
 				5D61FBE11A84238C00846EE7 /* SDLTimerMode.m */,
 				5D61FBEA1A84238C00846EE7 /* SDLTouchType.h */,
@@ -4349,7 +4349,7 @@
 				5D00AC6F1F1511B9004000D9 /* SDLGetSystemCapability.h in Headers */,
 				5D61FD891A84238C00846EE7 /* SDLSetGlobalPropertiesResponse.h in Headers */,
 				5D61FD8D1A84238C00846EE7 /* SDLSetMediaClockTimerResponse.h in Headers */,
-				8B0606291F3103CE005ADB2F /* SDLMetadataStruct.h in Headers */,
+				8B0606291F3103CE005ADB2F /* SDLMetadataTags.h in Headers */,
 				5D61FD3B1A84238C00846EE7 /* SDLPresetBankCapabilities.h in Headers */,
 				5D8204311BD001C700D0A41B /* SDLArtwork.h in Headers */,
 				5D53C46D1B7A99B9003526EA /* SDLStreamingMediaManager.h in Headers */,
@@ -4499,7 +4499,7 @@
 				5D16545A1D3E7A1600554D93 /* SDLLifecycleManager.h in Headers */,
 				5D61FCBD1A84238C00846EE7 /* SDLHeadLampStatus.h in Headers */,
 				5D61FDC31A84238C00846EE7 /* SDLTBTState.h in Headers */,
-				8B06061F1F30BCED005ADB2F /* SDLTextFieldType.h in Headers */,
+				8B06061F1F30BCED005ADB2F /* SDLMetadataType.h in Headers */,
 				5D61FD951A84238C00846EE7 /* SDLShowResponse.h in Headers */,
 				5D61FCA31A84238C00846EE7 /* SDLEndAudioPassThru.h in Headers */,
 				5D61FCB11A84238C00846EE7 /* SDLGetDTCs.h in Headers */,
@@ -4846,7 +4846,7 @@
 				5D61FDB21A84238C00846EE7 /* SDLSubscribeVehicleData.m in Sources */,
 				5D61FC991A84238C00846EE7 /* SDLECallInfo.m in Sources */,
 				5D61FD601A84238C00846EE7 /* SDLRegisterAppInterfaceResponse.m in Sources */,
-				8B0606201F30BCED005ADB2F /* SDLTextFieldType.m in Sources */,
+				8B0606201F30BCED005ADB2F /* SDLMetadataType.m in Sources */,
 				5DB996581F268ECB002D8795 /* SDLControlFramePayloadAudioStartServiceAck.m in Sources */,
 				DAC572621D10C5020004288B /* SDLPinchGesture.m in Sources */,
 				5D61FCF51A84238C00846EE7 /* SDLMaintenanceModeStatus.m in Sources */,
@@ -5016,7 +5016,7 @@
 				5D1665C51CF8CA2700CC4CA1 /* SDLListFilesOperation.m in Sources */,
 				5D61FE021A84238C00846EE7 /* SDLVehicleDataNotificationStatus.m in Sources */,
 				5D61FDD81A84238C00846EE7 /* SDLTouchType.m in Sources */,
-				8B06062A1F3103CE005ADB2F /* SDLMetadataStruct.m in Sources */,
+				8B06062A1F3103CE005ADB2F /* SDLMetadataTags.m in Sources */,
 				5D61FDD61A84238C00846EE7 /* SDLTouchEventCapabilities.m in Sources */,
 				5DA49CE61F1EA83300E65FC5 /* SDLControlFramePayloadRPCStartService.m in Sources */,
 				5DA102A51D4122C700C15826 /* NSMutableDictionary+SafeRemove.m in Sources */,
@@ -5124,7 +5124,7 @@
 				162E83331A9BDE8B00906325 /* SDLPerformInteractionSpec.m in Sources */,
 				5D0A9F951F15585B00CC80DD /* SDLPhoneCapabilitySpec.m in Sources */,
 				1680B11A1A9CD7AD00DBD79E /* SDLAbstractProtocolSpec.m in Sources */,
-				8B06062C1F310ED2005ADB2F /* SDLMetadataStructSpec.m in Sources */,
+				8B06062C1F310ED2005ADB2F /* SDLMetadataTagsSpec.m in Sources */,
 				1680B1151A9CD7AD00DBD79E /* SDLV2ProtocolHeaderSpec.m in Sources */,
 				162E83101A9BDE8B00906325 /* SDLOnAudioPassThruSpec.m in Sources */,
 				162E82D91A9BDE8A00906325 /* SDLDisplayTypeSpec.m in Sources */,
@@ -5134,7 +5134,7 @@
 				DA9F7EB41DCC086400ACAE48 /* SDLDateTimeSpec.m in Sources */,
 				162E830E1A9BDE8B00906325 /* SDLRPCRequestFactorySpec.m in Sources */,
 				162E82E41A9BDE8B00906325 /* SDLImageFieldNameSpec.m in Sources */,
-				8B0606221F30C108005ADB2F /* SDLTextFieldTypeSpec.m in Sources */,
+				8B0606221F30C108005ADB2F /* SDLMetadataTypeSpec.m in Sources */,
 				162E83991A9BDE8B00906325 /* SDLEnumSpec.m in Sources */,
 				162E82ED1A9BDE8B00906325 /* SDLMaintenanceModeStatusSpec.m in Sources */,
 				5DB92D2D1AC4A34F00C15BB0 /* SDLPrioritizedObjectCollectionSpec.m in Sources */,
diff --git a/SmartDeviceLink/SDLMetadataStruct.h b/SmartDeviceLink/SDLMetadataStruct.h
deleted file mode 100644
index 92585fdf7..000000000
--- a/SmartDeviceLink/SDLMetadataStruct.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-//  SDLMetadataStruct.h
-//  SmartDeviceLink-iOS
-//
-//  Created by Brett McIsaac on 8/1/17.
-//  Copyright © 2017 smartdevicelink. All rights reserved.
-//
-
-#import "SDLRPCMessage.h"
-
-@class SDLTextFieldType;
-
-// TODO: CHANGE FILE NAME
-@interface SDLMetadataStruct : SDLRPCStruct {
-}
-
-/**
- * @abstract Constructs a newly allocated SDLTextField object
- */
-- (instancetype)init;
-
-/**
- * @abstract Constructs a newly allocated SDLTextField object indicated by the dictionary parameter
- *
- * @param dict The dictionary to use to construct the object
- */
-- (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
-
-/**
- * @abstract Constructs a newly allocated SDLTextField object with NSArrays
- */
-- (instancetype)initWithTextFieldTypes:(NSArray<SDLTextFieldType *> *)mainField1 mainField2:(NSArray<SDLTextFieldType *> *)mainField2;
-
-- (instancetype)initWithTextFieldTypes:(NSArray<SDLTextFieldType *> *)mainField1 mainField2:(NSArray<SDLTextFieldType *> *)mainField2 mainField3:(NSArray<SDLTextFieldType *> *)mainField3 mainField4:(NSArray<SDLTextFieldType *> *)mainField4;
-
-/**
- * @abstract The type of data contained in the "mainField1" text field, Optional.
- *
- * minsize= 0
- *
- * maxsize= 5
- */
-@property (strong, nonatomic) NSMutableArray<SDLTextFieldType *> *mainField1;
-
-/**
- * @abstract The type of data contained in the "mainField2" text field, Optional.
- *
- * minsize= 0
- *
- * maxsize= 5
- */
-@property (strong, nonatomic) NSMutableArray<SDLTextFieldType *> *mainField2;
-
-/**
- * @abstract The type of data contained in the "mainField3" text field, Optional.
- *
- * minsize= 0
- *
- * maxsize= 5
- */
-@property (strong, nonatomic) NSMutableArray<SDLTextFieldType *> *mainField3;
-
-/**
- * @abstract The type of data contained in the "mainField4" text field, Optional.
- *
- * minsize= 0
- *
- * maxsize= 5
- */
-@property (strong, nonatomic) NSMutableArray<SDLTextFieldType *> *mainField4;
-
-@end
diff --git a/SmartDeviceLink/SDLMetadataTags.h b/SmartDeviceLink/SDLMetadataTags.h
new file mode 100644
index 000000000..dfa3c2812
--- /dev/null
+++ b/SmartDeviceLink/SDLMetadataTags.h
@@ -0,0 +1,71 @@
+//
+//  SDLMetadataTags.h
+//  SmartDeviceLink-iOS
+//
+//  Created by Brett McIsaac on 8/1/17.
+//  Copyright © 2017 smartdevicelink. All rights reserved.
+//
+
+#import "SDLRPCMessage.h"
+
+@class SDLMetadataType;
+
+@interface SDLMetadataTags : SDLRPCStruct {
+}
+
+/**
+ * @abstract Constructs a newly allocated SDLMetadataTags object
+ */
+- (instancetype)init;
+
+/**
+ * @abstract Constructs a newly allocated SDLMetadataTags object indicated by the dictionary parameter
+ *
+ * @param dict The dictionary to use to construct the object
+ */
+- (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
+
+/**
+ * @abstract Constructs a newly allocated SDLMetadataTags object with NSArrays
+ */
+- (instancetype)initWithTextFieldTypes:(NSArray<SDLMetadataType *> *)mainField1 mainField2:(NSArray<SDLMetadataType *> *)mainField2;
+
+- (instancetype)initWithTextFieldTypes:(NSArray<SDLMetadataType *> *)mainField1 mainField2:(NSArray<SDLMetadataType *> *)mainField2 mainField3:(NSArray<SDLMetadataType *> *)mainField3 mainField4:(NSArray<SDLMetadataType *> *)mainField4;
+
+/**
+ * @abstract The type of data contained in the "mainField1" text field, Optional.
+ *
+ * minsize= 0
+ *
+ * maxsize= 5
+ */
+@property (strong, nonatomic) NSMutableArray<SDLMetadataType *> *mainField1;
+
+/**
+ * @abstract The type of data contained in the "mainField2" text field, Optional.
+ *
+ * minsize= 0
+ *
+ * maxsize= 5
+ */
+@property (strong, nonatomic) NSMutableArray<SDLMetadataType *> *mainField2;
+
+/**
+ * @abstract The type of data contained in the "mainField3" text field, Optional.
+ *
+ * minsize= 0
+ *
+ * maxsize= 5
+ */
+@property (strong, nonatomic) NSMutableArray<SDLMetadataType *> *mainField3;
+
+/**
+ * @abstract The type of data contained in the "mainField4" text field, Optional.
+ *
+ * minsize= 0
+ *
+ * maxsize= 5
+ */
+@property (strong, nonatomic) NSMutableArray<SDLMetadataType *> *mainField4;
+
+@end
diff --git a/SmartDeviceLink/SDLMetadataStruct.m b/SmartDeviceLink/SDLMetadataTags.m
index 637fa0f66..9a071ed0d 100644
--- a/SmartDeviceLink/SDLMetadataStruct.m
+++ b/SmartDeviceLink/SDLMetadataTags.m
@@ -1,16 +1,16 @@
 //
-//  SDLMetadataStruct.m
+//  SDLMetadataTags.m
 //  SmartDeviceLink-iOS
 //
 //  Created by Brett McIsaac on 8/1/17.
 //  Copyright © 2017 smartdevicelink. All rights reserved.
 //
 
-#import "SDLMetadataStruct.h"
+#import "SDLMetadataTags.h"
+#import "SDLMetadataType.h"
 #import "SDLNames.h"
-#import "SDLTextFieldType.h"
 
-@implementation SDLMetadataStruct
+@implementation SDLMetadataTags
 
 - (instancetype)init {
     if (self = [super init]) {
@@ -24,7 +24,7 @@
     return self;
 }
 
-- (instancetype)initWithTextFieldTypes:(NSArray<SDLTextFieldType *> *)mainField1 mainField2:(NSArray<SDLTextFieldType *> *)mainField2 {
+- (instancetype)initWithTextFieldTypes:(NSArray<SDLMetadataType *> *)mainField1 mainField2:(NSArray<SDLMetadataType *> *)mainField2 {
     self = [self init];
     if (!self) {
         return self;
@@ -36,7 +36,7 @@
     return self;
 }
 
-- (instancetype)initWithTextFieldTypes:(NSArray<SDLTextFieldType *> *)mainField1 mainField2:(NSArray<SDLTextFieldType *> *)mainField2 mainField3:(NSArray<SDLTextFieldType *> *)mainField3 mainField4:(NSArray<SDLTextFieldType *> *)mainField4 {
+- (instancetype)initWithTextFieldTypes:(NSArray<SDLMetadataType *> *)mainField1 mainField2:(NSArray<SDLMetadataType *> *)mainField2 mainField3:(NSArray<SDLMetadataType *> *)mainField3 mainField4:(NSArray<SDLMetadataType *> *)mainField4 {
     self = [self init];
     if (!self) {
         return self;
@@ -50,7 +50,7 @@
     return self;
 }
 
-- (void)setMainField1:(NSMutableArray<SDLTextFieldType *> *)mainField1 {
+- (void)setMainField1:(NSMutableArray<SDLMetadataType *> *)mainField1 {
     if (mainField1 != nil) {
         [store setObject:mainField1 forKey:NAMES_mainField1Type];
     } else {
@@ -58,22 +58,22 @@
     }
 }
 
-- (NSMutableArray<SDLTextFieldType *> *)mainField1 {
+- (NSMutableArray<SDLMetadataType *> *)mainField1 {
     NSMutableArray *array = [store objectForKey:NAMES_mainField1Type];
     if ([array isEqual:[NSNull null]]) {
         return [NSMutableArray array];
-    } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLTextFieldType.class]) {
+    } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLMetadataType.class]) {
         return array;
     } else {
         NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (SDLTextFieldType *type in array) {
+        for (SDLMetadataType *type in array) {
             [newList addObject:type];
         }
         return newList;
     }
 }
 
-- (void)setMainField2:(NSMutableArray<SDLTextFieldType *> *)mainField2 {
+- (void)setMainField2:(NSMutableArray<SDLMetadataType *> *)mainField2 {
     if (mainField2 != nil) {
         [store setObject:mainField2 forKey:NAMES_mainField2Type];
     } else {
@@ -81,22 +81,22 @@
     }
 }
 
-- (NSMutableArray<SDLTextFieldType *> *)mainField2 {
+- (NSMutableArray<SDLMetadataType *> *)mainField2 {
     NSMutableArray *array = [store objectForKey:NAMES_mainField2Type];
     if ([array isEqual:[NSNull null]]) {
         return [NSMutableArray array];
-    } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLTextFieldType.class]) {
+    } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLMetadataType.class]) {
         return array;
     } else {
         NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (SDLTextFieldType *type in array) {
+        for (SDLMetadataType *type in array) {
             [newList addObject:type];
         }
         return newList;
     }
 }
 
-- (void)setMainField3:(NSMutableArray<SDLTextFieldType *> *)mainField3 {
+- (void)setMainField3:(NSMutableArray<SDLMetadataType *> *)mainField3 {
     if (mainField3 != nil) {
         [store setObject:mainField3 forKey:NAMES_mainField3Type];
     } else {
@@ -104,22 +104,22 @@
     }
 }
 
-- (NSMutableArray<SDLTextFieldType *> *)mainField3 {
+- (NSMutableArray<SDLMetadataType *> *)mainField3 {
     NSMutableArray *array = [store objectForKey:NAMES_mainField3Type];
     if ([array isEqual:[NSNull null]]) {
         return [NSMutableArray array];
-    } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLTextFieldType.class]) {
+    } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLMetadataType.class]) {
         return array;
     } else {
         NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (SDLTextFieldType *type in array) {
+        for (SDLMetadataType *type in array) {
             [newList addObject:type];
         }
         return newList;
     }
 }
 
-- (void)setMainField4:(NSMutableArray<SDLTextFieldType *> *)mainField4 {
+- (void)setMainField4:(NSMutableArray<SDLMetadataType *> *)mainField4 {
     if (mainField4 != nil) {
         [store setObject:mainField4 forKey:NAMES_mainField4Type];
     } else {
@@ -127,15 +127,15 @@
     }
 }
 
-- (NSMutableArray<SDLTextFieldType *> *)mainField4 {
+- (NSMutableArray<SDLMetadataType *> *)mainField4 {
     NSMutableArray *array = [store objectForKey:NAMES_mainField4Type];
     if ([array isEqual:[NSNull null]]) {
         return [NSMutableArray array];
-    } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLTextFieldType.class]) {
+    } else if (array.count < 1 || [array.firstObject isKindOfClass:SDLMetadataType.class]) {
         return array;
     } else {
         NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]];
-        for (SDLTextFieldType *type in array) {
+        for (SDLMetadataType *type in array) {
             [newList addObject:type];
         }
         return newList;
diff --git a/SmartDeviceLink/SDLTextFieldType.h b/SmartDeviceLink/SDLMetadataType.h
index f0210e5ff..96e65552a 100644
--- a/SmartDeviceLink/SDLTextFieldType.h
+++ b/SmartDeviceLink/SDLMetadataType.h
@@ -13,7 +13,7 @@
  *
  * @since SDL 4.7.0
  */
-@interface SDLTextFieldType : SDLEnum {
+@interface SDLMetadataType : SDLEnum {
 }
 
 /**
@@ -23,7 +23,7 @@
  *
  * @return SDLTextAlignment
  */
-+ (SDLTextFieldType *)valueOf:(NSString *)value;
++ (SDLMetadataType *)valueOf:(NSString *)value;
 
 /**
  * @abstract Store the enumeration of all possible SDLTextFieldType
@@ -37,83 +37,83 @@
  *
  * @return A SDLTextFieldType object with value of *MEDIA_TITLE*
  */
-+ (SDLTextFieldType *)MEDIA_TITLE;
++ (SDLMetadataType *)MEDIA_TITLE;
 
 /**
  * @abstract The data in this field contains the artist or creator of the currently playing audio track.
  *
  * @return A SDLTextFieldType object with value of *MEDIA_ARTIST*
  */
-+ (SDLTextFieldType *)MEDIA_ARTIST;
++ (SDLMetadataType *)MEDIA_ARTIST;
 
 /**
  * @abstract The data in this field contains the album title of the currently playing audio track.
  *
  * @return A SDLTextFieldType object with value of *MEDIA_ALBUM*
  */
-+ (SDLTextFieldType *)MEDIA_ALBUM;
++ (SDLMetadataType *)MEDIA_ALBUM;
 
 /**
  * @abstract The data in this field contains the creation year of the currently playing audio track.
  *
  * @return A SDLTextFieldType object with value of *MEDIA_YEAR*
  */
-+ (SDLTextFieldType *)MEDIA_YEAR;
++ (SDLMetadataType *)MEDIA_YEAR;
 
 /**
  * @abstract The data in this field contains the genre of the currently playing audio track.
  *
  * @return A SDLTextFieldType object with value of *MEDIA_GENRE*
  */
-+ (SDLTextFieldType *)MEDIA_GENRE;
++ (SDLMetadataType *)MEDIA_GENRE;
 
 /**
  * @abstract The data in this field contains the name of the current source for the media.
  *
  * @return A SDLTextFieldType object with value of *MEDIA_STATION*
  */
-+ (SDLTextFieldType *)MEDIA_STATION;
++ (SDLMetadataType *)MEDIA_STATION;
 
 /**
  * @abstract The data in this field is a rating.
  *
  * @return A SDLTextFieldType object with value of *RATING*
  */
-+ (SDLTextFieldType *)RATING;
++ (SDLMetadataType *)RATING;
 
 /**
  * @abstract The data in this field is the current temperature.
  *
  * @return A SDLTextFieldType object with value of *CURRENT_TEMPERATURE*
  */
-+ (SDLTextFieldType *)CURRENT_TEMPERATURE;
++ (SDLMetadataType *)CURRENT_TEMPERATURE;
 
 /**
  * @abstract The data in this field is the maximum temperature for the day.
  *
  * @return A SDLTextFieldType object with value of *MAXIMUM_TEMPERATURE*
  */
-+ (SDLTextFieldType *)MAXIMUM_TEMPERATURE;
++ (SDLMetadataType *)MAXIMUM_TEMPERATURE;
 
 /**
  * @abstract The data in this field is the minimum temperature for the day.
  *
  * @return A SDLTextFieldType object with value of *MINIMUM_TEMPERATURE*
  */
-+ (SDLTextFieldType *)MINIMUM_TEMPERATURE;
++ (SDLMetadataType *)MINIMUM_TEMPERATURE;
 
 /**
  * @abstract The data in this field describes the current weather (ex. cloudy, clear, etc.).
  *
  * @return A SDLTextFieldType object with value of *WEATHER_TERM*
  */
-+ (SDLTextFieldType *)WEATHER_TERM;
++ (SDLMetadataType *)WEATHER_TERM;
 
 /**
  * @abstract The data in this field describes the current humidity value.
  *
  * @return A SDLTextFieldType object with value of *HUMIDITY*
  */
-+ (SDLTextFieldType *)HUMIDITY;
++ (SDLMetadataType *)HUMIDITY;
 
 @end
diff --git a/SmartDeviceLink/SDLMetadataType.m b/SmartDeviceLink/SDLMetadataType.m
new file mode 100644
index 000000000..8b5e448d8
--- /dev/null
+++ b/SmartDeviceLink/SDLMetadataType.m
@@ -0,0 +1,140 @@
+//
+//  SDLMetadataType.m
+//  SmartDeviceLink-iOS
+//
+//  Created by Brett McIsaac on 8/1/17.
+//  Copyright © 2017 smartdevicelink. All rights reserved.
+//
+
+#import "SDLMetadataType.h"
+
+SDLMetadataType *SDLMetadataType_MEDIA_TITLE = nil;
+SDLMetadataType *SDLMetadataType_MEDIA_ARTIST = nil;
+SDLMetadataType *SDLMetadataType_MEDIA_ALBUM = nil;
+SDLMetadataType *SDLMetadataType_MEDIA_YEAR = nil;
+SDLMetadataType *SDLMetadataType_MEDIA_GENRE = nil;
+SDLMetadataType *SDLMetadataType_MEDIA_STATION = nil;
+SDLMetadataType *SDLMetadataType_RATING = nil;
+SDLMetadataType *SDLMetadataType_CURRENT_TEMPERATURE = nil;
+SDLMetadataType *SDLMetadataType_MAXIMUM_TEMPERATURE = nil;
+SDLMetadataType *SDLMetadataType_MINIMUM_TEMPERATURE = nil;
+SDLMetadataType *SDLMetadataType_WEATHER_TERM = nil;
+SDLMetadataType *SDLMetadataType_HUMIDITY = nil;
+
+NSArray *SDLMetadataType_values = nil;
+
+@implementation SDLMetadataType
+
++ (SDLMetadataType *)valueOf:(NSString *)value {
+    for (SDLMetadataType *item in SDLMetadataType.values) {
+        if ([item.value isEqualToString:value]) {
+            return item;
+        }
+    }
+    return nil;
+}
+
++ (NSArray *)values {
+    if (SDLMetadataType_values == nil) {
+        SDLMetadataType_values = @[
+                                   SDLMetadataType.MEDIA_TITLE,
+                                   SDLMetadataType.MEDIA_ARTIST,
+                                   SDLMetadataType.MEDIA_ALBUM,
+                                   SDLMetadataType.MEDIA_YEAR,
+                                   SDLMetadataType.MEDIA_GENRE,
+                                   SDLMetadataType.MEDIA_STATION,
+                                   SDLMetadataType.RATING,
+                                   SDLMetadataType.CURRENT_TEMPERATURE,
+                                   SDLMetadataType.MAXIMUM_TEMPERATURE,
+                                   SDLMetadataType.MINIMUM_TEMPERATURE,
+                                   SDLMetadataType.WEATHER_TERM,
+                                   SDLMetadataType.HUMIDITY];
+    }
+    return SDLMetadataType_values;
+}
+
++ (SDLMetadataType *)MEDIA_TITLE {
+    if (SDLMetadataType_MEDIA_TITLE== nil) {
+        SDLMetadataType_MEDIA_TITLE = [[SDLMetadataType alloc] initWithValue:@"MEDIA_TITLE"];
+    }
+    return SDLMetadataType_MEDIA_TITLE;
+}
+
++ (SDLMetadataType *)MEDIA_ARTIST {
+    if (SDLMetadataType_MEDIA_ARTIST== nil) {
+        SDLMetadataType_MEDIA_ARTIST = [[SDLMetadataType alloc] initWithValue:@"MEDIA_ARTIST"];
+    }
+    return SDLMetadataType_MEDIA_ARTIST;
+}
+
++ (SDLMetadataType *)MEDIA_ALBUM {
+    if (SDLMetadataType_MEDIA_ALBUM== nil) {
+        SDLMetadataType_MEDIA_ALBUM = [[SDLMetadataType alloc] initWithValue:@"MEDIA_ALBUM"];
+    }
+    return SDLMetadataType_MEDIA_ALBUM;
+}
+
++ (SDLMetadataType *)MEDIA_YEAR {
+    if (SDLMetadataType_MEDIA_YEAR== nil) {
+        SDLMetadataType_MEDIA_YEAR = [[SDLMetadataType alloc] initWithValue:@"MEDIA_YEAR"];
+    }
+    return SDLMetadataType_MEDIA_YEAR;
+}
+
++ (SDLMetadataType *)MEDIA_GENRE {
+    if (SDLMetadataType_MEDIA_GENRE== nil) {
+        SDLMetadataType_MEDIA_GENRE = [[SDLMetadataType alloc] initWithValue:@"MEDIA_GENRE"];
+    }
+    return SDLMetadataType_MEDIA_GENRE;
+}
+
++ (SDLMetadataType *)MEDIA_STATION {
+    if (SDLMetadataType_MEDIA_STATION== nil) {
+        SDLMetadataType_MEDIA_STATION = [[SDLMetadataType alloc] initWithValue:@"MEDIA_STATION"];
+    }
+    return SDLMetadataType_MEDIA_STATION;
+}
+
++ (SDLMetadataType *)RATING {
+    if (SDLMetadataType_RATING== nil) {
+        SDLMetadataType_RATING = [[SDLMetadataType alloc] initWithValue:@"RATING"];
+    }
+    return SDLMetadataType_RATING;
+}
+
++ (SDLMetadataType *)CURRENT_TEMPERATURE {
+    if (SDLMetadataType_CURRENT_TEMPERATURE== nil) {
+        SDLMetadataType_CURRENT_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"CURRENT_TEMPERATURE"];
+    }
+    return SDLMetadataType_CURRENT_TEMPERATURE;
+}
+
++ (SDLMetadataType *)MAXIMUM_TEMPERATURE {
+    if (SDLMetadataType_MAXIMUM_TEMPERATURE== nil) {
+        SDLMetadataType_MAXIMUM_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"MAXIMUM_TEMPERATURE"];
+    }
+    return SDLMetadataType_MAXIMUM_TEMPERATURE;
+}
+
++ (SDLMetadataType *)MINIMUM_TEMPERATURE {
+    if (SDLMetadataType_MINIMUM_TEMPERATURE== nil) {
+        SDLMetadataType_MINIMUM_TEMPERATURE = [[SDLMetadataType alloc] initWithValue:@"MINIMUM_TEMPERATURE"];
+    }
+    return SDLMetadataType_MINIMUM_TEMPERATURE;
+}
+
++ (SDLMetadataType *)WEATHER_TERM {
+    if (SDLMetadataType_WEATHER_TERM== nil) {
+        SDLMetadataType_WEATHER_TERM = [[SDLMetadataType alloc] initWithValue:@"WEATHER_TERM"];
+    }
+    return SDLMetadataType_WEATHER_TERM;
+}
+
++ (SDLMetadataType *)HUMIDITY {
+    if (SDLMetadataType_HUMIDITY== nil) {
+        SDLMetadataType_HUMIDITY = [[SDLMetadataType alloc] initWithValue:@"HUMIDITY"];
+    }
+    return SDLMetadataType_HUMIDITY;
+}
+
+@end
diff --git a/SmartDeviceLink/SDLShow.h b/SmartDeviceLink/SDLShow.h
index cf33fd64f..43932b722 100644
--- a/SmartDeviceLink/SDLShow.h
+++ b/SmartDeviceLink/SDLShow.h
@@ -5,9 +5,9 @@
 
 @class SDLImage;
 @class SDLSoftButton;
-@class SDLMetadataStruct;
+@class SDLMetadataTags;
 @class SDLTextAlignment;
-@class SDLTextFieldType;
+@class SDLMetadataType;
 
 
 /**
@@ -47,17 +47,17 @@
 
 - (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment *)alignment;
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField1Type:(SDLTextFieldType *)mainField1Type mainField2:(NSString *)mainField2 mainField2Type:(SDLTextFieldType *)mainField2Type alignment:(SDLTextAlignment *)alignment;
+- (instancetype)initWithMainField1:(NSString *)mainField1 mainField1Type:(SDLMetadataType *)mainField1Type mainField2:(NSString *)mainField2 mainField2Type:(SDLMetadataType *)mainField2Type alignment:(SDLTextAlignment *)alignment;
 
 - (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment *)alignment;
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField1Type:(SDLTextFieldType *)mainField1Type mainField2:(NSString *)mainField2 mainField2Type:(SDLTextFieldType *)mainField2Type mainField3:(NSString *)mainField3 mainField3Type:(SDLTextFieldType *)mainField3Type mainField4:(NSString *)mainField4 mainField4Type:(SDLTextFieldType *)mainField4Type alignment:(SDLTextAlignment *)alignment;
+- (instancetype)initWithMainField1:(NSString *)mainField1 mainField1Type:(SDLMetadataType *)mainField1Type mainField2:(NSString *)mainField2 mainField2Type:(SDLMetadataType *)mainField2Type mainField3:(NSString *)mainField3 mainField3Type:(SDLMetadataType *)mainField3Type mainField4:(NSString *)mainField4 mainField4Type:(SDLMetadataType *)mainField4Type alignment:(SDLTextAlignment *)alignment;
 
 - (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment *)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack;
 
 - (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment *)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets __deprecated_msg(("Use initWithMainField1:(NSString *)mainField1 (NSString *)mainField2 (NSString *)mainField3 (NSString *)mainField4 (SDLTextAlignment *)alignment (NSString *)statusBar (NSString *)mediaClock (NSString *)mediaTrack (SDLImage *)graphic (NSArray<SDLSoftButton *> *)softButtons (NSArray<NSString *> *)customPresets (SDLMetadataStruct *)metadata instead"));
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment *)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets textFieldMetadata:(SDLMetadataStruct *)metadata;
+- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment *)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets textFieldMetadata:(SDLMetadataTags *)metadata;
 
 
 /**
@@ -259,6 +259,6 @@
  *            If any text field contains no tags or the none tag, the metadata tag for that textfield should be removed.
  * @since SmartDeviceLink 2.0
  */
-@property (strong) SDLMetadataStruct *textFieldMetadata;
+@property (strong) SDLMetadataTags *textFieldMetadata;
 
 @end
diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m
index 48dfb0ca5..b687271b0 100644
--- a/SmartDeviceLink/SDLShow.m
+++ b/SmartDeviceLink/SDLShow.m
@@ -5,7 +5,7 @@
 #import "SDLShow.h"
 
 #import "SDLImage.h"
-#import "SDLMetadataStruct.h"
+#import "SDLMetadataTags.h"
 #import "SDLNames.h"
 #import "SDLSoftButton.h"
 #import "SDLTextAlignment.h"
@@ -29,15 +29,15 @@
     return [self initWithMainField1:mainField1 mainField2:mainField2 mainField3:nil mainField4:nil alignment:alignment];
 }
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField1Type:(SDLTextFieldType *)mainField1Type mainField2:(NSString *)mainField2 mainField2Type:(SDLTextFieldType *)mainField2Type alignment:(SDLTextAlignment *)alignment {
+- (instancetype)initWithMainField1:(NSString *)mainField1 mainField1Type:(SDLMetadataType *)mainField1Type mainField2:(NSString *)mainField2 mainField2Type:(SDLMetadataType *)mainField2Type alignment:(SDLTextAlignment *)alignment {
     self = [self init];
     if (!self) {
         return nil;
     }
 
-    NSArray<SDLTextFieldType *> *field1Array = @[mainField1Type];
-    NSArray<SDLTextFieldType *> *field2Array = @[mainField2Type];
-    SDLMetadataStruct* fieldsStruct = [[SDLMetadataStruct alloc] initWithTextFieldTypes:field1Array mainField2:field2Array];
+    NSArray<SDLMetadataType *> *field1Array = @[mainField1Type];
+    NSArray<SDLMetadataType *> *field2Array = @[mainField2Type];
+    SDLMetadataTags* fieldsStruct = [[SDLMetadataTags alloc] initWithTextFieldTypes:field1Array mainField2:field2Array];
 
     self.mainField1 = mainField1;
     self.mainField2 = mainField2;
@@ -55,17 +55,17 @@
     return [self initWithMainField1:mainField1 mainField2:mainField2 mainField3:mainField3 mainField4:mainField4 alignment:alignment statusBar:nil mediaClock:nil mediaTrack:nil graphic:nil softButtons:nil customPresets:nil textFieldMetadata:nil];
 }
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField1Type:(SDLTextFieldType *)mainField1Type mainField2:(NSString *)mainField2 mainField2Type:(SDLTextFieldType *)mainField2Type mainField3:(NSString *)mainField3 mainField3Type:(SDLTextFieldType *)mainField3Type mainField4:(NSString *)mainField4 mainField4Type:(SDLTextFieldType *)mainField4Type alignment:(SDLTextAlignment *)alignment{
+- (instancetype)initWithMainField1:(NSString *)mainField1 mainField1Type:(SDLMetadataType *)mainField1Type mainField2:(NSString *)mainField2 mainField2Type:(SDLMetadataType *)mainField2Type mainField3:(NSString *)mainField3 mainField3Type:(SDLMetadataType *)mainField3Type mainField4:(NSString *)mainField4 mainField4Type:(SDLMetadataType *)mainField4Type alignment:(SDLTextAlignment *)alignment{
     self = [self init];
     if (!self) {
         return nil;
     }
 
-    NSArray<SDLTextFieldType *> *field1Array = @[mainField1Type];
-    NSArray<SDLTextFieldType *> *field2Array = @[mainField2Type];
-    NSArray<SDLTextFieldType *> *field3Array = @[mainField3Type];
-    NSArray<SDLTextFieldType *> *field4Array = @[mainField4Type];
-    SDLMetadataStruct* fieldsStruct = [[SDLMetadataStruct alloc] initWithTextFieldTypes:field1Array mainField2:field2Array mainField3:field3Array mainField4:field4Array];
+    NSArray<SDLMetadataType *> *field1Array = @[mainField1Type];
+    NSArray<SDLMetadataType *> *field2Array = @[mainField2Type];
+    NSArray<SDLMetadataType *> *field3Array = @[mainField3Type];
+    NSArray<SDLMetadataType *> *field4Array = @[mainField4Type];
+    SDLMetadataTags* fieldsStruct = [[SDLMetadataTags alloc] initWithTextFieldTypes:field1Array mainField2:field2Array mainField3:field3Array mainField4:field4Array];
 
     self.mainField1 = mainField1;
     self.mainField2 = mainField2;
@@ -98,7 +98,7 @@
     return self;
 }
 
-- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment *)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets textFieldMetadata:(SDLMetadataStruct *)metadata {
+- (instancetype)initWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 alignment:(SDLTextAlignment *)alignment statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets textFieldMetadata:(SDLMetadataTags *)metadata {
     self = [self init];
     if (!self) {
         return nil;
@@ -291,7 +291,7 @@
     return [parameters objectForKey:NAMES_customPresets];
 }
 
-- (void)setTextFieldMetadata:(SDLMetadataStruct *)textFieldMetadata {
+- (void)setTextFieldMetadata:(SDLMetadataTags *)textFieldMetadata {
     if (textFieldMetadata != nil) {
         [parameters setObject:textFieldMetadata forKey:NAMES_textFieldMetadata];
     } else {
@@ -299,12 +299,12 @@
     }
 }
 
-- (SDLMetadataStruct *)textFieldMetadata {
+- (SDLMetadataTags *)textFieldMetadata {
     NSObject *obj = [parameters objectForKey:NAMES_textFieldMetadata];
-    if (obj == nil || [obj isKindOfClass:SDLMetadataStruct.class]) {
-        return (SDLMetadataStruct *)obj;
+    if (obj == nil || [obj isKindOfClass:SDLMetadataTags.class]) {
+        return (SDLMetadataTags *)obj;
     } else {
-        return [[SDLMetadataStruct alloc] initWithDictionary:(NSMutableDictionary *)obj];
+        return [[SDLMetadataTags alloc] initWithDictionary:(NSMutableDictionary *)obj];
     }
 }
 
diff --git a/SmartDeviceLink/SDLTextFieldType.m b/SmartDeviceLink/SDLTextFieldType.m
deleted file mode 100644
index cade7f8c4..000000000
--- a/SmartDeviceLink/SDLTextFieldType.m
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-//  SDLTextFieldType.m
-//  SmartDeviceLink-iOS
-//
-//  Created by Brett McIsaac on 8/1/17.
-//  Copyright © 2017 smartdevicelink. All rights reserved.
-//
-
-#import "SDLTextFieldType.h"
-
-SDLTextFieldType *SDLTextFieldType_MEDIA_TITLE = nil;
-SDLTextFieldType *SDLTextFieldType_MEDIA_ARTIST = nil;
-SDLTextFieldType *SDLTextFieldType_MEDIA_ALBUM = nil;
-SDLTextFieldType *SDLTextFieldType_MEDIA_YEAR = nil;
-SDLTextFieldType *SDLTextFieldType_MEDIA_GENRE = nil;
-SDLTextFieldType *SDLTextFieldType_MEDIA_STATION = nil;
-SDLTextFieldType *SDLTextFieldType_RATING = nil;
-SDLTextFieldType *SDLTextFieldType_CURRENT_TEMPERATURE = nil;
-SDLTextFieldType *SDLTextFieldType_MAXIMUM_TEMPERATURE = nil;
-SDLTextFieldType *SDLTextFieldType_MINIMUM_TEMPERATURE = nil;
-SDLTextFieldType *SDLTextFieldType_WEATHER_TERM = nil;
-SDLTextFieldType *SDLTextFieldType_HUMIDITY = nil;
-
-NSArray *SDLTextFieldType_values = nil;
-
-@implementation SDLTextFieldType
-
-+ (SDLTextFieldType *)valueOf:(NSString *)value {
-    for (SDLTextFieldType *item in SDLTextFieldType.values) {
-        if ([item.value isEqualToString:value]) {
-            return item;
-        }
-    }
-    return nil;
-}
-
-+ (NSArray *)values {
-    if (SDLTextFieldType_values == nil) {
-        SDLTextFieldType_values = @[
-                                    SDLTextFieldType.MEDIA_TITLE,
-                                    SDLTextFieldType.MEDIA_ARTIST,
-                                    SDLTextFieldType.MEDIA_ALBUM,
-                                    SDLTextFieldType.MEDIA_YEAR,
-                                    SDLTextFieldType.MEDIA_GENRE,
-                                    SDLTextFieldType.MEDIA_STATION,
-                                    SDLTextFieldType.RATING,
-                                    SDLTextFieldType.CURRENT_TEMPERATURE,
-                                    SDLTextFieldType.MAXIMUM_TEMPERATURE,
-                                    SDLTextFieldType.MINIMUM_TEMPERATURE,
-                                    SDLTextFieldType.WEATHER_TERM,
-                                    SDLTextFieldType.HUMIDITY];
-    }
-    return SDLTextFieldType_values;
-}
-
-+ (SDLTextFieldType *)MEDIA_TITLE {
-    if (SDLTextFieldType_MEDIA_TITLE== nil) {
-        SDLTextFieldType_MEDIA_TITLE = [[SDLTextFieldType alloc] initWithValue:@"MEDIA_TITLE"];
-    }
-    return SDLTextFieldType_MEDIA_TITLE;
-}
-
-+ (SDLTextFieldType *)MEDIA_ARTIST {
-    if (SDLTextFieldType_MEDIA_ARTIST== nil) {
-        SDLTextFieldType_MEDIA_ARTIST = [[SDLTextFieldType alloc] initWithValue:@"MEDIA_ARTIST"];
-    }
-    return SDLTextFieldType_MEDIA_ARTIST;
-}
-
-+ (SDLTextFieldType *)MEDIA_ALBUM {
-    if (SDLTextFieldType_MEDIA_ALBUM== nil) {
-        SDLTextFieldType_MEDIA_ALBUM = [[SDLTextFieldType alloc] initWithValue:@"MEDIA_ALBUM"];
-    }
-    return SDLTextFieldType_MEDIA_ALBUM;
-}
-
-+ (SDLTextFieldType *)MEDIA_YEAR {
-    if (SDLTextFieldType_MEDIA_YEAR== nil) {
-        SDLTextFieldType_MEDIA_YEAR = [[SDLTextFieldType alloc] initWithValue:@"MEDIA_YEAR"];
-    }
-    return SDLTextFieldType_MEDIA_YEAR;
-}
-
-+ (SDLTextFieldType *)MEDIA_GENRE {
-    if (SDLTextFieldType_MEDIA_GENRE== nil) {
-        SDLTextFieldType_MEDIA_GENRE = [[SDLTextFieldType alloc] initWithValue:@"MEDIA_GENRE"];
-    }
-    return SDLTextFieldType_MEDIA_GENRE;
-}
-
-+ (SDLTextFieldType *)MEDIA_STATION {
-    if (SDLTextFieldType_MEDIA_STATION== nil) {
-        SDLTextFieldType_MEDIA_STATION = [[SDLTextFieldType alloc] initWithValue:@"MEDIA_STATION"];
-    }
-    return SDLTextFieldType_MEDIA_STATION;
-}
-
-+ (SDLTextFieldType *)RATING {
-    if (SDLTextFieldType_RATING== nil) {
-        SDLTextFieldType_RATING = [[SDLTextFieldType alloc] initWithValue:@"RATING"];
-    }
-    return SDLTextFieldType_RATING;
-}
-
-+ (SDLTextFieldType *)CURRENT_TEMPERATURE {
-    if (SDLTextFieldType_CURRENT_TEMPERATURE== nil) {
-        SDLTextFieldType_CURRENT_TEMPERATURE = [[SDLTextFieldType alloc] initWithValue:@"CURRENT_TEMPERATURE"];
-    }
-    return SDLTextFieldType_CURRENT_TEMPERATURE;
-}
-
-+ (SDLTextFieldType *)MAXIMUM_TEMPERATURE {
-    if (SDLTextFieldType_MAXIMUM_TEMPERATURE== nil) {
-        SDLTextFieldType_MAXIMUM_TEMPERATURE = [[SDLTextFieldType alloc] initWithValue:@"MAXIMUM_TEMPERATURE"];
-    }
-    return SDLTextFieldType_MAXIMUM_TEMPERATURE;
-}
-
-+ (SDLTextFieldType *)MINIMUM_TEMPERATURE {
-    if (SDLTextFieldType_MINIMUM_TEMPERATURE== nil) {
-        SDLTextFieldType_MINIMUM_TEMPERATURE = [[SDLTextFieldType alloc] initWithValue:@"MINIMUM_TEMPERATURE"];
-    }
-    return SDLTextFieldType_MINIMUM_TEMPERATURE;
-}
-
-+ (SDLTextFieldType *)WEATHER_TERM {
-    if (SDLTextFieldType_WEATHER_TERM== nil) {
-        SDLTextFieldType_WEATHER_TERM = [[SDLTextFieldType alloc] initWithValue:@"WEATHER_TERM"];
-    }
-    return SDLTextFieldType_WEATHER_TERM;
-}
-
-+ (SDLTextFieldType *)HUMIDITY {
-    if (SDLTextFieldType_HUMIDITY== nil) {
-        SDLTextFieldType_HUMIDITY = [[SDLTextFieldType alloc] initWithValue:@"HUMIDITY"];
-    }
-    return SDLTextFieldType_HUMIDITY;
-}
-
-@end
diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMetadataTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMetadataTypeSpec.m
new file mode 100644
index 000000000..3a1c0005a
--- /dev/null
+++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMetadataTypeSpec.m
@@ -0,0 +1,87 @@
+//
+//  SDLTextFieldTypeSpec.m
+//  SmartDeviceLink-iOS
+//
+//  Created by Brett McIsaac on 8/1/17.
+//  Copyright © 2017 smartdevicelink. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import <Quick/Quick.h>
+#import <Nimble/Nimble.h>
+
+#import "SDLMetadataType.h"
+
+QuickSpecBegin(SDLMetadataTypeSpec)
+
+describe(@"Individual Enum Value Tests", ^ {
+    it(@"Should match internal values", ^ {
+        expect([SDLMetadataType MEDIA_TITLE].value).to(equal(@"MEDIA_TITLE"));
+        expect([SDLMetadataType MEDIA_ARTIST].value).to(equal(@"MEDIA_ARTIST"));
+        expect([SDLMetadataType MEDIA_ALBUM].value).to(equal(@"MEDIA_ALBUM"));
+        expect([SDLMetadataType MEDIA_YEAR].value).to(equal(@"MEDIA_YEAR"));
+        expect([SDLMetadataType MEDIA_GENRE].value).to(equal(@"MEDIA_GENRE"));
+        expect([SDLMetadataType MEDIA_STATION].value).to(equal(@"MEDIA_STATION"));
+        expect([SDLMetadataType RATING].value).to(equal(@"RATING"));
+        expect([SDLMetadataType CURRENT_TEMPERATURE].value).to(equal(@"CURRENT_TEMPERATURE"));
+        expect([SDLMetadataType MAXIMUM_TEMPERATURE].value).to(equal(@"MAXIMUM_TEMPERATURE"));
+        expect([SDLMetadataType MINIMUM_TEMPERATURE].value).to(equal(@"MINIMUM_TEMPERATURE"));
+        expect([SDLMetadataType WEATHER_TERM].value).to(equal(@"WEATHER_TERM"));
+        expect([SDLMetadataType HUMIDITY].value).to(equal(@"HUMIDITY"));
+
+    });
+});
+describe(@"ValueOf Tests", ^ {
+    it(@"Should return correct values when valid", ^ {
+        expect([SDLMetadataType valueOf:@"MEDIA_TITLE"]).to(equal([SDLMetadataType MEDIA_TITLE]));
+        expect([SDLMetadataType valueOf:@"MEDIA_ARTIST"]).to(equal([SDLMetadataType MEDIA_ARTIST]));
+        expect([SDLMetadataType valueOf:@"MEDIA_ALBUM"]).to(equal([SDLMetadataType MEDIA_ALBUM]));
+        expect([SDLMetadataType valueOf:@"MEDIA_YEAR"]).to(equal([SDLMetadataType MEDIA_YEAR]));
+        expect([SDLMetadataType valueOf:@"MEDIA_GENRE"]).to(equal([SDLMetadataType MEDIA_GENRE]));
+        expect([SDLMetadataType valueOf:@"MEDIA_STATION"]).to(equal([SDLMetadataType MEDIA_STATION]));
+        expect([SDLMetadataType valueOf:@"RATING"]).to(equal([SDLMetadataType RATING]));
+        expect([SDLMetadataType valueOf:@"CURRENT_TEMPERATURE"]).to(equal([SDLMetadataType CURRENT_TEMPERATURE]));
+        expect([SDLMetadataType valueOf:@"MAXIMUM_TEMPERATURE"]).to(equal([SDLMetadataType MAXIMUM_TEMPERATURE]));
+        expect([SDLMetadataType valueOf:@"MINIMUM_TEMPERATURE"]).to(equal([SDLMetadataType MINIMUM_TEMPERATURE]));
+        expect([SDLMetadataType valueOf:@"WEATHER_TERM"]).to(equal([SDLMetadataType WEATHER_TERM]));
+        expect([SDLMetadataType valueOf:@"HUMIDITY"]).to(equal([SDLMetadataType HUMIDITY]));
+    });
+
+    it(@"Should return nil when invalid", ^ {
+        expect([SDLMetadataType valueOf:nil]).to(beNil());
+        expect([SDLMetadataType valueOf:@"JKUYTFHYTHJGFRFGYTR"]).to(beNil());
+    });
+});
+describe(@"Value List Tests", ^ {
+    NSArray* storedValues = [SDLMetadataType values];
+    __block NSArray* definedValues;
+    beforeSuite(^ {
+        definedValues = [@[[SDLMetadataType MEDIA_TITLE],
+                           [SDLMetadataType MEDIA_ARTIST],
+                           [SDLMetadataType MEDIA_ALBUM],
+                           [SDLMetadataType MEDIA_YEAR],
+                           [SDLMetadataType MEDIA_GENRE],
+                           [SDLMetadataType MEDIA_STATION],
+                           [SDLMetadataType RATING],
+                           [SDLMetadataType CURRENT_TEMPERATURE],
+                           [SDLMetadataType MAXIMUM_TEMPERATURE],
+                           [SDLMetadataType MINIMUM_TEMPERATURE],
+                           [SDLMetadataType WEATHER_TERM],
+                           [SDLMetadataType HUMIDITY]] copy];
+    });
+
+    it(@"Should contain all defined enum values", ^ {
+        for (int i = 0; i < definedValues.count; i++) {
+            expect(storedValues).to(contain(definedValues[i]));
+        }
+    });
+
+    it(@"Should contain only defined enum values", ^ {
+        for (int i = 0; i < storedValues.count; i++) {
+            expect(definedValues).to(contain(storedValues[i]));
+        }
+    });
+});
+
+QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldTypeSpec.m
deleted file mode 100644
index 68780bca7..000000000
--- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldTypeSpec.m
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-//  SDLTextFieldTypeSpec.m
-//  SmartDeviceLink-iOS
-//
-//  Created by Brett McIsaac on 8/1/17.
-//  Copyright © 2017 smartdevicelink. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-#import <Quick/Quick.h>
-#import <Nimble/Nimble.h>
-
-#import "SDLTextFieldType.h"
-
-QuickSpecBegin(SDLTextFieldTypeSpec)
-
-describe(@"Individual Enum Value Tests", ^ {
-    it(@"Should match internal values", ^ {
-        expect([SDLTextFieldType MEDIA_TITLE].value).to(equal(@"MEDIA_TITLE"));
-        expect([SDLTextFieldType MEDIA_ARTIST].value).to(equal(@"MEDIA_ARTIST"));
-        expect([SDLTextFieldType MEDIA_ALBUM].value).to(equal(@"MEDIA_ALBUM"));
-        expect([SDLTextFieldType MEDIA_YEAR].value).to(equal(@"MEDIA_YEAR"));
-        expect([SDLTextFieldType MEDIA_GENRE].value).to(equal(@"MEDIA_GENRE"));
-        expect([SDLTextFieldType MEDIA_STATION].value).to(equal(@"MEDIA_STATION"));
-        expect([SDLTextFieldType RATING].value).to(equal(@"RATING"));
-        expect([SDLTextFieldType CURRENT_TEMPERATURE].value).to(equal(@"CURRENT_TEMPERATURE"));
-        expect([SDLTextFieldType MAXIMUM_TEMPERATURE].value).to(equal(@"MAXIMUM_TEMPERATURE"));
-        expect([SDLTextFieldType MINIMUM_TEMPERATURE].value).to(equal(@"MINIMUM_TEMPERATURE"));
-        expect([SDLTextFieldType WEATHER_TERM].value).to(equal(@"WEATHER_TERM"));
-        expect([SDLTextFieldType HUMIDITY].value).to(equal(@"HUMIDITY"));
-
-    });
-});
-describe(@"ValueOf Tests", ^ {
-    it(@"Should return correct values when valid", ^ {
-        expect([SDLTextFieldType valueOf:@"MEDIA_TITLE"]).to(equal([SDLTextFieldType MEDIA_TITLE]));
-        expect([SDLTextFieldType valueOf:@"MEDIA_ARTIST"]).to(equal([SDLTextFieldType MEDIA_ARTIST]));
-        expect([SDLTextFieldType valueOf:@"MEDIA_ALBUM"]).to(equal([SDLTextFieldType MEDIA_ALBUM]));
-        expect([SDLTextFieldType valueOf:@"MEDIA_YEAR"]).to(equal([SDLTextFieldType MEDIA_YEAR]));
-        expect([SDLTextFieldType valueOf:@"MEDIA_GENRE"]).to(equal([SDLTextFieldType MEDIA_GENRE]));
-        expect([SDLTextFieldType valueOf:@"MEDIA_STATION"]).to(equal([SDLTextFieldType MEDIA_STATION]));
-        expect([SDLTextFieldType valueOf:@"RATING"]).to(equal([SDLTextFieldType RATING]));
-        expect([SDLTextFieldType valueOf:@"CURRENT_TEMPERATURE"]).to(equal([SDLTextFieldType CURRENT_TEMPERATURE]));
-        expect([SDLTextFieldType valueOf:@"MAXIMUM_TEMPERATURE"]).to(equal([SDLTextFieldType MAXIMUM_TEMPERATURE]));
-        expect([SDLTextFieldType valueOf:@"MINIMUM_TEMPERATURE"]).to(equal([SDLTextFieldType MINIMUM_TEMPERATURE]));
-        expect([SDLTextFieldType valueOf:@"WEATHER_TERM"]).to(equal([SDLTextFieldType WEATHER_TERM]));
-        expect([SDLTextFieldType valueOf:@"HUMIDITY"]).to(equal([SDLTextFieldType HUMIDITY]));
-    });
-
-    it(@"Should return nil when invalid", ^ {
-        expect([SDLTextFieldType valueOf:nil]).to(beNil());
-        expect([SDLTextFieldType valueOf:@"JKUYTFHYTHJGFRFGYTR"]).to(beNil());
-    });
-});
-describe(@"Value List Tests", ^ {
-    NSArray* storedValues = [SDLTextFieldType values];
-    __block NSArray* definedValues;
-    beforeSuite(^ {
-        definedValues = [@[[SDLTextFieldType MEDIA_TITLE],
-                           [SDLTextFieldType MEDIA_ARTIST],
-                           [SDLTextFieldType MEDIA_ALBUM],
-                           [SDLTextFieldType MEDIA_YEAR],
-                           [SDLTextFieldType MEDIA_GENRE],
-                           [SDLTextFieldType MEDIA_STATION],
-                           [SDLTextFieldType RATING],
-                           [SDLTextFieldType CURRENT_TEMPERATURE],
-                           [SDLTextFieldType MAXIMUM_TEMPERATURE],
-                           [SDLTextFieldType MINIMUM_TEMPERATURE],
-                           [SDLTextFieldType WEATHER_TERM],
-                           [SDLTextFieldType HUMIDITY]] copy];
-    });
-
-    it(@"Should contain all defined enum values", ^ {
-        for (int i = 0; i < definedValues.count; i++) {
-            expect(storedValues).to(contain(definedValues[i]));
-        }
-    });
-
-    it(@"Should contain only defined enum values", ^ {
-        for (int i = 0; i < storedValues.count; i++) {
-            expect(definedValues).to(contain(storedValues[i]));
-        }
-    });
-});
-
-QuickSpecEnd
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
index f844f00a4..c63325cfb 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
@@ -9,13 +9,12 @@
 #import <Nimble/Nimble.h>
 
 #import "SDLImage.h"
-#import "SDLMetadataStruct.h"
+#import "SDLMetadataTags.h"
+#import "SDLMetadataType.h"
 #import "SDLNames.h"
 #import "SDLShow.h"
 #import "SDLSoftButton.h"
 #import "SDLTextAlignment.h"
-#import "SDLTextFieldType.h"
-
 
 QuickSpecBegin(SDLShowSpec)
 
@@ -23,8 +22,8 @@ SDLImage* image1 = [[SDLImage alloc] init];
 SDLImage* image2 = [[SDLImage alloc] init];
 SDLSoftButton* button = [[SDLSoftButton alloc] init];
 
-NSArray<SDLTextFieldType *> *formatArray = @[[SDLTextFieldType MEDIA_ARTIST], [SDLTextFieldType MEDIA_TITLE]];
-SDLMetadataStruct* testMetadata = [[SDLMetadataStruct alloc] initWithTextFieldTypes:formatArray mainField2:formatArray mainField3:formatArray mainField4:formatArray];
+NSArray<SDLMetadataType *> *formatArray = @[[SDLMetadataType MEDIA_ARTIST], [SDLMetadataType MEDIA_TITLE]];
+SDLMetadataTags* testMetadata = [[SDLMetadataTags alloc] initWithTextFieldTypes:formatArray mainField2:formatArray mainField3:formatArray mainField4:formatArray];
 
 describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMetadataStructSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMetadataTagsSpec.m
index 2c3d6afd2..62f43e85e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMetadataStructSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMetadataTagsSpec.m
@@ -1,5 +1,5 @@
 //
-//  SDLMetadataStructSpec.m
+//  SDLMetadataTagsSpec.m
 //  SmartDeviceLink-iOS
 //
 //  Created by Brett McIsaac on 8/1/17.
@@ -12,20 +12,20 @@
 #import <Nimble/Nimble.h>
 
 #import "SDLNames.h"
-#import "SDLMetadataStruct.h"
-#import "SDLTextFieldType.h"
+#import "SDLMetadataTags.h"
+#import "SDLMetadataType.h"
 
-QuickSpecBegin(SDLMetadataStructSpec)
+QuickSpecBegin(SDLMetadataTagsSpec)
 
 describe(@"Initialization tests", ^{
     it(@"Should get correctly when initialized with a dictionary", ^ {
-        NSArray<SDLTextFieldType *> *formatArray = @[[SDLTextFieldType MEDIA_ARTIST], [SDLTextFieldType MEDIA_TITLE]];
+        NSArray<SDLMetadataType *> *formatArray = @[[SDLMetadataType MEDIA_ARTIST], [SDLMetadataType MEDIA_TITLE]];
         NSMutableDictionary* dict = [@{NAMES_mainField1Type: formatArray,
                                        NAMES_mainField2Type: formatArray,
                                        NAMES_mainField3Type: formatArray,
                                        NAMES_mainField4Type: formatArray} mutableCopy];
 
-        SDLMetadataStruct* testStruct = [[SDLMetadataStruct alloc] initWithDictionary:dict];
+        SDLMetadataTags* testStruct = [[SDLMetadataTags alloc] initWithDictionary:dict];
 
         expect(testStruct.mainField1).to(equal(formatArray));
         expect(testStruct.mainField2).to(equal(formatArray));
@@ -34,7 +34,7 @@ describe(@"Initialization tests", ^{
     });
 
     it(@"Should return nil if not set", ^ {
-        SDLMetadataStruct* testStruct = [[SDLMetadataStruct alloc] init];
+        SDLMetadataTags* testStruct = [[SDLMetadataTags alloc] init];
 
         expect(testStruct.mainField1).to(beNil());
         expect(testStruct.mainField2).to(beNil());
@@ -43,8 +43,8 @@ describe(@"Initialization tests", ^{
     });
 
     it(@"Should get correctly when initialized with Arrays", ^ {
-        NSArray<SDLTextFieldType *> *formatArray = @[[SDLTextFieldType MEDIA_ARTIST], [SDLTextFieldType MEDIA_TITLE]];
-        SDLMetadataStruct* testStruct = [[SDLMetadataStruct alloc] initWithTextFieldTypes:formatArray mainField2:formatArray mainField3:formatArray mainField4:formatArray];
+        NSArray<SDLMetadataType *> *formatArray = @[[SDLMetadataType MEDIA_ARTIST], [SDLMetadataType MEDIA_TITLE]];
+        SDLMetadataTags* testStruct = [[SDLMetadataTags alloc] initWithTextFieldTypes:formatArray mainField2:formatArray mainField3:formatArray mainField4:formatArray];
 
         expect(testStruct.mainField1).to(equal(formatArray));
         expect(testStruct.mainField2).to(equal(formatArray));