1 files changed, 15 insertions, 23 deletions

diff --git a/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs b/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs
index 092937f0..507e9cdc 100644
--- a/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs
+++ b/src/wixext/Tuples/ComPlusGroupInPartitionRoleTuple.cs
@@ -11,10 +11,9 @@ namespace WixToolset.ComPlus
             ComPlusTupleDefinitionType.ComPlusGroupInPartitionRole.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.PartitionRole_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.Component_), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.Group_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComPlusGroupInPartitionRoleTupleFields.GroupRef), IntermediateFieldType.String),
             },
             typeof(ComPlusGroupInPartitionRoleTuple));
     }
@@ -26,10 +25,9 @@ namespace WixToolset.ComPlus.Tuples
 
     public enum ComPlusGroupInPartitionRoleTupleFields
     {
-        GroupInPartitionRole,
-        PartitionRole_,
-        Component_,
-        Group_,
+        PartitionRoleRef,
+        ComponentRef,
+        GroupRef,
     }
 
     public class ComPlusGroupInPartitionRoleTuple : IntermediateTuple
@@ -44,28 +42,22 @@ namespace WixToolset.ComPlus.Tuples
 
         public IntermediateField this[ComPlusGroupInPartitionRoleTupleFields index] => this.Fields[(int)index];
 
-        public string GroupInPartitionRole
+        public string PartitionRoleRef
         {
-            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole].AsString();
-            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.GroupInPartitionRole, value);
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.PartitionRoleRef, value);
         }
 
-        public string PartitionRole_
+        public string ComponentRef
         {
-            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.PartitionRole_].AsString();
-            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.PartitionRole_, value);
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.ComponentRef].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.ComponentRef, value);
         }
 
-        public string Component_
+        public string GroupRef
         {
-            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.Component_].AsString();
-            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.Component_, value);
-        }
-
-        public string Group_
-        {
-            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.Group_].AsString();
-            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.Group_, value);
+            get => this.Fields[(int)ComPlusGroupInPartitionRoleTupleFields.GroupRef].AsString();
+            set => this.Set((int)ComPlusGroupInPartitionRoleTupleFields.GroupRef, value);
         }
     }
 }
\ No newline at end of file