1 files changed, 41 insertions, 41 deletions

diff --git a/src/wixext/Tuples/ServiceConfigTuple.cs b/src/wixext/Tuples/ServiceConfigTuple.cs
index 714396bc..3a877f9b 100644
--- a/src/wixext/Tuples/ServiceConfigTuple.cs
+++ b/src/wixext/Tuples/ServiceConfigTuple.cs
@@ -3,34 +3,34 @@
 namespace WixToolset.Util
 {
     using WixToolset.Data;
-    using WixToolset.Util.Tuples;
+    using WixToolset.Util.Symbols;
 
-    public static partial class UtilTupleDefinitions
+    public static partial class UtilSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition ServiceConfig = new IntermediateTupleDefinition(
-            UtilTupleDefinitionType.ServiceConfig.ToString(),
+        public static readonly IntermediateSymbolDefinition ServiceConfig = new IntermediateSymbolDefinition(
+            UtilSymbolDefinitionType.ServiceConfig.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ServiceName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.NewService), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.FirstFailureActionType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.SecondFailureActionType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ThirdFailureActionType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ResetPeriodInDays), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.ProgramCommandLine), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceConfigTupleFields.RebootMessage), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ServiceName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.NewService), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.FirstFailureActionType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.SecondFailureActionType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ThirdFailureActionType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ResetPeriodInDays), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RestartServiceDelayInSeconds), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.ProgramCommandLine), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceConfigSymbolFields.RebootMessage), IntermediateFieldType.String),
             },
-            typeof(ServiceConfigTuple));
+            typeof(ServiceConfigSymbol));
     }
 }
 
-namespace WixToolset.Util.Tuples
+namespace WixToolset.Util.Symbols
 {
     using WixToolset.Data;
 
-    public enum ServiceConfigTupleFields
+    public enum ServiceConfigSymbolFields
     {
         ServiceName,
         ComponentRef,
@@ -44,76 +44,76 @@ namespace WixToolset.Util.Tuples
         RebootMessage,
     }
 
-    public class ServiceConfigTuple : IntermediateTuple
+    public class ServiceConfigSymbol : IntermediateSymbol
     {
-        public ServiceConfigTuple() : base(UtilTupleDefinitions.ServiceConfig, null, null)
+        public ServiceConfigSymbol() : base(UtilSymbolDefinitions.ServiceConfig, null, null)
         {
         }
 
-        public ServiceConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.ServiceConfig, sourceLineNumber, id)
+        public ServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.ServiceConfig, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ServiceConfigTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ServiceConfigSymbolFields index] => this.Fields[(int)index];
 
         public string ServiceName
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.ServiceName].AsString();
-            set => this.Set((int)ServiceConfigTupleFields.ServiceName, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.ServiceName].AsString();
+            set => this.Set((int)ServiceConfigSymbolFields.ServiceName, value);
         }
 
         public string ComponentRef
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.ComponentRef].AsString();
-            set => this.Set((int)ServiceConfigTupleFields.ComponentRef, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)ServiceConfigSymbolFields.ComponentRef, value);
         }
 
         public int NewService
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.NewService].AsNumber();
-            set => this.Set((int)ServiceConfigTupleFields.NewService, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.NewService].AsNumber();
+            set => this.Set((int)ServiceConfigSymbolFields.NewService, value);
         }
 
         public string FirstFailureActionType
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.FirstFailureActionType].AsString();
-            set => this.Set((int)ServiceConfigTupleFields.FirstFailureActionType, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.FirstFailureActionType].AsString();
+            set => this.Set((int)ServiceConfigSymbolFields.FirstFailureActionType, value);
         }
 
         public string SecondFailureActionType
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.SecondFailureActionType].AsString();
-            set => this.Set((int)ServiceConfigTupleFields.SecondFailureActionType, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.SecondFailureActionType].AsString();
+            set => this.Set((int)ServiceConfigSymbolFields.SecondFailureActionType, value);
         }
 
         public string ThirdFailureActionType
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.ThirdFailureActionType].AsString();
-            set => this.Set((int)ServiceConfigTupleFields.ThirdFailureActionType, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.ThirdFailureActionType].AsString();
+            set => this.Set((int)ServiceConfigSymbolFields.ThirdFailureActionType, value);
         }
 
         public int? ResetPeriodInDays
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.ResetPeriodInDays].AsNullableNumber();
-            set => this.Set((int)ServiceConfigTupleFields.ResetPeriodInDays, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.ResetPeriodInDays].AsNullableNumber();
+            set => this.Set((int)ServiceConfigSymbolFields.ResetPeriodInDays, value);
         }
 
         public int? RestartServiceDelayInSeconds
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.RestartServiceDelayInSeconds].AsNullableNumber();
-            set => this.Set((int)ServiceConfigTupleFields.RestartServiceDelayInSeconds, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds].AsNullableNumber();
+            set => this.Set((int)ServiceConfigSymbolFields.RestartServiceDelayInSeconds, value);
         }
 
         public string ProgramCommandLine
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.ProgramCommandLine].AsString();
-            set => this.Set((int)ServiceConfigTupleFields.ProgramCommandLine, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.ProgramCommandLine].AsString();
+            set => this.Set((int)ServiceConfigSymbolFields.ProgramCommandLine, value);
         }
 
         public string RebootMessage
         {
-            get => this.Fields[(int)ServiceConfigTupleFields.RebootMessage].AsString();
-            set => this.Set((int)ServiceConfigTupleFields.RebootMessage, value);
+            get => this.Fields[(int)ServiceConfigSymbolFields.RebootMessage].AsString();
+            set => this.Set((int)ServiceConfigSymbolFields.RebootMessage, value);
         }
     }
 }
\ No newline at end of file