diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/samples/Generated/Samples/Sample_SolutionResourceCollection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/samples/Generated/Samples/Sample_SolutionResourceCollection.cs
index 8d1b6db1070be..f7e10e8329630 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/samples/Generated/Samples/Sample_SolutionResourceCollection.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/samples/Generated/Samples/Sample_SolutionResourceCollection.cs
@@ -49,7 +49,7 @@ public async Task CreateOrUpdate_SolutionCreate()
 {
 new TriggerCriterion()
 {
-Name = SelfHelpName.SolutionId,
+Name = Name.SolutionId,
 Value = "SolutionId1",
 }
 },
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ArmSelfHelpModelFactory.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ArmSelfHelpModelFactory.cs
index 026ffe4413919..5090caaa89963 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ArmSelfHelpModelFactory.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ArmSelfHelpModelFactory.cs
@@ -145,7 +145,7 @@ public static TroubleshooterResourceData TroubleshooterResourceData(ResourceIden
         /// <param name="insights"></param>
         /// <param name="error"> The error detail. </param>
         /// <returns> A new <see cref="Models.Step"/> instance for mocking. </returns>
-        public static Step Step(string id = null, string title = null, string description = null, string guidance = null, ExecutionStatus? executionStatus = null, string executionStatusDescription = null, SelfHelpType? stepType = null, bool? isLastStep = null, IEnumerable<StepInput> inputs = null, AutomatedCheckResult automatedCheckResults = null, IEnumerable<SelfHelpDiagnosticInsight> insights = null, ResponseError error = null)
+        public static Step Step(string id = null, string title = null, string description = null, string guidance = null, ExecutionStatus? executionStatus = null, string executionStatusDescription = null, Type? stepType = null, bool? isLastStep = null, IEnumerable<StepInput> inputs = null, AutomatedCheckResult automatedCheckResults = null, IEnumerable<SelfHelpDiagnosticInsight> insights = null, ResponseError error = null)
         {
             inputs ??= new List<StepInput>();
             insights ??= new List<SelfHelpDiagnosticInsight>();
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Confidence.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Confidence.cs
new file mode 100644
index 0000000000000..2be749b95d77b
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Confidence.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Confidence of the search result. </summary>
+    public readonly partial struct Confidence : IEquatable<Confidence>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="Confidence"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public Confidence(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string LowValue = "Low";
+        private const string MediumValue = "Medium";
+        private const string HighValue = "High";
+
+        /// <summary> Low. </summary>
+        public static Confidence Low { get; } = new Confidence(LowValue);
+        /// <summary> Medium. </summary>
+        public static Confidence Medium { get; } = new Confidence(MediumValue);
+        /// <summary> High. </summary>
+        public static Confidence High { get; } = new Confidence(HighValue);
+        /// <summary> Determines if two <see cref="Confidence"/> values are the same. </summary>
+        public static bool operator ==(Confidence left, Confidence right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="Confidence"/> values are not the same. </summary>
+        public static bool operator !=(Confidence left, Confidence right) => !left.Equals(right);
+        /// <summary> Converts a string to a <see cref="Confidence"/>. </summary>
+        public static implicit operator Confidence(string value) => new Confidence(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is Confidence other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(Confidence other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Filter.Serialization.cs
similarity index 88%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.Serialization.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Filter.Serialization.cs
index 438e7189bc36f..bc388c559f9fb 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Filter.Serialization.cs
@@ -10,7 +10,7 @@
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpFilter : IUtf8JsonSerializable
+    public partial class Filter : IUtf8JsonSerializable
     {
         void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
         {
@@ -33,7 +33,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
             writer.WriteEndObject();
         }
 
-        internal static SelfHelpFilter DeserializeSelfHelpFilter(JsonElement element)
+        internal static Filter DeserializeFilter(JsonElement element)
         {
             if (element.ValueKind == JsonValueKind.Null)
             {
@@ -60,7 +60,7 @@ internal static SelfHelpFilter DeserializeSelfHelpFilter(JsonElement element)
                     continue;
                 }
             }
-            return new SelfHelpFilter(name.Value, values.Value, @operator.Value);
+            return new Filter(name.Value, values.Value, @operator.Value);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Filter.cs
similarity index 72%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Filter.cs
index 0b299ceec09b6..314f4691cc0ac 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Filter.cs
@@ -8,18 +8,18 @@
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Filter criterion. </summary>
-    public partial class SelfHelpFilter
+    public partial class Filter
     {
-        /// <summary> Initializes a new instance of SelfHelpFilter. </summary>
-        public SelfHelpFilter()
+        /// <summary> Initializes a new instance of Filter. </summary>
+        public Filter()
         {
         }
 
-        /// <summary> Initializes a new instance of SelfHelpFilter. </summary>
+        /// <summary> Initializes a new instance of Filter. </summary>
         /// <param name="name"> Filter name. </param>
         /// <param name="values"> Filter values. </param>
         /// <param name="operator"> Filter operator. </param>
-        internal SelfHelpFilter(string name, string values, string @operator)
+        internal Filter(string name, string values, string @operator)
         {
             Name = name;
             Values = values;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilterGroup.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/FilterGroup.Serialization.cs
similarity index 75%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilterGroup.Serialization.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/FilterGroup.Serialization.cs
index 42ff02cbc22b7..1ef96199f48e4 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilterGroup.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/FilterGroup.Serialization.cs
@@ -11,7 +11,7 @@
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    internal partial class SelfHelpFilterGroup : IUtf8JsonSerializable
+    internal partial class FilterGroup : IUtf8JsonSerializable
     {
         void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
         {
@@ -29,13 +29,13 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
             writer.WriteEndObject();
         }
 
-        internal static SelfHelpFilterGroup DeserializeSelfHelpFilterGroup(JsonElement element)
+        internal static FilterGroup DeserializeFilterGroup(JsonElement element)
         {
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            Optional<IList<SelfHelpFilter>> filter = default;
+            Optional<IList<Filter>> filter = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("filter"u8))
@@ -44,16 +44,16 @@ internal static SelfHelpFilterGroup DeserializeSelfHelpFilterGroup(JsonElement e
                     {
                         continue;
                     }
-                    List<SelfHelpFilter> array = new List<SelfHelpFilter>();
+                    List<Filter> array = new List<Filter>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(SelfHelpFilter.DeserializeSelfHelpFilter(item));
+                        array.Add(Models.Filter.DeserializeFilter(item));
                     }
                     filter = array;
                     continue;
                 }
             }
-            return new SelfHelpFilterGroup(Optional.ToList(filter));
+            return new FilterGroup(Optional.ToList(filter));
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilterGroup.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/FilterGroup.cs
similarity index 52%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilterGroup.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/FilterGroup.cs
index 3351cb0b6d405..fdbadc51d498c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilterGroup.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/FilterGroup.cs
@@ -11,22 +11,22 @@
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Filter group. </summary>
-    internal partial class SelfHelpFilterGroup
+    internal partial class FilterGroup
     {
-        /// <summary> Initializes a new instance of SelfHelpFilterGroup. </summary>
-        public SelfHelpFilterGroup()
+        /// <summary> Initializes a new instance of FilterGroup. </summary>
+        public FilterGroup()
         {
-            Filter = new ChangeTrackingList<SelfHelpFilter>();
+            Filter = new ChangeTrackingList<Filter>();
         }
 
-        /// <summary> Initializes a new instance of SelfHelpFilterGroup. </summary>
+        /// <summary> Initializes a new instance of FilterGroup. </summary>
         /// <param name="filter"> List of filters. </param>
-        internal SelfHelpFilterGroup(IList<SelfHelpFilter> filter)
+        internal FilterGroup(IList<Filter> filter)
         {
             Filter = filter;
         }
 
         /// <summary> List of filters. </summary>
-        public IList<SelfHelpFilter> Filter { get; }
+        public IList<Filter> Filter { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.Serialization.cs
index 788576a64710f..3ae41aa753842 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.Serialization.cs
@@ -59,7 +59,7 @@ internal static MetricsBasedChart DeserializeMetricsBasedChart(JsonElement eleme
             Optional<AggregationType> aggregationType = default;
             Optional<TimeSpan> timeSpanDuration = default;
             Optional<string> title = default;
-            Optional<SelfHelpFilterGroup> filterGroup = default;
+            Optional<FilterGroup> filterGroup = default;
             Optional<string> replacementKey = default;
             foreach (var property in element.EnumerateObject())
             {
@@ -97,7 +97,7 @@ internal static MetricsBasedChart DeserializeMetricsBasedChart(JsonElement eleme
                     {
                         continue;
                     }
-                    filterGroup = SelfHelpFilterGroup.DeserializeSelfHelpFilterGroup(property.Value);
+                    filterGroup = FilterGroup.DeserializeFilterGroup(property.Value);
                     continue;
                 }
                 if (property.NameEquals("replacementKey"u8))
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.cs
index 076a8ed8db098..182ffd2e7d254 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.cs
@@ -25,7 +25,7 @@ public MetricsBasedChart()
         /// <param name="title"> Chart title. </param>
         /// <param name="filterGroup"> Filter group. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the content. </param>
-        internal MetricsBasedChart(string name, AggregationType? aggregationType, TimeSpan? timeSpanDuration, string title, SelfHelpFilterGroup filterGroup, string replacementKey)
+        internal MetricsBasedChart(string name, AggregationType? aggregationType, TimeSpan? timeSpanDuration, string title, FilterGroup filterGroup, string replacementKey)
         {
             Name = name;
             AggregationType = aggregationType;
@@ -44,14 +44,14 @@ internal MetricsBasedChart(string name, AggregationType? aggregationType, TimeSp
         /// <summary> Chart title. </summary>
         public string Title { get; set; }
         /// <summary> Filter group. </summary>
-        internal SelfHelpFilterGroup FilterGroup { get; set; }
+        internal FilterGroup FilterGroup { get; set; }
         /// <summary> List of filters. </summary>
-        public IList<SelfHelpFilter> Filter
+        public IList<Filter> Filter
         {
             get
             {
                 if (FilterGroup is null)
-                    FilterGroup = new SelfHelpFilterGroup();
+                    FilterGroup = new FilterGroup();
                 return FilterGroup.Filter;
             }
         }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Name.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Name.cs
new file mode 100644
index 0000000000000..0c1ba8048c652
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Name.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Trigger criterion name. </summary>
+    public readonly partial struct Name : IEquatable<Name>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="Name"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public Name(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string SolutionIdValue = "SolutionId";
+        private const string ProblemClassificationIdValue = "ProblemClassificationId";
+        private const string ReplacementKeyValue = "ReplacementKey";
+
+        /// <summary> SolutionId. </summary>
+        public static Name SolutionId { get; } = new Name(SolutionIdValue);
+        /// <summary> ProblemClassificationId. </summary>
+        public static Name ProblemClassificationId { get; } = new Name(ProblemClassificationIdValue);
+        /// <summary> ReplacementKey. </summary>
+        public static Name ReplacementKey { get; } = new Name(ReplacementKeyValue);
+        /// <summary> Determines if two <see cref="Name"/> values are the same. </summary>
+        public static bool operator ==(Name left, Name right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="Name"/> values are not the same. </summary>
+        public static bool operator !=(Name left, Name right) => !left.Equals(right);
+        /// <summary> Converts a string to a <see cref="Name"/>. </summary>
+        public static implicit operator Name(string value) => new Name(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is Name other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(Name other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMaps.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMaps.Serialization.cs
index 302cd665ebe61..40fa5284c77ed 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMaps.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMaps.Serialization.cs
@@ -89,8 +89,8 @@ internal static ReplacementMaps DeserializeReplacementMaps(JsonElement element)
             Optional<IList<SolutionsDiagnostic>> diagnostics = default;
             Optional<IList<SolutionsTroubleshooters>> troubleshooters = default;
             Optional<IList<MetricsBasedChart>> metricsBasedCharts = default;
-            Optional<IList<SelfHelpVideo>> videos = default;
-            Optional<IList<SelfHelpVideoGroup>> videoGroups = default;
+            Optional<IList<Video>> videos = default;
+            Optional<IList<VideoGroup>> videoGroups = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("webResults"u8))
@@ -155,10 +155,10 @@ internal static ReplacementMaps DeserializeReplacementMaps(JsonElement element)
                     {
                         continue;
                     }
-                    List<SelfHelpVideo> array = new List<SelfHelpVideo>();
+                    List<Video> array = new List<Video>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(SelfHelpVideo.DeserializeSelfHelpVideo(item));
+                        array.Add(Video.DeserializeVideo(item));
                     }
                     videos = array;
                     continue;
@@ -169,10 +169,10 @@ internal static ReplacementMaps DeserializeReplacementMaps(JsonElement element)
                     {
                         continue;
                     }
-                    List<SelfHelpVideoGroup> array = new List<SelfHelpVideoGroup>();
+                    List<VideoGroup> array = new List<VideoGroup>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(SelfHelpVideoGroup.DeserializeSelfHelpVideoGroup(item));
+                        array.Add(VideoGroup.DeserializeVideoGroup(item));
                     }
                     videoGroups = array;
                     continue;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMaps.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMaps.cs
index e9eae65d11c7c..02028a2915e8a 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMaps.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMaps.cs
@@ -20,8 +20,8 @@ public ReplacementMaps()
             Diagnostics = new ChangeTrackingList<SolutionsDiagnostic>();
             Troubleshooters = new ChangeTrackingList<SolutionsTroubleshooters>();
             MetricsBasedCharts = new ChangeTrackingList<MetricsBasedChart>();
-            Videos = new ChangeTrackingList<SelfHelpVideo>();
-            VideoGroups = new ChangeTrackingList<SelfHelpVideoGroup>();
+            Videos = new ChangeTrackingList<Video>();
+            VideoGroups = new ChangeTrackingList<VideoGroup>();
         }
 
         /// <summary> Initializes a new instance of ReplacementMaps. </summary>
@@ -31,7 +31,7 @@ public ReplacementMaps()
         /// <param name="metricsBasedCharts"> Solution metrics based charts. </param>
         /// <param name="videos"> Video solutions, which have the power to engage the customer by stimulating their senses. </param>
         /// <param name="videoGroups"> Group of Videos. </param>
-        internal ReplacementMaps(IList<WebResult> webResults, IList<SolutionsDiagnostic> diagnostics, IList<SolutionsTroubleshooters> troubleshooters, IList<MetricsBasedChart> metricsBasedCharts, IList<SelfHelpVideo> videos, IList<SelfHelpVideoGroup> videoGroups)
+        internal ReplacementMaps(IList<WebResult> webResults, IList<SolutionsDiagnostic> diagnostics, IList<SolutionsTroubleshooters> troubleshooters, IList<MetricsBasedChart> metricsBasedCharts, IList<Video> videos, IList<VideoGroup> videoGroups)
         {
             WebResults = webResults;
             Diagnostics = diagnostics;
@@ -50,8 +50,8 @@ internal ReplacementMaps(IList<WebResult> webResults, IList<SolutionsDiagnostic>
         /// <summary> Solution metrics based charts. </summary>
         public IList<MetricsBasedChart> MetricsBasedCharts { get; }
         /// <summary> Video solutions, which have the power to engage the customer by stimulating their senses. </summary>
-        public IList<SelfHelpVideo> Videos { get; }
+        public IList<Video> Videos { get; }
         /// <summary> Group of Videos. </summary>
-        public IList<SelfHelpVideoGroup> VideoGroups { get; }
+        public IList<VideoGroup> VideoGroups { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResultType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResultType.cs
new file mode 100644
index 0000000000000..cbf27abaef194
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResultType.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Result type of the search result. </summary>
+    public readonly partial struct ResultType : IEquatable<ResultType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ResultType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ResultType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string CommunityValue = "Community";
+        private const string DocumentationValue = "Documentation";
+
+        /// <summary> Community. </summary>
+        public static ResultType Community { get; } = new ResultType(CommunityValue);
+        /// <summary> Documentation. </summary>
+        public static ResultType Documentation { get; } = new ResultType(DocumentationValue);
+        /// <summary> Determines if two <see cref="ResultType"/> values are the same. </summary>
+        public static bool operator ==(ResultType left, ResultType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ResultType"/> values are not the same. </summary>
+        public static bool operator !=(ResultType left, ResultType right) => !left.Equals(right);
+        /// <summary> Converts a string to a <see cref="ResultType"/>. </summary>
+        public static implicit operator ResultType(string value) => new ResultType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ResultType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ResultType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SearchResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SearchResult.Serialization.cs
index 151ca335ca1a9..2a37f1c7528e6 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SearchResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SearchResult.Serialization.cs
@@ -67,9 +67,9 @@ internal static SearchResult DeserializeSearchResult(JsonElement element)
             Optional<string> solutionId = default;
             Optional<string> content = default;
             Optional<string> title = default;
-            Optional<SelfHelpConfidence> confidence = default;
+            Optional<Confidence> confidence = default;
             Optional<string> source = default;
-            Optional<SelfHelpResultType> resultType = default;
+            Optional<ResultType> resultType = default;
             Optional<int> rank = default;
             Optional<string> link = default;
             foreach (var property in element.EnumerateObject())
@@ -95,7 +95,7 @@ internal static SearchResult DeserializeSearchResult(JsonElement element)
                     {
                         continue;
                     }
-                    confidence = new SelfHelpConfidence(property.Value.GetString());
+                    confidence = new Confidence(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("source"u8))
@@ -109,7 +109,7 @@ internal static SearchResult DeserializeSearchResult(JsonElement element)
                     {
                         continue;
                     }
-                    resultType = new SelfHelpResultType(property.Value.GetString());
+                    resultType = new ResultType(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("rank"u8))
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SearchResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SearchResult.cs
index 4f97bddf4fa52..57d5a6292d2c6 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SearchResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SearchResult.cs
@@ -24,7 +24,7 @@ public SearchResult()
         /// <param name="resultType"> Result type of the search result. </param>
         /// <param name="rank"> rank of the search result. </param>
         /// <param name="link"> Link to the document. </param>
-        internal SearchResult(string solutionId, string content, string title, SelfHelpConfidence? confidence, string source, SelfHelpResultType? resultType, int? rank, string link)
+        internal SearchResult(string solutionId, string content, string title, Confidence? confidence, string source, ResultType? resultType, int? rank, string link)
         {
             SolutionId = solutionId;
             Content = content;
@@ -43,11 +43,11 @@ internal SearchResult(string solutionId, string content, string title, SelfHelpC
         /// <summary> Title of the search result. </summary>
         public string Title { get; set; }
         /// <summary> Confidence of the search result. </summary>
-        public SelfHelpConfidence? Confidence { get; set; }
+        public Confidence? Confidence { get; set; }
         /// <summary> Source of the search result. </summary>
         public string Source { get; set; }
         /// <summary> Result type of the search result. </summary>
-        public SelfHelpResultType? ResultType { get; set; }
+        public ResultType? ResultType { get; set; }
         /// <summary> rank of the search result. </summary>
         public int? Rank { get; set; }
         /// <summary> Link to the document. </summary>
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Section.Serialization.cs
similarity index 89%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.Serialization.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Section.Serialization.cs
index 3d7b66d2e9111..81304205403c8 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Section.Serialization.cs
@@ -10,7 +10,7 @@
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpSection : IUtf8JsonSerializable
+    public partial class Section : IUtf8JsonSerializable
     {
         void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
         {
@@ -33,7 +33,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
             writer.WriteEndObject();
         }
 
-        internal static SelfHelpSection DeserializeSelfHelpSection(JsonElement element)
+        internal static Section DeserializeSection(JsonElement element)
         {
             if (element.ValueKind == JsonValueKind.Null)
             {
@@ -64,7 +64,7 @@ internal static SelfHelpSection DeserializeSelfHelpSection(JsonElement element)
                     continue;
                 }
             }
-            return new SelfHelpSection(title.Value, content.Value, replacementMaps.Value);
+            return new Section(title.Value, content.Value, replacementMaps.Value);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Section.cs
similarity index 74%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Section.cs
index afa495d73c3a9..d66e092822b23 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Section.cs
@@ -8,18 +8,18 @@
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Part of the solution and are dividers in the solution rendering. </summary>
-    public partial class SelfHelpSection
+    public partial class Section
     {
-        /// <summary> Initializes a new instance of SelfHelpSection. </summary>
-        public SelfHelpSection()
+        /// <summary> Initializes a new instance of Section. </summary>
+        public Section()
         {
         }
 
-        /// <summary> Initializes a new instance of SelfHelpSection. </summary>
+        /// <summary> Initializes a new instance of Section. </summary>
         /// <param name="title"> Solution sections title. </param>
         /// <param name="content"> Solution sections content. </param>
         /// <param name="replacementMaps"> Solution replacement maps. </param>
-        internal SelfHelpSection(string title, string content, ReplacementMaps replacementMaps)
+        internal Section(string title, string content, ReplacementMaps replacementMaps)
         {
             Title = title;
             Content = content;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpConfidence.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpConfidence.cs
deleted file mode 100644
index c2d9d71943a89..0000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpConfidence.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    /// <summary> Confidence of the search result. </summary>
-    public readonly partial struct SelfHelpConfidence : IEquatable<SelfHelpConfidence>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpConfidence"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public SelfHelpConfidence(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string LowValue = "Low";
-        private const string MediumValue = "Medium";
-        private const string HighValue = "High";
-
-        /// <summary> Low. </summary>
-        public static SelfHelpConfidence Low { get; } = new SelfHelpConfidence(LowValue);
-        /// <summary> Medium. </summary>
-        public static SelfHelpConfidence Medium { get; } = new SelfHelpConfidence(MediumValue);
-        /// <summary> High. </summary>
-        public static SelfHelpConfidence High { get; } = new SelfHelpConfidence(HighValue);
-        /// <summary> Determines if two <see cref="SelfHelpConfidence"/> values are the same. </summary>
-        public static bool operator ==(SelfHelpConfidence left, SelfHelpConfidence right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="SelfHelpConfidence"/> values are not the same. </summary>
-        public static bool operator !=(SelfHelpConfidence left, SelfHelpConfidence right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="SelfHelpConfidence"/>. </summary>
-        public static implicit operator SelfHelpConfidence(string value) => new SelfHelpConfidence(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is SelfHelpConfidence other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(SelfHelpConfidence other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpName.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpName.cs
deleted file mode 100644
index 375fb4c1fab97..0000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpName.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    /// <summary> Trigger criterion name. </summary>
-    public readonly partial struct SelfHelpName : IEquatable<SelfHelpName>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpName"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public SelfHelpName(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string SolutionIdValue = "SolutionId";
-        private const string ProblemClassificationIdValue = "ProblemClassificationId";
-        private const string ReplacementKeyValue = "ReplacementKey";
-
-        /// <summary> SolutionId. </summary>
-        public static SelfHelpName SolutionId { get; } = new SelfHelpName(SolutionIdValue);
-        /// <summary> ProblemClassificationId. </summary>
-        public static SelfHelpName ProblemClassificationId { get; } = new SelfHelpName(ProblemClassificationIdValue);
-        /// <summary> ReplacementKey. </summary>
-        public static SelfHelpName ReplacementKey { get; } = new SelfHelpName(ReplacementKeyValue);
-        /// <summary> Determines if two <see cref="SelfHelpName"/> values are the same. </summary>
-        public static bool operator ==(SelfHelpName left, SelfHelpName right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="SelfHelpName"/> values are not the same. </summary>
-        public static bool operator !=(SelfHelpName left, SelfHelpName right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="SelfHelpName"/>. </summary>
-        public static implicit operator SelfHelpName(string value) => new SelfHelpName(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is SelfHelpName other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(SelfHelpName other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpResultType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpResultType.cs
deleted file mode 100644
index 7ad3dd576113c..0000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpResultType.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    /// <summary> Result type of the search result. </summary>
-    public readonly partial struct SelfHelpResultType : IEquatable<SelfHelpResultType>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpResultType"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public SelfHelpResultType(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string CommunityValue = "Community";
-        private const string DocumentationValue = "Documentation";
-
-        /// <summary> Community. </summary>
-        public static SelfHelpResultType Community { get; } = new SelfHelpResultType(CommunityValue);
-        /// <summary> Documentation. </summary>
-        public static SelfHelpResultType Documentation { get; } = new SelfHelpResultType(DocumentationValue);
-        /// <summary> Determines if two <see cref="SelfHelpResultType"/> values are the same. </summary>
-        public static bool operator ==(SelfHelpResultType left, SelfHelpResultType right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="SelfHelpResultType"/> values are not the same. </summary>
-        public static bool operator !=(SelfHelpResultType left, SelfHelpResultType right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="SelfHelpResultType"/>. </summary>
-        public static implicit operator SelfHelpResultType(string value) => new SelfHelpResultType(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is SelfHelpResultType other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(SelfHelpResultType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpType.cs
deleted file mode 100644
index 271d4a4c2096a..0000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpType.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    /// <summary> Type of Troubleshooting step. </summary>
-    public readonly partial struct SelfHelpType : IEquatable<SelfHelpType>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpType"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public SelfHelpType(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string DecisionValue = "Decision";
-        private const string SolutionValue = "Solution";
-        private const string InsightValue = "Insight";
-        private const string AutomatedCheckValue = "AutomatedCheck";
-
-        /// <summary> Decision. </summary>
-        public static SelfHelpType Decision { get; } = new SelfHelpType(DecisionValue);
-        /// <summary> Solution. </summary>
-        public static SelfHelpType Solution { get; } = new SelfHelpType(SolutionValue);
-        /// <summary> Insight. </summary>
-        public static SelfHelpType Insight { get; } = new SelfHelpType(InsightValue);
-        /// <summary> AutomatedCheck. </summary>
-        public static SelfHelpType AutomatedCheck { get; } = new SelfHelpType(AutomatedCheckValue);
-        /// <summary> Determines if two <see cref="SelfHelpType"/> values are the same. </summary>
-        public static bool operator ==(SelfHelpType left, SelfHelpType right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="SelfHelpType"/> values are not the same. </summary>
-        public static bool operator !=(SelfHelpType left, SelfHelpType right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="SelfHelpType"/>. </summary>
-        public static implicit operator SelfHelpType(string value) => new SelfHelpType(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is SelfHelpType other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(SelfHelpType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.Serialization.cs
index 16973af1fc0bf..1799f2fb3a2f2 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.Serialization.cs
@@ -88,7 +88,7 @@ internal static SolutionResourceProperties DeserializeSolutionResourceProperties
             Optional<string> title = default;
             Optional<string> content = default;
             Optional<ReplacementMaps> replacementMaps = default;
-            Optional<IList<SelfHelpSection>> sections = default;
+            Optional<IList<Section>> sections = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("triggerCriteria"u8))
@@ -158,10 +158,10 @@ internal static SolutionResourceProperties DeserializeSolutionResourceProperties
                     {
                         continue;
                     }
-                    List<SelfHelpSection> array = new List<SelfHelpSection>();
+                    List<Section> array = new List<Section>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(SelfHelpSection.DeserializeSelfHelpSection(item));
+                        array.Add(Section.DeserializeSection(item));
                     }
                     sections = array;
                     continue;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.cs
index 0026d13cf6c01..70c0074808055 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.cs
@@ -18,7 +18,7 @@ public SolutionResourceProperties()
         {
             TriggerCriteria = new ChangeTrackingList<TriggerCriterion>();
             Parameters = new ChangeTrackingDictionary<string, string>();
-            Sections = new ChangeTrackingList<SelfHelpSection>();
+            Sections = new ChangeTrackingList<Section>();
         }
 
         /// <summary> Initializes a new instance of SolutionResourceProperties. </summary>
@@ -30,7 +30,7 @@ public SolutionResourceProperties()
         /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
         /// <param name="replacementMaps"> Solution replacement maps. </param>
         /// <param name="sections"> List of section object. </param>
-        internal SolutionResourceProperties(IList<TriggerCriterion> triggerCriteria, IDictionary<string, string> parameters, string solutionId, SolutionProvisioningState? provisioningState, string title, string content, ReplacementMaps replacementMaps, IList<SelfHelpSection> sections)
+        internal SolutionResourceProperties(IList<TriggerCriterion> triggerCriteria, IDictionary<string, string> parameters, string solutionId, SolutionProvisioningState? provisioningState, string title, string content, ReplacementMaps replacementMaps, IList<Section> sections)
         {
             TriggerCriteria = triggerCriteria;
             Parameters = parameters;
@@ -57,6 +57,6 @@ internal SolutionResourceProperties(IList<TriggerCriterion> triggerCriteria, IDi
         /// <summary> Solution replacement maps. </summary>
         public ReplacementMaps ReplacementMaps { get; set; }
         /// <summary> List of section object. </summary>
-        public IList<SelfHelpSection> Sections { get; }
+        public IList<Section> Sections { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Step.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Step.Serialization.cs
index 29ed214850b6f..eb9871a2b6de0 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Step.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Step.Serialization.cs
@@ -26,7 +26,7 @@ internal static Step DeserializeStep(JsonElement element)
             Optional<string> guidance = default;
             Optional<ExecutionStatus> executionStatus = default;
             Optional<string> executionStatusDescription = default;
-            Optional<SelfHelpType> type = default;
+            Optional<Type> type = default;
             Optional<bool> isLastStep = default;
             Optional<IReadOnlyList<StepInput>> inputs = default;
             Optional<AutomatedCheckResult> automatedCheckResults = default;
@@ -74,7 +74,7 @@ internal static Step DeserializeStep(JsonElement element)
                     {
                         continue;
                     }
-                    type = new SelfHelpType(property.Value.GetString());
+                    type = new Type(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("isLastStep"u8))
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Step.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Step.cs
index 5952d82433bcb..28633d5a65bbf 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Step.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Step.cs
@@ -34,7 +34,7 @@ internal Step()
         /// <param name="automatedCheckResults"> Only for AutomatedStep type. </param>
         /// <param name="insights"></param>
         /// <param name="error"> The error detail. </param>
-        internal Step(string id, string title, string description, string guidance, ExecutionStatus? executionStatus, string executionStatusDescription, SelfHelpType? stepType, bool? isLastStep, IReadOnlyList<StepInput> inputs, AutomatedCheckResult automatedCheckResults, IReadOnlyList<SelfHelpDiagnosticInsight> insights, ResponseError error)
+        internal Step(string id, string title, string description, string guidance, ExecutionStatus? executionStatus, string executionStatusDescription, Type? stepType, bool? isLastStep, IReadOnlyList<StepInput> inputs, AutomatedCheckResult automatedCheckResults, IReadOnlyList<SelfHelpDiagnosticInsight> insights, ResponseError error)
         {
             Id = id;
             Title = title;
@@ -63,7 +63,7 @@ internal Step(string id, string title, string description, string guidance, Exec
         /// <summary> This field has more detailed status description of the execution status. </summary>
         public string ExecutionStatusDescription { get; }
         /// <summary> Type of Troubleshooting step. </summary>
-        public SelfHelpType? StepType { get; }
+        public Type? StepType { get; }
         /// <summary> is this last step of the workflow. </summary>
         public bool? IsLastStep { get; }
         /// <summary> Gets the inputs. </summary>
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TriggerCriterion.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TriggerCriterion.Serialization.cs
index 2386a4e0a5c9c..df9202d484530 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TriggerCriterion.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TriggerCriterion.Serialization.cs
@@ -34,7 +34,7 @@ internal static TriggerCriterion DeserializeTriggerCriterion(JsonElement element
             {
                 return null;
             }
-            Optional<SelfHelpName> name = default;
+            Optional<Name> name = default;
             Optional<string> value = default;
             foreach (var property in element.EnumerateObject())
             {
@@ -44,7 +44,7 @@ internal static TriggerCriterion DeserializeTriggerCriterion(JsonElement element
                     {
                         continue;
                     }
-                    name = new SelfHelpName(property.Value.GetString());
+                    name = new Name(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("value"u8))
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TriggerCriterion.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TriggerCriterion.cs
index 70feabfc0eb42..d60966d35c0fa 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TriggerCriterion.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TriggerCriterion.cs
@@ -18,14 +18,14 @@ public TriggerCriterion()
         /// <summary> Initializes a new instance of TriggerCriterion. </summary>
         /// <param name="name"> Trigger criterion name. </param>
         /// <param name="value"> Trigger criterion value. </param>
-        internal TriggerCriterion(SelfHelpName? name, string value)
+        internal TriggerCriterion(Name? name, string value)
         {
             Name = name;
             Value = value;
         }
 
         /// <summary> Trigger criterion name. </summary>
-        public SelfHelpName? Name { get; set; }
+        public Name? Name { get; set; }
         /// <summary> Trigger criterion value. </summary>
         public string Value { get; set; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Type.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Type.cs
new file mode 100644
index 0000000000000..5d40e96523fdb
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Type.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Type of Troubleshooting step. </summary>
+    public readonly partial struct Type : IEquatable<Type>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="Type"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public Type(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string DecisionValue = "Decision";
+        private const string SolutionValue = "Solution";
+        private const string InsightValue = "Insight";
+        private const string AutomatedCheckValue = "AutomatedCheck";
+
+        /// <summary> Decision. </summary>
+        public static Type Decision { get; } = new Type(DecisionValue);
+        /// <summary> Solution. </summary>
+        public static Type Solution { get; } = new Type(SolutionValue);
+        /// <summary> Insight. </summary>
+        public static Type Insight { get; } = new Type(InsightValue);
+        /// <summary> AutomatedCheck. </summary>
+        public static Type AutomatedCheck { get; } = new Type(AutomatedCheckValue);
+        /// <summary> Determines if two <see cref="Type"/> values are the same. </summary>
+        public static bool operator ==(Type left, Type right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="Type"/> values are not the same. </summary>
+        public static bool operator !=(Type left, Type right) => !left.Equals(right);
+        /// <summary> Converts a string to a <see cref="Type"/>. </summary>
+        public static implicit operator Type(string value) => new Type(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is Type other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(Type other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value?.GetHashCode() ?? 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Video.Serialization.cs
similarity index 88%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.Serialization.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Video.Serialization.cs
index 0bc4abc566944..fa34173172bb8 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Video.Serialization.cs
@@ -10,7 +10,7 @@
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpVideo : IUtf8JsonSerializable
+    public partial class Video : IUtf8JsonSerializable
     {
         void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
         {
@@ -33,7 +33,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
             writer.WriteEndObject();
         }
 
-        internal static SelfHelpVideo DeserializeSelfHelpVideo(JsonElement element)
+        internal static Video DeserializeVideo(JsonElement element)
         {
             if (element.ValueKind == JsonValueKind.Null)
             {
@@ -60,7 +60,7 @@ internal static SelfHelpVideo DeserializeSelfHelpVideo(JsonElement element)
                     continue;
                 }
             }
-            return new SelfHelpVideo(src.Value, title.Value, replacementKey.Value);
+            return new Video(src.Value, title.Value, replacementKey.Value);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Video.cs
similarity index 68%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Video.cs
index 0f10dc040924e..ad6e5c329bb67 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/Video.cs
@@ -8,18 +8,18 @@
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Video detail. </summary>
-    public partial class SelfHelpVideo : VideoGroupVideo
+    public partial class Video : VideoGroupVideo
     {
-        /// <summary> Initializes a new instance of SelfHelpVideo. </summary>
-        public SelfHelpVideo()
+        /// <summary> Initializes a new instance of Video. </summary>
+        public Video()
         {
         }
 
-        /// <summary> Initializes a new instance of SelfHelpVideo. </summary>
+        /// <summary> Initializes a new instance of Video. </summary>
         /// <param name="src"> Link to the video. </param>
         /// <param name="title"> Title of the video. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the insight content. </param>
-        internal SelfHelpVideo(string src, string title, string replacementKey) : base(src, title)
+        internal Video(string src, string title, string replacementKey) : base(src, title)
         {
             ReplacementKey = replacementKey;
         }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideoGroup.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroup.Serialization.cs
similarity index 89%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideoGroup.Serialization.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroup.Serialization.cs
index 5a3e91a68c827..a0936a9dbe9f3 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideoGroup.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroup.Serialization.cs
@@ -11,7 +11,7 @@
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpVideoGroup : IUtf8JsonSerializable
+    public partial class VideoGroup : IUtf8JsonSerializable
     {
         void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
         {
@@ -34,7 +34,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
             writer.WriteEndObject();
         }
 
-        internal static SelfHelpVideoGroup DeserializeSelfHelpVideoGroup(JsonElement element)
+        internal static VideoGroup DeserializeVideoGroup(JsonElement element)
         {
             if (element.ValueKind == JsonValueKind.Null)
             {
@@ -64,7 +64,7 @@ internal static SelfHelpVideoGroup DeserializeSelfHelpVideoGroup(JsonElement ele
                     continue;
                 }
             }
-            return new SelfHelpVideoGroup(Optional.ToList(videos), replacementKey.Value);
+            return new VideoGroup(Optional.ToList(videos), replacementKey.Value);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideoGroup.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroup.cs
similarity index 74%
rename from sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideoGroup.cs
rename to sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroup.cs
index 17acdd499835e..df38543959fc1 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideoGroup.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroup.cs
@@ -11,18 +11,18 @@
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Video group detail. </summary>
-    public partial class SelfHelpVideoGroup
+    public partial class VideoGroup
     {
-        /// <summary> Initializes a new instance of SelfHelpVideoGroup. </summary>
-        public SelfHelpVideoGroup()
+        /// <summary> Initializes a new instance of VideoGroup. </summary>
+        public VideoGroup()
         {
             Videos = new ChangeTrackingList<VideoGroupVideo>();
         }
 
-        /// <summary> Initializes a new instance of SelfHelpVideoGroup. </summary>
+        /// <summary> Initializes a new instance of VideoGroup. </summary>
         /// <param name="videos"> List of videos will be shown to customers. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the insight content. </param>
-        internal SelfHelpVideoGroup(IList<VideoGroupVideo> videos, string replacementKey)
+        internal VideoGroup(IList<VideoGroupVideo> videos, string replacementKey)
         {
             Videos = videos;
             ReplacementKey = replacementKey;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/autorest.md b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/autorest.md
index 147d1da6192b9..6b51afbe16314 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/autorest.md
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/autorest.md
@@ -77,15 +77,6 @@ rename-mapping:
   DiagnosticInvocation: SelfHelpDiagnosticInvocation
   ImportanceLevel: SelfHelpImportanceLevel
   DiagnosticProvisioningState: SelfHelpProvisioningState
-  Filter: SelfHelpFilter
-  FilterGroup: SelfHelpFilterGroup
-  Confidence: SelfHelpConfidence
-  Section: SelfHelpSection
-  Video: SelfHelpVideo
-  Type: SelfHelpType
-  ResultType: SelfHelpResultType
-  Name: SelfHelpName
-  VideoGroup: SelfHelpVideoGroup
 
 override-operation-name:
   CheckNameAvailability_Post: CheckSelfHelpNameAvailability
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/SolutionsTests.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/SolutionsTests.cs
index 48676eafa10e9..aca175f904cb3 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/SolutionsTests.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/SolutionsTests.cs
@@ -50,7 +50,7 @@ private SolutionResourceData CreateSolutionResourceData(ResourceIdentifier scope
                 { "SearchText","Can not RDP"}
             };
 
-            List<SelfHelpSection> sections = new List<SelfHelpSection>();
+            List<Section> sections = new List<Section>();
             SolutionResourceProperties properties = new SolutionResourceProperties(triggerCriterionList, parameters, null, null, null, null, null, sections);
             ResourceType resourceType = new ResourceType("Microsoft.KeyVault/vaults");
             var data = new SolutionResourceData(scope, null, resourceType, null, properties);
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/TroubleshooterTests.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/TroubleshooterTests.cs
index 34f11c5321efe..8a999194848af 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/TroubleshooterTests.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tests/TroubleshooterTests.cs
@@ -51,7 +51,7 @@ private TroubleshooterResourceData CreateTroubleshooterResourceData(ResourceIden
                 { "UserIPAddress", "174.164.29.4" }
             };
 
-            List<SelfHelpSection> sections = new List< SelfHelpSection>();
+            List<Section> sections = new List<Section>();
             ResourceType resourceType = new ResourceType("Microsoft.KeyVault/vaults");
             var data = new TroubleshooterResourceData(scope, null, resourceType, null, "e104dbdf-9e14-4c9f-bc78-21ac90382231", parameters, null, null);